Merge branch 'master' into 3296-user-profile

[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 4fea7aebc09261df394dc754437157c9abe24e08..6b91783e60abe882bbe7b5ba06fb33a4979e790f 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -115,6 +115,15 @@ nav.navbar-fixed-top {
 .navbar.breadcrumbs .nav > li.nav-separator > i {
     color: #bbb;
 }
+.navbar.breadcrumbs .navbar-form {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+.navbar.breadcrumbs .navbar-text {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
 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 {
@@ -134,6 +143,11 @@ nav.navbar-fixed-top .navbar-nav.navbar-right > li > a:hover {
 
 .smart-scroll {
     overflow: auto;
+    margin-bottom: -15px;
+}
+
+.infinite-scroller .fa-warning {
+    color: #800;
 }
 
 .inline-progress-container div.progress {
@@ -225,3 +239,12 @@ div#wrapper {
 svg text {
     font-size: 6pt;
 }
+
+div.pane-content iframe {
+  width: 100%;
+  border: none;
+}
+
+div.rounded {
+  border-radius: 3px;
+}