Merge branch 'master' into 2257-inequality-conditions

[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 6fc4522828ca38e4de82410c59d8a6a79aa53d23..455e4c0a9fa6cb13553cd121b5c64f427c8fbc90 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -9,12 +9,11 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require bootstrap-editable
+ *= require bootstrap
+ *= require bootstrap3-editable/bootstrap-editable
  *= require_tree .
  */
 
-@import "bootstrap";
-
 .contain-align-left {
     text-align: left;
 }
@@ -80,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;
@@ -108,12 +107,81 @@ ul.arvados-nav li ul li {
     padding-left: 1em;
 }
 
-.badge {
-    background: red;
-}
-
 .dax {
     max-width: 10%;
     margin-right: 1em;
     float: left
 }
+
+.smart-scroll {
+    overflow: auto;
+}
+
+.inline-progress-container div.progress {
+    margin-bottom: 0;
+}
+
+.inline-progress-container {
+    width: 100%;
+    display:inline-block;
+}
+
+td.add-tag-button {
+    white-space: normal;
+}
+td.add-tag-button .add-tag-button {
+    margin-right: 4px;
+    opacity: 0.2;
+}
+td.add-tag-button .add-tag-button:hover {
+    opacity: 1;
+}
+span.removable-tag-container {
+    line-height: 1.6;
+}
+.label.removable-tag a {
+    color: #fff;
+    cursor: pointer;
+}
+
+li.notification {
+    padding: 10px;
+}
+.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, .arvados-nav-active a:hover {
+    color: white;
+}
+
+// See HeaderRowFixer in application.js
+table.table-fixed-header-row {
+    width: 100%;
+    border-spacing: 0px;
+    margin:0;
+}
+table.table-fixed-header-row thead {
+    position:fixed;
+    background: #fff;
+}
+table.table-fixed-header-row tbody {
+    position:relative;
+    top:1.5em;
+}
+
+/* Setting the height needs to be fixed with javascript. */
+.dropdown-menu {
+    padding-right: 20px;
+    max-height: 440px;
+    width: 400px;
+    overflow-y: auto;
+}
+