Releasing v0.1.2

formaweb · Sep 27, 2016 · 8c1b7a3 · 8c1b7a3
1 parent 584256b
commit 8c1b7a3
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 52 deletions.
diff --git a/app/assets/stylesheets/formadmin/_formadmin.scss b/app/assets/stylesheets/formadmin/_formadmin.scss
@@ -1,11 +1,11 @@
-@import 'formadmin/core/settings',
-        'formadmin/core/mixins',
+@import 'core/settings',
+        'core/mixins',
 
-        'formadmin/core/animations',
-        'formadmin/core/reset',
-        'formadmin/core/core',
+        'core/animations',
+        'core/reset',
+        'core/core',
 
-        'formadmin/atoms/*',
-        'formadmin/layouts/*',
-        'formadmin/components/*',
-        'formadmin/pages/*';
+        'atoms/*',
+        'layouts/*',
+        'components/*',
+        'pages/*';
diff --git a/app/assets/stylesheets/formadmin/atoms/_turbolinks.scss b/app/assets/stylesheets/formadmin/atoms/_turbolinks.scss
@@ -0,0 +1,7 @@
+.turbolinks-progress-bar {
+  background-color: $primary-color;
+  border-radius: 0 $circular-radius $circular-radius 0;
+  bottom: 0;
+  position: fixed;
+  height: 3px;
+}
diff --git a/app/assets/stylesheets/formadmin/components/_indexes.scss b/app/assets/stylesheets/formadmin/components/_indexes.scss
@@ -23,13 +23,13 @@
     .resource_selection_cell {
       left: 15px;
       position: absolute;
-      top: 15px;
+      top: 13px;
     }
 
     h3 {
       @extend %header;
       margin: 0;
-      padding-left: 45px;
+      padding-left: 60px;
     }
 
     .content {

diff --git a/app/assets/stylesheets/formadmin/layouts/_header.scss b/app/assets/stylesheets/formadmin/layouts/_header.scss
@@ -34,60 +34,50 @@
       padding: 0;
     }
 
-    li {
-      font-size: 14px;
-      list-style: none;
-    }
-
     a {
       color: rgba($white, 0.9);
       text-decoration: none;
       transition: background 250ms, color 250ms;
     }
 
+    li {
+      font-size: 14px;
+      list-style: none;
+      position: relative;
+    }
+
     > li {
       display: inline-block;
       margin: 10px 5px 10px 0;
-      position: relative;
+
+      &.current > a,
+      &:hover > a {
+        background: tint($primary-color, 25%);
+        color: $white;
+      }
 
       > a {
         border-radius: $radius;
         padding: 5px 10px;
       }
 
       &.has_nested {
-        > a,
-        &:hover > a,
-        &.current > a {
-          background-position: calc(100% - 7px) 50%;
-          background-repeat: no-repeat;
+        > a:before {
+          border: 3px solid transparent;
+          border-bottom: 0;
+          border-top-color: rgba($white, 0.5);
         }
 
-        > a {
-          background-image: asset-url('active_admin/nested_menu_arrow.gif');
-          padding-right: 20px;
-        }
-
-        &:hover > a,
-        &.current > a {
-          background-image: asset-url('active_admin/nested_menu_arrow_dark.gif');
-        }
-
-        &:hover > a {
-          border-radius: $radius $radius 0 0;
+        &:hover > a:before,
+        &.current > a:before {
+          border-left-color: transparent;
+          border-top-color: $primary-color;
         }
       }
 
-      &:hover ul {
-        height: auto;
-        opacity: 1;
-        transform: scale(1);
-      }
-
-      &.current > a,
-      &:hover > a {
-        background: tint($primary-color, 25%);
-        color: $white;
+      .has_nested > ul {
+        right: -100%;
+        top: 0;
       }
     }
 
@@ -98,24 +88,54 @@
       max-width: calc(100% + 20px);
       min-width: 175px;
       opacity: 0;
-      overflow: hidden;
-      padding: 5px 10px;
+      padding: 5px 0;
       position: absolute;
       transform: scale(0);
       transform-origin: left top;
       transition: opacity 250ms, transform 250ms;
       width: 20%;
+      z-index: 11;
 
       a {
         display: block;
-        padding: 5px 0;
-        transition: margin 250ms;
+        padding: 5px 10px;
+        transition: all 250ms;
+      }
+
+      li:hover > a,
+      a:hover {
+        background-color: rgba($primary-color, 0.5);
+        color: $white;
+      }
+    }
 
-        &:hover {
-          margin-left: 3px;
-          color: $white;
+    .has_nested {
+      &:hover > ul {
+        height: auto;
+        opacity: 1;
+        transform: scale(1);
+      }
+
+      > a {
+        padding-right: 23px;
+        position: relative;
+
+        &:before {
+          border: 3px solid transparent;
+          border-right: 0;
+          border-left-color: rgba($white, 0.5);
+          content: '';
+          position: absolute;
+          top: 50%;
+          transition: border-color 250ms;
+          right: 10px;
         }
       }
+
+      &:hover > a:before,
+      &.current > a:before {
+        border-left-color: $primary-color;
+      }
     }
   }
 

diff --git a/lib/formadmin/version.rb b/lib/formadmin/version.rb
@@ -1,3 +1,3 @@
 module Formadmin
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end