Merge remote-tracking branch 'origin/master' into 2061-update-docs

[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 3265ece392b2cdf28e0b18f2e6172a7fb716baa8..580be64bc4e0881ebae3845cbfeac99b75262603 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -79,7 +79,7 @@ form.small-form-margin {
     white-space: nowrap;
 }
 
-.navbar .nav li.nav-separator > span {
+.navbar .nav li.nav-separator span {
     display: block;
     float: none;
     color: #bbbbbb;
@@ -107,10 +107,6 @@ ul.arvados-nav li ul li {
     padding-left: 1em;
 }
 
-.badge {
-    background: red;
-}
-
 .dax {
     max-width: 10%;
     margin-right: 1em;
@@ -119,4 +115,28 @@ ul.arvados-nav li ul li {
 
 .smart-scroll {
     overflow: auto;
-}
\ No newline at end of file
+}
+
+.inline-progress-container div.progress {
+    margin-bottom: 0;
+}
+
+.inline-progress-container {
+    width: 100px;
+    display:inline-block;
+}
+
+.arvados-nav-container {
+    top: 70px; 
+    height: calc(100% - 70px); 
+    overflow: auto; 
+    z-index: 2;
+}
+
+.arvados-nav-active {
+    background: rgb(66, 139, 202);
+}
+
+.arvados-nav-active a {
+    color: white;
+}