Merge branch '6362-asset-config' refs #6362

[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 ec7eee44b72d3954600a79365d9f4eaa2896e56a..bab72893bd921dc2f6b330d6a2e2277d1e817243 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -7,14 +7,15 @@
  *
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require bootstrap
- *= require bootstrap3-editable/bootstrap-editable
- *= require morris
- *= require_tree .
  */
 
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
+@import 'bootstrap3-editable/bootstrap-editable';
+
+//= require morris
+//= require_tree .
+
 .contain-align-left {
     text-align: left;
 }
@@ -296,3 +297,15 @@ span.editable-textile {
 ul.nav.nav-tabs {
     font-size: 90%
 }
+
+.hover-dropdown:hover .dropdown-menu {
+  display: block;
+}
+
+.arv-description-as-subtitle .editable-inline,
+.arv-description-as-subtitle .editable-inline .form-group,
+.arv-description-as-subtitle .editable-inline .form-group .editable-input,
+.arv-description-as-subtitle .editable-inline .form-group .editable-input textarea,
+{
+    width: 98%!important;
+}