Merge branch 'master' into origin-2883-job-log-viewer

[arvados.git] / apps / workbench / app / assets / stylesheets / application.css.scss

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 75080a0bbdf9d58a694b9216fbbb29b91b269fe8..da958e1564ae43e4974ac697cdb585e5b02c00b4 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -90,13 +90,40 @@ form.small-form-margin {
     white-space: nowrap;
 }
 
-.navbar .nav li.nav-separator span {
-    display: block;
-    float: none;
-    color: #bbbbbb;
-    padding: 10px 0 10px;
-    text-decoration: none;
-    text-shadow: 0 1px 0 #ffffff;
+/* top nav */
+$top-nav-bg: #3c163d;
+$top-nav-bg-bottom: #260027;
+nav.navbar-fixed-top .navbar-brand {
+    color: #79537a;
+    letter-spacing: 0.4em;
+}
+nav.navbar-fixed-top {
+    background: $top-nav-bg;
+    background: linear-gradient(to bottom, $top-nav-bg 0%,$top-nav-bg-bottom 100%);
+}
+.navbar.breadcrumbs {
+    line-height: 50px;
+    border-radius: 0;
+    margin-bottom: 0;
+    border-right: 0;
+    border-left: 0;
+}
+.navbar.breadcrumbs .nav > li > a,
+.navbar.breadcrumbs .nav > li {
+    color: #000;
+}
+.navbar.breadcrumbs .nav > li.nav-separator > i {
+    color: #bbb;
+}
+nav.navbar-fixed-top .navbar-nav.navbar-right > li.open > a,
+nav.navbar-fixed-top .navbar-nav.navbar-right > li.open > a:focus,
+nav.navbar-fixed-top .navbar-nav.navbar-right > li.open > a:hover {
+    background: lighten($top-nav-bg, 5%);
+}
+nav.navbar-fixed-top .navbar-nav.navbar-right > li > a,
+nav.navbar-fixed-top .navbar-nav.navbar-right > li > a:focus,
+nav.navbar-fixed-top .navbar-nav.navbar-right > li > a:hover {
+    color: #fff;
 }
 
 .dax {
@@ -107,6 +134,7 @@ form.small-form-margin {
 
 .smart-scroll {
     overflow: auto;
+    margin-bottom: -15px;
 }
 
 .inline-progress-container div.progress {
@@ -184,14 +212,17 @@ div#wrapper {
   padding-bottom: 1em;
 }
 .arv-description-in-table {
-  max-height: 3.5em;
+  height: 4em;
   overflow-x: hidden;
   overflow-y: hidden;
 }
 .arv-description-in-table:hover {
-  overflow-y: scroll;
+  overflow-y: auto;
 }
 
 .btn.btn-nodecorate {
   border: none;
 }
+svg text {
+    font-size: 6pt;
+}