activeadmin 0.6.0 → 0.6.1

data/app/assets/stylesheets/active_admin/_header.css.scss

@@ -1,62 +1,68 @@
-// ----------------------------------- Header 
-#header { 
+// ----------------------------------- Header
+#header {
   @include primary-gradient;
   @include shadow;
   @include text-shadow(#000);
+  display: table;
   height: 20px;
+  width: 100%;
   overflow: visible;
   position: inherit;
-  padding: 9px $horizontal-page-margin;
+  padding: 5px 0;
   z-index: 900;
 
-  h1 { 
-    display: inline-block; 
-    color: #cdcdcd;
-    float: left;
-    margin-right: 20px; 
+  h1 {
+    display: table-cell;
+    vertical-align: middle;
+    white-space: nowrap;
+    color:  $page-header-text-color;
+    margin-right: 20px;
     margin-bottom: 0px;
-    padding-top: 3px;
-    font-size: 1.3em; 
+    padding: 3px $horizontal-page-margin 0 $horizontal-page-margin;
+    font-size: 1.3em;
     font-weight: normal;
-    
+    line-height: 1.2;
+
     a {
       text-decoration: none;
-      
+
       &:hover {
         color: #fff;
       }
-    } 
-    
+    }
+
     img {
       position: relative;
       top: -2px;
     }
   }
 
-  a, a:link { color: #cdcdcd; }
+  a, a:link { color: $page-header-text-color; }
 
   .header-item {
-    float: left;
     top: 2px;
     position: relative;
     height: 20px
   }
 
   ul.tabs {
-    display: inline-block; 
+    display: table-cell;
+    vertical-align: middle;
     height: 100%;
-    margin: 0; 
+    margin: 0;
     padding: 0;
 
-    & > li { 
-      display: inline-block; 
-      margin-right: 4px; 
-      font-size: 1.0em; 
-      position: relative; 
+    & > li {
+      display: inline-block;
+      margin-right: 4px;
+      margin-top: 5px;
+      margin-bottom: 5px;
+      font-size: 1.0em;
+      position: relative;
 
-      a { 
-        text-decoration: none; 
-        padding: 6px 10px 4px 10px; 
+      a {
+        text-decoration: none;
+        padding: 6px 10px 4px 10px;
         position: relative;
         @include rounded(10px);
       }
@@ -66,23 +72,23 @@
         color: #fff;
       }
 
-      &.has_nested > a { 
-        background: url(active_admin_image_path('nested_menu_arrow.gif')) no-repeat 89% 50%; 
-        padding-right: 20px; 
+      &.has_nested > a {
+        background: url(active_admin_image_path('nested_menu_arrow.gif')) no-repeat 89% 50%;
+        padding-right: 20px;
         z-index: 1050;
       }
 
-      &.has_nested.current > a { 
-        background: $current-menu-item-background url(active_admin_image_path('nested_menu_arrow_dark.gif')) no-repeat 89% 50%; 
-        padding-right: 20px; 
+      &.has_nested.current > a {
+        background: $current-menu-item-background url(active_admin_image_path('nested_menu_arrow_dark.gif')) no-repeat 89% 50%;
+        padding-right: 20px;
       }
 
-      &:hover > a { 
+      &:hover > a {
         background: $hover-menu-item-background;
         color: #fff;
       }
 
-      &.has_nested:hover > a { 
+      &.has_nested:hover > a {
         @include rounded-top(10px);
         border-bottom: 5px solid $hover-menu-item-background;
         background: $hover-menu-item-background url(active_admin_image_path('nested_menu_arrow_dark.gif')) no-repeat 89% 50%;
@@ -92,24 +98,24 @@
       /* Hover on li, display the ul */
       &:hover ul { display: block;}
       /* Drop down menus */
-      ul { 
+      ul {
         background: $hover-menu-item-background;
         @include rounded-all(0,10px,10px,10px);
         @include shadow(0, 1px, 3px, #444);
-        position: absolute; 
-        width: 175px; 
+        position: absolute;
+        width: 175px;
         margin-top: 5px;
         float: left;
-        display: none; 
+        display: none;
         padding: 3px 0px 5px 0;
         list-style: none;
         z-index: 1010;
 
-        li { 
-          margin: 0px; 
-          a { 
+        li {
+          margin: 0px;
+          a {
             background: none;
-            display: block; 
+            display: block;
             &:hover { color: #fff; background: none; }
           }
 
@@ -122,12 +128,18 @@
 
   }
 
-  #utility_nav { 
+  #tabs {
+    width: 100%;
+  }
+
+  #utility_nav {
     color: #aaa;
-    float: right;
-    display: inline-block;
+    display: table-cell;
+    white-space: nowrap;
     margin: 0;
     padding: 0;
+    padding-right: 26px;
+    text-align: right;
 
     a { text-decoration: none; }
     a:hover { color: #fff; }

data/app/assets/stylesheets/active_admin/_typography.css.scss

@@ -1,7 +1,7 @@
 // Adapted from Blueprint CSS Framework
 //
 // Copyright (c) 2007 - 2010 blueprintcss.org
-// 
+//
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
 // files (the "Software"), to deal in the Software without
@@ -10,10 +10,10 @@
 // copies of the Software, and to permit persons to whom the
 // Software is furnished to do so, subject to the following
 // conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -25,12 +25,12 @@
 
 // Default font settings.  The font-size percentage is of 16px. (0.75 * 16px = 12px) */
 html { font-size:100.01%; }
-& { font-size: 75%; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
+body { font-size: 75%; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
 
 // Headings
-h1,h2,h3,h4,h5,h6 { 
-  font-weight: normal; 
-  color: $primary-color; 
+h1,h2,h3,h4,h5,h6 {
+  font-weight: normal;
+  color: $primary-color;
   img { margin: 0; }
 }
 
@@ -42,8 +42,8 @@ h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; }
 h6 { font-size: 1em; font-weight: bold; }
 
 
-p { 
-  margin: 0 0 1.5em; 
+p {
+  margin: 0 0 1.5em;
 
   .left     { margin: 1.5em 1.5em 1.5em 0; padding: 0; }
   .right { margin: 1.5em 0 1.5em 1.5em; padding: 0; }

data/app/assets/stylesheets/active_admin/components/_batch_actions.css.scss

@@ -3,7 +3,7 @@
 	>.resource_selection_toggle_cell {
 		float:left;
 	}
-	#collection_selection_toggle_explaination {  
+	#collection_selection_toggle_explaination {
 		float:left;
 		margin-left:5px;
 		font-style:italic;

data/app/assets/stylesheets/active_admin/components/_blank_slates.scss

@@ -1,18 +1,18 @@
 .blank_slate_container {
   clear: both;
   text-align: center;
-  
+
   .blank_slate {
     @include rounded;
     -webkit-font-smoothing: antialiased;
-    border: 1px dashed #DADADA;
-    color: #AAA;
+    border:  $blank-slate-border;
+    color: $blank-slate-primary-color;
     display: inline-block;
     font-size: 1.2em;
     font-weight: bold;
     padding: 14px 25px;
     text-align: center;
-    
+
     small {
       display: block;
       font-size: 0.9em;
@@ -28,4 +28,4 @@
 
 .with_sidebar .blank_slate_container .blank_slate {
   margin-top: 80px;
-}
+}

data/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss

@@ -7,7 +7,7 @@
   text-transform: uppercase;
 
   a, a:link, a:visited, a:active {
-    color: #8a949e ;
+    color: $breadcrumbs-color;
     text-decoration: none;
   }
 
@@ -15,6 +15,6 @@
 
   .breadcrumb_sep {
     margin: 0 2px;
-    color: #aab2ba;
+    color: $breadcrumbs-separator-color;
   }
 }

data/app/assets/stylesheets/active_admin/components/_comments.css.scss

@@ -1,4 +1,4 @@
-// -------------------------------------- Admin Notes 
+// -------------------------------------- Admin Notes
 .comments {
 
   .active_admin_comment {

data/app/assets/stylesheets/active_admin/components/_date_picker.css.scss

@@ -1,4 +1,4 @@
-// -------------------------------------- Date Picker 
+// -------------------------------------- Date Picker
 .ui-datepicker {
   background: #fff;
   -webkit-background-clip: padding-box;
@@ -10,23 +10,23 @@
   padding: 0;
   text-align: center;
   width: 160px;
-  
+
   background: url(active_admin_image_path('datepicker/datepicker-nipple.png')) no-repeat 0 -40px;
-  
-  a { 
+
+  a {
     text-decoration: none;
     &:hover {
       cursor: pointer;
     }
   }
-  
+
   .ui-datepicker-header {
     background: url(active_admin_image_path('datepicker/datepicker-header-bg.png')) no-repeat 0px 0px;
     height: 12px;
     padding: 16px 7px 8px;
     position: relative;
     z-index: 2000;
-    
+
     .ui-datepicker-title {
       @include text-shadow(#000);
       color: #fff;
@@ -36,33 +36,33 @@
       line-height: 0.8em;
       text-align: center;
     }
-    
-    a { 
+
+    a {
       color: #fff;
       display: block;
       height: 19px;
       margin-top: -4px;
       width: 20px;
-      
-      &.ui-datepicker-prev { 
+
+      &.ui-datepicker-prev {
         float: left;
         background: url(active_admin_image_path('datepicker/datepicker-prev-link-icon.png')) no-repeat 2px 5px;
       }
       &.ui-datepicker-next {
-        float: right;  
+        float: right;
         background: url(active_admin_image_path('datepicker/datepicker-next-link-icon.png')) no-repeat 12px 5px;
       }
       &:active {
         margin-top: -3px;
         height: 18px;
       }
-      
+
       span {
         display: none;
       }
     }
   }
-  
+
   table.ui-datepicker-calendar {
     @include rounded-bottom;
     @include shadow(0,1px,6px,rgba(0,0,0,0.26));
@@ -73,12 +73,12 @@
     position: relative;
     top: -2px;
     width: 156px;
-    
+
     td, th {
       padding: 0px;
       text-align: center;
     }
-    
+
     thead th {
       background-color: #dbdddf;
       color: #333333;
@@ -86,22 +86,22 @@
       font-size: 0.8em;
       padding-top: 1px;
     }
-    
+
     tbody {
       color: #666666;
-      
+
       td {
         border: none;
         height: 24px;
         width: 22px;
-        
+
         a {
           @include rounded;
           color: #666666;
           font-weight: bold;
           font-size: 0.85em;
           padding: 4px;
-          
+
           &.ui-state-active {
             background-color: #5a5f64;
             color: #fff;
@@ -120,4 +120,4 @@
       }
     }
   }
-}
+}

data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss

@@ -34,25 +34,25 @@
 
   .dropdown_menu_nipple {
 
-    // The nipple's border    
+    // The nipple's border
     content: "";
     position: absolute;
     top: -6px;
     display: block;
-    width: 0;  
-    height: 0;  
+    width: 0;
+    height: 0;
     border-width: 0 6px 6px;
     border-style: solid;
-    border-color: darken($primary-color, 4%) transparent; 
+    border-color: darken($primary-color, 4%) transparent;
     z-index: 100;
 
-    // The nipple's inner shadow 
+    // The nipple's inner shadow
 
     &:before {
-      content: ' ';  
-      position: absolute;  
-      width: 0;  
-      height: 0;  
+      content: ' ';
+      position: absolute;
+      width: 0;
+      height: 0;
       border-width: 0 5px 5px;
       border-style: solid;
       border-color: lighten($primary-color, 15%) transparent;
@@ -63,10 +63,10 @@
     // The nipple's background color
 
     &:after {
-      content: ' ';  
-      position: absolute;  
-      width: 0;  
-      height: 0;  
+      content: ' ';
+      position: absolute;
+      width: 0;
+      height: 0;
       border-width: 0 5px 5px;
       border-style: solid;
       border-color: lighten($primary-color, 4%) transparent;
@@ -92,8 +92,8 @@
     .dropdown_menu_list {
       display: block;
       background-color: #FFF;
-      border: solid 1px darken($primary-color, 10%);    
-      box-shadow: lighten($primary-color, 5%) 0px 1px 0px 0px;    
+      border: solid 1px darken($primary-color, 10%);
+      box-shadow: lighten($primary-color, 5%) 0px 1px 0px 0px;
       border-radius: 3px;
       margin: 0;
       overflow: hidden;
@@ -109,7 +109,7 @@
 
         a {
           display: block;
-          @include box-sizing(padding-box);        
+          @include box-sizing(padding-box);
           font-size: 0.95em;
           font-weight: bold;
           padding: 7px 16px 5px;