Update layout fo fix left side tabs CSS and some bugs on layout

Conflicts: core/app/assets/stylesheets/refinery/layout.css.scss
refinery · Jan 16, 2015 · d6e6e11 · d6e6e11
1 parent afca0bc
commit d6e6e11
Showing 1 changed file with 30 additions and 29 deletions.
diff --git a/core/app/assets/stylesheets/refinery/layout.css.scss b/core/app/assets/stylesheets/refinery/layout.css.scss
@@ -57,7 +57,7 @@ label[for] {
   @include box-sizing(border-box);
   @include right-rounded($standard_rounding);
   background-color: white;
-  padding: 30px 15px;
+  padding: 1.5em 1em;
   position: relative;
   float: left;
   width: $admin_width - $menu_width;
@@ -84,7 +84,7 @@ select.widest {
 }
 #actions {
   float: right;
-  width: 25%;
+  width: 30%;
   padding-left: 15px;
   padding-top: 0px;
   ul {
@@ -413,38 +413,39 @@ header {
   a {
     @include box-sizing(border-box);
     display: block;
-    padding: 7px 13px;
-    font-size: 13px;
-    background: #CCB;
-    margin-top: 1px;
-    color: black;
+    padding: 8px 16px;
+    font-size: 14px;
+    background-color: rgba(255, 255, 255, 0.2);
+    margin-bottom: 2px;
+    color: white;
     font-weight: normal;
-    margin-right: 0px;
     position: relative;
-    &:first-child {
-      margin-top: 0;
-    }
     &.active, &:hover, &:focus {
-      background-color: white;
+      background: white;
       color: #ff5500;
     }
+    &.active {
+      margin-left: -0.5em;
+    }
+  }
+
+  a#menu_reorder,
+  a#menu_reorder_done {
+    height: 14px;
+    width: 14px;
+    margin-bottom: 0;
+    padding: 6px;
+    cursor: pointer;
+    vertical-align: middle;
+    text-align: center;
+    float: right;
+    @include box-sizing(content-box);
+  }
+  a#menu_reorder_done {
+    background: white;
   }
 }
-#menu a#menu_reorder, #menu a#menu_reorder_done {
-  height: 14px;
-  width: 14px;
-  margin-top: 1px;
-  margin-right: 0px;
-  padding: 6px;
-  cursor: pointer;
-  vertical-align: middle;
-  text-align: center;
-  float: right;
-  @include box-sizing(content-box);
-}
-#menu a#menu_reorder_done {
-  background: white;
-}
+
 pre {
   margin: 0;
   padding: 0;
@@ -1000,7 +1001,7 @@ ul#menu.reordering_menu li a {
   line-height: 18px;
   padding: 2px;
   font-size: 16px;
-  width: 100px;
+  width: 10em;
 }
 .cancel-search {
   float: right;
@@ -1510,7 +1511,7 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
   height: 24px;
   margin-right: 3px;
   padding-top: 1px;
-    
+
   span.code {
     display: block;
     position: absolute;