Updated the datepicker to support the latest release from activeadmin…

… github
Papercloud · Feb 20, 2015 · 343b993 · 343b993
1 parent 5506c29
commit 343b993
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 70 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,87 +1,107 @@
 PATH
   remote: .
   specs:
-    flattened_active_admin (0.0.1)
-      rails (>= 4.0.0)
+    flattened_active_admin (0.0.5)
+      rails (>= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      mail (~> 2.5.4)
-    actionpack (4.1.0)
-      actionview (= 4.1.0)
-      activesupport (= 4.1.0)
-      rack (~> 1.5.2)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
-    actionview (4.1.0)
-      activesupport (= 4.1.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.0)
-      activemodel (= 4.1.0)
-      activesupport (= 4.1.0)
-      arel (~> 5.0.0)
-    activesupport (4.1.0)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     builder (3.2.2)
     erubis (2.7.0)
+    globalid (0.3.2)
+      activesupport (>= 4.1.0)
     hike (1.2.3)
-    i18n (0.6.9)
-    json (1.8.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (5.3.3)
-    multi_json (1.9.3)
-    polyglot (0.3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    i18n (0.7.0)
+    json (1.8.2)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.10.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.0)
-      actionmailer (= 4.1.0)
-      actionpack (= 4.1.0)
-      actionview (= 4.1.0)
-      activemodel (= 4.1.0)
-      activerecord (= 4.1.0)
-      activesupport (= 4.1.0)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0)
-      sprockets-rails (~> 2.0)
-    railties (4.1.0)
-      actionpack (= 4.1.0)
-      activesupport (= 4.1.0)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.0)
-    sprockets (2.12.1)
+    rake (10.4.2)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
-    thread_safe (0.3.3)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS

diff --git a/app/assets/images/active_admin/datepicker/datepicker-input-icon.png b/app/assets/images/active_admin/datepicker/datepicker-input-icon.png
diff --git a/app/assets/images/active_admin/nested_menu_arrow.gif b/app/assets/images/active_admin/nested_menu_arrow.gif
diff --git a/app/assets/images/active_admin/nested_menu_arrow_dark.gif b/app/assets/images/active_admin/nested_menu_arrow_dark.gif
diff --git a/app/assets/images/active_admin/orderable.png b/app/assets/images/active_admin/orderable.png
diff --git a/app/assets/stylesheets/flattened_active_admin/components/_date_picker.css.scss b/app/assets/stylesheets/flattened_active_admin/components/_date_picker.css.scss
@@ -1,7 +1,3 @@
-//= depend_on_asset "active_admin/datepicker/datepicker-nipple.png"
-//= depend_on_asset "active_admin/datepicker/datepicker-header-bg.png"
-//= depend_on_asset "active_admin/datepicker/datepicker-prev-link-icon.png"
-//= depend_on_asset "active_admin/datepicker/datepicker-next-link-icon.png"
 // -------------------------------------- Date Picker
 .ui-datepicker {
   background: #fff;
@@ -15,8 +11,6 @@
   text-align: center;
   width: 160px;
 
-  background: image-url('active_admin/datepicker/datepicker-nipple.png') no-repeat 0 -40px;
-
   a {
     text-decoration: none;
     &:hover {
@@ -25,12 +19,28 @@
   }
 
   .ui-datepicker-header {
-    background: image-url('active_admin/datepicker/datepicker-header-bg.png') no-repeat 0px 0px;
-    height: 12px;
-    padding: 16px 7px 8px;
+    height: 14px;
+    @include primary-gradient;
+    padding: 12px 5px 7px 4px;
+    margin: 0px 0px 2px 2px;
+    width: 147px;
+    border-top-left-radius: 7px;
+    border-top-right-radius: 7px;
     position: relative;
     z-index: 2000;
 
+    &:before {
+       content: "";
+       position: absolute;
+       right: 45%;
+       top: -6px;
+       width: 0px;
+       height: 0px;
+       border-left: 8.5px solid rgba(0, 0, 0, 0);
+       border-right: 8.5px solid rgba(0, 0, 0, 0);
+       border-bottom: 10px solid #676e73;
+    }
+
     .ui-datepicker-title {
       @include text-shadow(#000);
       color: #fff;
@@ -39,26 +49,40 @@
       font-weight: bold;
       line-height: 0.8em;
       text-align: center;
+
+      .ui-datepicker-month {
+        margin: -4px 0 0 0;
+      }
+      .ui-datepicker-year {
+        margin: -4px 0 0 0;
+      }
     }
 
+
     a {
       color: #fff;
       display: block;
       height: 19px;
       margin-top: -4px;
-      width: 20px;
+      width: 10px;
 
       &.ui-datepicker-prev {
         float: left;
-        background: image-url('active_admin/datepicker/datepicker-prev-link-icon.png') no-repeat 2px 5px;
+        width: 0;
+        height: 0;
+        margin: 0px 0px 0px 4px;
+        border-top: 5px solid transparent;
+        border-right: 5px solid white;
+        border-bottom: 5px solid transparent;
       }
       &.ui-datepicker-next {
         float: right;
-        background: image-url('active_admin/datepicker/datepicker-next-link-icon.png') no-repeat 12px 5px;
-      }
-      &:active {
-        margin-top: -3px;
-        height: 18px;
+        width: 0;
+        height: 0;
+        margin: 0px 4px 0px 0px;
+        border-top: 5px solid transparent;
+        border-left: 5px solid white;
+        border-bottom: 5px solid transparent;
       }
 
       span {