Merge branch '2640-folder-api' into 1970-folder-view

[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 446f524fbafe1629312dda9374e32435857ee3d5..51c96d7fc87d1cf5be336b4bd4815460f471d48d 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;
 }
@@ -41,10 +40,17 @@ table.table-justforlayout>tbody>tr>th{
 table.table-justforlayout {
     margin-bottom: 0;
 }
+.smaller-text {
+    font-size: .8em;
+}
 .deemphasize {
     font-size: .8em;
     color: #888;
 }
+.arvados-uuid {
+    font-size: .8em;
+    font-family: monospace;
+}
 table .data-size, .table .data-size {
     text-align: right;
 }
@@ -79,7 +85,8 @@ form.small-form-margin {
 .nowrap {
     white-space: nowrap;
 }
-.navbar .nav li.nav-separator > span {
+
+.navbar .nav li.nav-separator span {
     display: block;
     float: none;
     color: #bbbbbb;
@@ -87,6 +94,100 @@ form.small-form-margin {
     text-decoration: none;
     text-shadow: 0 1px 0 #ffffff;
 }
-.navbar .nav .dropdown .dropdown-menu li a {
-    padding: 2px 20px;
+
+.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;
+}
+
+// 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;
+}
+
+.row-fill-height, .row-fill-height>div[class*='col-'] {
+    display: flex;
+}
+.row-fill-height>div[class*='col-']>div {
+    width: 100%;
+}
+
+/* Show editable popover above side-nav */
+.editable-popup.popover {
+    z-index:1055;
+}
+
+.navbar-nav.side-nav {
+    box-shadow: inset -1px 0 #e7e7e7;
+}
+.navbar-nav.side-nav > li:first-child {
+    margin-top: 5px; /* keep "hover" bg below top nav bottom border */
+}
+.navbar-nav.side-nav > li > a {
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+.navbar-nav.side-nav > li.dropdown > ul.dropdown-menu > li > a {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+.navbar-nav.side-nav a.active,
+.navbar-nav.side-nav a:hover,
+.navbar-nav.side-nav a:focus {
+    border-right: 1px solid #ffffff;
+    background: #ffffff;
 }