yousty-activeadmin 1.0.4.pre → 1.0.5.pre

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

@@ -86,8 +86,9 @@
     border: solid 1px darken($primary-color, 10%);
     border-top-color: darken($primary-color, 4%);
     border-bottom-color: darken($primary-color, 17%);
-
     border-radius: 4px;
+    z-index: 2000;
+    display: none;
 
     .dropdown_menu_list {
       display: block;
@@ -116,6 +117,7 @@
           text-decoration: none;
           text-align: center;
           -webkit-font-smoothing: antialiased;
+          white-space: nowrap;
 
           &:hover {
             @include highlight-gradient;

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

@@ -0,0 +1,37 @@
+body.logged_in {
+  .flash {
+    @include gradient(#f7f1d3, #f5edc5);
+    @include text-shadow(#fafafa);
+    border-bottom: 1px solid #eee098;
+    color: #cb9810;
+    font-weight: bold;
+    font-size: 1.1em;
+    line-height: 1.0em;
+    padding: 13px 30px 11px;
+    position: relative;
+
+    &.flash_notice {
+      @include gradient(#dce9dd, #ccdfcd);
+      border-bottom: 1px solid #adcbaf;
+      color: #416347;
+    }
+    &.flash_error {
+      @include gradient(#f5e4e4, #f1dcdc);
+      border-bottom: 1px solid #e0c2c0;
+      color: #b33c33;
+    }
+  }
+}
+
+body.logged_out {
+  .flash {
+    @include no-shadow;
+    @include text-shadow(#fff);
+    background: none;
+    color: #666;
+    font-weight: bold;
+    line-height: 1.0em;
+    padding: 0;
+    margin-bottom: 8px;
+  }
+}

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

@@ -0,0 +1,34 @@
+.ui-widget-overlay {
+  position: fixed;
+  background: rgba(0,0,0,.2);
+  top: 0; left: 0; right: 0; bottom: 0;
+  z-index: 1001;
+}
+
+.ui-dialog {
+  position: fixed;
+  z-index: 1002;
+  @include section-background;
+  box-shadow: rgba(0,0,0,0.5) 0 0 10px;
+
+  .ui-dialog-titlebar {
+    @include section-header;
+    span { font-size: 1.1em }
+  }
+
+  ul { list-style-type: none }
+  li { margin: 10px 0 }
+  label { margin-right: 10px }
+
+  .ui-dialog-buttonpane, form {
+    padding: 7px 15px 13px
+  }
+  .ui-dialog-buttonpane button {
+    & { @include dark-button } // OK
+    &:last-child { @include light-button } // Cancel
+  }
+}
+
+.active_admin_dialog.ui-dialog {
+  .ui-dialog-titlebar-close { display: none }
+}

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

@@ -32,3 +32,13 @@
 .download_links {
   float: left;
 }
+
+.pagination_per_page {
+  float: right;
+  margin-left: 4px;
+  select {
+    @include light-button;
+    @include rounded(0px);
+    padding: 1px 5px;
+  }
+}

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

@@ -9,4 +9,8 @@
   &.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
   &.warn, &.warning, &.orange { background: #e29b20; }
   &.error, &.errored, &.red { background: #d45f53; }
+
+  &.yes { background: #6090DB }
+  &.no  { background: grey }
+
 }

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

@@ -0,0 +1,67 @@
+.table_tools {
+  @include clearfix;
+  margin-bottom: 16px;
+}
+
+.table_tools .dropdown_menu {
+  float: left;
+}
+
+a.table_tools_button, .table_tools .dropdown_menu_button {
+  @include light-button;
+  @include gradient(#FFFFFF, #F0F0F0);
+  @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
+  font-size: 0.9em;
+  padding: 4px 14px 4px;
+  margin: 0;
+
+  &:not(.disabled) {
+    &:hover {
+      @include gradient(#FFFFFF, #F6F6F6);
+    }
+
+    &:active {
+      @include border-colors(#d7d7d7, #c8c8c8, #c3c3c3);
+      box-shadow: 0 1px 1px 0 rgba(0,0,0,0.17) inset;
+      @include gradient(#FFFFFF, #E8E8E8);
+    }
+  }
+}
+
+.table_tools_segmented_control {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+
+  li {
+    float: left;
+
+    a {
+      border-width: 1px .5px 1px .5px;
+      border-radius: 0;
+    }
+
+    &:first-child a {
+      border-left-width: 1px;
+      border-top-left-radius: 12px;
+      border-bottom-left-radius: 12px;
+    }
+
+    &:last-child a {
+      border-right-width: 1px;
+      border-top-right-radius: 12px;
+      border-bottom-right-radius: 12px;
+    }
+
+    &.selected a {
+      @include gradient(#F0F0F0, #FDFDFD);
+      box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1) inset;
+      cursor: default;
+
+      &:hover {
+        @include gradient(#F0F0F0, #FDFDFD);
+      }
+    }
+
+  }
+}

data/app/assets/stylesheets/active_admin/components/{_tables.css.scss → _tables.scss}

@@ -1,3 +1,4 @@
+//= depend_on_asset "active_admin/orderable.png"
 // ----------------------------------- Tables
 
 table tr {

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

@@ -0,0 +1,65 @@
+.ui-tabs-nav {
+  list-style: none;
+  display: block;
+  width: auto;
+  margin-bottom: -12px;
+  padding-left: 0;
+  overflow: auto;
+  margin-left: 15px;
+
+  li {
+    display: block;
+    position: relative;
+    margin: 0;
+    padding: 0;
+    float: left;
+
+    &:first-child a {
+      border-left-width: 1px;
+      border-top-left-radius: 12px;
+      border-bottom-left-radius: 12px;
+    }
+
+    &:last-child a {
+      border-right-width: 1px;
+      border-top-right-radius: 12px;
+      border-bottom-right-radius: 12px;
+    }
+
+    a {
+      @include light-button;
+      @include gradient(#FFFFFF, #F0F0F0);
+      @include border-colors(#d9d9d9, #d0d0d0, #c5c5c5);
+      text-decoration: none;
+      border-radius: 0;
+      border-width: 1px .5px 1px .5px;
+      margin-right: 0;
+      padding: 4px 14px 4px;
+
+      &:not(.disabled) {
+        &:hover {
+          @include gradient(#FFFFFF, #F6F6F6);
+        }
+      }
+    }
+
+    &.ui-tabs-active {
+      a {
+        cursor: default;
+        @include gradient(#F0F0F0, #FDFDFD);
+        box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1) inset;
+
+        a:hover {
+          @include gradient(#F0F0F0, #FDFDFD);
+        }
+      }
+    }
+  }
+}
+
+.tab-content {
+  border: 1px solid #D3D3D3;
+  padding: 15px;
+  padding-top: 30px;
+  text-align: left;
+}

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

@@ -0,0 +1,16 @@
+.unsupported_browser {
+  padding: 10px 30px;
+  color: #211e14;
+  background-color: #fae692;
+  @include gradient(#feefae, #fae692);
+  border-bottom: 1px solid #b3a569;
+
+  h1 {
+    font-size: 13px;
+    font-weight: bold;
+  }
+
+  p {
+    margin-bottom: 0.5em;
+  }
+}

data/app/assets/stylesheets/active_admin/mixins/{_gradients.css.scss → _gradients.scss}

@@ -5,7 +5,7 @@ $secondary-gradient-stop: #dfe1e2 !default;
   background: $start;
   background: -webkit-linear-gradient(-90deg, $start, $end);
   background: -moz-linear-gradient(-90deg, $start, $end);
-  background: linear-gradient(-90deg, $start, $end);
+  background: linear-gradient(180deg, $start, $end);
   // IE 6 & 7
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start)}', endColorstr='#{ie-hex-str($end)}');
   // IE 8

data/app/assets/stylesheets/active_admin/mixins/{_icons.css.scss → _icons.scss}

@@ -4,13 +4,12 @@ span.icon svg { vertical-align: baseline; }
 
 @mixin icon-color ($color) {
   span.icon svg {
-    path, polygon, rect, circle { fill: $color !important; }
+    path, polygon, rect, circle { fill: $color; }
   }
 }
 
 @mixin icon-size ($size) {
   span.icon { width: $size; height: $size; }
-  span.icon svg { width: $size; height: $size; }
 }
 
 @mixin icon($color, $size) {

data/app/assets/stylesheets/active_admin/mixins/{_sections.css.scss → _sections.scss}

@@ -25,7 +25,13 @@
   @include section-background;
   margin-bottom: 20px;
 
-  > h3 { @include section-header; }
+  > h3 {
+    @include section-header;
+
+    .header_action {
+      float: right;
+    }
+  }
 
   > div { padding: 3px $section-padding $section-padding $section-padding; }
 

data/app/assets/stylesheets/active_admin/mixins/{_variables.css.scss → _variables.scss}

@@ -3,7 +3,7 @@
 // to 'app/assets/stylesheets/active_admin.css.scss'.
 
 // Colors
-$body-background-color: #FFF;
+$body-background-color: #FFF !default;
 $primary-color: #5E6469 !default;
 $secondary-color: #f0f0f0 !default;
 $text-color: #323537 !default;
@@ -14,19 +14,21 @@ $hover-menu-item-background: lighten($primary-color, 12%) !default;
 $table-stripe-color: lighten($primary-color, 57%) !default;
 $table-selected-color: #d9e4ec !default;
 $error-color: #932419 !default;
-$blank-slate-primary-color: #AAA;
-$breadcrumbs-color: #8a949e;
-$breadcrumbs-separator-color: #aab2ba;
-$required-field-marker-color: #aaa;
-$form-label-color: $section-header-text-color;
-$page-header-text-color: #cdcdcd;
+$blank-slate-primary-color: #AAA !default;
+$breadcrumbs-color: #8a949e !default;
+$breadcrumbs-separator-color: #aab2ba !default;
+$required-field-marker-color: #aaa !default;
+$form-label-color: $section-header-text-color !default;
+$page-header-text-color: #cdcdcd !default;
 
 // Sizes
+$border-width: 1px !default;
 $horizontal-page-margin: 30px !default;
 $sidebar-width: 270px !default;
 $cell-padding: 5px 10px 3px 10px !default;
 $cell-horizontal-padding: 12px !default;
 $section-padding: 15px !default;
 $text-input-horizontal-padding: 10px !default;
+$text-input-total-padding: $text-input-horizontal-padding * 2 + $border-width * 2;
 
-$blank-slate-border: 1px dashed #DADADA
+$blank-slate-border: 1px dashed #DADADA !default;

data/app/assets/stylesheets/active_admin/{print.css.scss → print.scss}

@@ -282,3 +282,7 @@ form {
     }
   }
 }
+
+.unsupported_browser {
+  display: none;
+}

data/app/assets/stylesheets/active_admin/structure/_title_bar.scss

@@ -25,18 +25,21 @@
     margin: 0;
     padding: 0;
     font-size: 2.6em;
+    line-height: 100%;
     font-weight: bold;
   }
 
   .action_items {
-    a {
-      @include light-button;
-      padding: 12px 17px 10px;
-      span.icon { vertical-align: bottom; margin-right: 4px;}
-      margin: 0px;
+    span.action_item {
+      & > a, & > .dropdown_menu > a {
+        @include light-button;
+        padding: 12px 17px 10px;
+        span.icon { vertical-align: bottom; margin-right: 4px;}
+        margin: 0px;
 
-      &:hover{
-        @include icon-color(#000);
+        &:hover{
+          @include icon-color(#000);
+        }
       }
     }
   }

data/app/views/active_admin/devise/confirmations/new.html.erb

@@ -0,0 +1,15 @@
+<div id="login">
+  <h2><%= render_or_call_method_or_proc_on(self, active_admin_application.site_title) %> <%= title t('active_admin.devise.resend_confirmation_instructions.title') %></h2>
+
+  <%= devise_error_messages! %>
+  <%= active_admin_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+    f.inputs do
+      f.input :email
+    end
+    f.actions do
+      f.action :submit, label: t('active_admin.devise.resend_confirmation_instructions.submit'), button_html: { value: t('active_admin.devise.resend_confirmation_instructions.submit') }
+    end
+  end %>
+
+  <%= render partial: "active_admin/devise/shared/links" %>
+</div>

data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @resource.reset_password_token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb

@@ -4,4 +4,4 @@
 
 <p>Click the link below to unlock your account:</p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token) %></p>