Merge branch 'master' into 1971-show-image-thumbnails

[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 1ea67d23251f130ae5cab5d7c2b2a36f9498acd9..455e4c0a9fa6cb13553cd121b5c64f427c8fbc90 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -122,7 +122,7 @@ ul.arvados-nav li ul li {
 }
 
 .inline-progress-container {
-    width: 100px;
+    width: 100%;
     display:inline-block;
 }
 
@@ -133,13 +133,14 @@ td.add-tag-button .add-tag-button {
     margin-right: 4px;
     opacity: 0.2;
 }
-td.add-tag-button:hover .add-tag-button {
+td.add-tag-button .add-tag-button:hover {
     opacity: 1;
 }
-.label.removable-tag {
-    margin-top: .2em;
+span.removable-tag-container {
+    line-height: 1.6;
 }
 .label.removable-tag a {
+    color: #fff;
     cursor: pointer;
 }
 
@@ -157,7 +158,7 @@ li.notification {
     background: rgb(66, 139, 202);
 }
 
-.arvados-nav-active a {
+.arvados-nav-active a, .arvados-nav-active a:hover {
     color: white;
 }
 
@@ -175,3 +176,12 @@ 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;
+}
+