kickstart_rails 3.0.60 → 3.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af3b7e2f5f173eeda699c690b04992f2760d3a7b
-  data.tar.gz: e0c67038a81a0720cceb73a52870363d8168d948
+  metadata.gz: c03ca73b410add461e621890a0b8f4d1b113a877
+  data.tar.gz: c6fcd9a5fac1ac386a6e18143688cb0f18bcc15c
 SHA512:
-  metadata.gz: 517bbb5b6a40132df9884536abbad5b137c6b889552c9587ff888c51d147e9a4c9c1c6000a34770fa1b0d5c70a95649e04abf5ad3b8f337ce7447c6b9cdabf89
-  data.tar.gz: fcefc0b57ce50b06b4f2188aeec1b422bc67decaba6ce120550f183183d2ce20e4b2508d231b2c5b5c97c609f8ef5ac3f426bf5cf4d8eab5d2b9d0457cc77415
+  metadata.gz: 3fd173f09f586548f977f3bdeeea26ec28f5f3a3ca70262004fde0cb52927affa84fb5501a8e9f3da8ab2b27c9e1ee2221f58e8a2499292222c0fe77432907d6
+  data.tar.gz: 7b61d81810c9f78f7f6f6e77816d8864feac96a78143df567c62258c0f585ecf25cb639014713747463c879f6fe37b7ba44cb32e5671dad8a732c6165cdbee86

data/app/assets/stylesheets/core/_direct-apply.sass

@@ -9,6 +9,9 @@ body
   &.dismiss-modal
     cursor: pointer
 
+[disabled]
+  cursor: not-allowed
+
 // Buttons
 // -------
 

data/app/assets/stylesheets/core/components/_buttons.sass

@@ -11,7 +11,7 @@
   &[disabled], &:disabled
     color: rgba(0, 0, 0, 0.25)
     pointer-events: none
-    // TODO: Cursor disabled?
+    cursor: not-allowed
 
   &.menu-item
     position: relative
@@ -131,17 +131,27 @@
       > a, > button, > input
         border-radius: 0
         border-left: 0
+        @if (lightness($background-color) < 75%)
+          border-right: 1px solid rgba(255, 255, 255, 0.1)
+        @else
+          border-right: 1px solid rgba(0, 0, 0, 0.1)
 
     &:first-child:not(:only-child)
       > a, > button, > input
         border-top-right-radius: 0
         border-bottom-right-radius: 0
+        @if (lightness($background-color) < 75%)
+          border-right: 1px solid rgba(255, 255, 255, 0.1)
+        @else
+          border-right: 1px solid rgba(0, 0, 0, 0.1)
+
 
     &:last-child:not(:only-child)
       > a, > button, > input
         border-top-left-radius: 0
         border-bottom-left-radius: 0
         border-left: 0
+        
 
     .button-dropdown
 
@@ -154,6 +164,7 @@
 
   > li > ul
     +button-dropdown-menu
+    right: auto
     display: none
 
   @content

data/app/assets/stylesheets/core/components/_dropdown_menu.sass

@@ -16,7 +16,6 @@
         right: 1px solid map-get($white, darker)
         bottom: 1px solid map-get($white, darker)
       border-radius: map-get($rootElement, border-radius)
-      box-shadow: 2px 2px 0px 2px rgba(0, 0, 0, 0.1)
       background: white
 
       &:before

data/app/assets/stylesheets/core/components/_navbar.sass

@@ -67,7 +67,7 @@
         > a:not([role=button])
           +color($background-color)
 
-          &:hover
+          &:hover, &.active
             @if (lightness($background-color) < 75%)
               color: white
             @else
@@ -81,7 +81,6 @@
 
 
 =navbar-default($layout: 'none', $background-color: map-get($white, darker), $breakpoint: $tablet, $collapse: false, $fixed: false)
-  // box-shadow: 0px 1px 0px darken($background-color, 12%) inset
   font-size: $default-font-size
   margin-bottom: $space
 
@@ -128,7 +127,6 @@
             ul
               left: auto
               right: -1px
-              box-shadow: -2px 2px 0px 2px rgba(0, 0, 0, 0.1)
 
       &:only-child
         @media screen and (min-width: $breakpoint)
@@ -142,12 +140,17 @@
         +root-element
         margin-bottom: 0
         border-radius: 0
-        padding: (map-get($rootElement, paddingV) - 1) (map-get($rootElement, paddingH))
+        padding: (2 * map-get($rootElement, paddingV)) (map-get($rootElement, paddingH))
         position: relative
-        margin:
-          left: (-1 * map-get($rootElement, paddingH))
-          right: (-1 * map-get($rootElement, paddingH))
         user-select: none
+        border:
+          left: 0px
+          right: 0px
+
+        @if ($collapse == true)
+          margin:
+            left: (-1 * map-get($rootElement, paddingH))
+            right: (-1 * map-get($rootElement, paddingH))
 
         @media screen and (min-width: $breakpoint)
           margin: 0
@@ -168,7 +171,7 @@
             background: transparent
             border-color: transparent
             color: inherit
-            margin-bottom: 0
+            // margin-bottom: 0
             font-family: Kickstart, 'Kickstart'
             padding:
               left: 0
@@ -189,6 +192,16 @@
           padding: (2 * map-get($rootElement, paddingV) - 1) (map-get($rootElement, paddingH))
           cursor: pointer
 
+          ul
+            box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.1)
+          //
+          //   li
+          //     border-color: white
+          //
+          //     a:not([role=button])
+          //       background: inherit
+          //       border-color: inherit
+
           &:before
             content: '='
             margin-right: 8px
@@ -201,18 +214,33 @@
 
           @media screen and (min-width: $breakpoint)
             &:before
-              content: ''
+              content: ' '
               display: none
 
+            &.open
+              &:before
+                content: ' '
+                display: block
+                position: absolute
+                bottom: -2px
+                left: 0
+                right: 0
+                height: 2px
+                background: inherit
+                margin: 0
+                z-index: 15 
+
             &:after
               content: '+'
               margin-left: 8px
 
-          &:hover
+          &:hover, &.active
             @if (lightness($background-color) < 75%)
               color: white
             @else
               color: rgba(0, 0, 0, 0.85)
+
+          &:hover
             background: darken($background-color, 5%)
             border-color: darken($background-color, 5%)
 
@@ -247,11 +275,18 @@
         ul
           border-top-left-radius: 0
           border-top-right-radius: 0
-          box-shadow: 2px 2px 0px 2px rgba(0, 0, 0, 0.1)
           display: none
 
+          @media screen and (min-width: $breakpoint)
+            border-top: 1px solid map-get($white, darker)
+
         ul[role=button]
-          display: inherit
+          display: inline-flex
+
+        ul[role=button], > [role=button], &.navbar-title button[role="button"]
+          margin: (-2 * map-get($rootElement, paddingV)) + 2
+            bottom: (-2 * map-get($rootElement, paddingV)) + 2 // Repeated to override navbar-title
+          vertical-align: text-bottom
 
         > a:not([role=button])
           text-decoration: none
@@ -260,7 +295,7 @@
           +root-element
           margin-bottom: 0
           border-radius: 0
-          margin: (-1 * map-get($rootElement, paddingV)) (-1 * map-get($rootElement, paddingH))
+          margin: (-2 * map-get($rootElement, paddingV) - 1) (-1 * map-get($rootElement, paddingH))
           padding:
             top: (2 * map-get($rootElement, paddingV))
             bottom: (2 * map-get($rootElement, paddingV))

data/lib/kickstart_rails/version.rb

@@ -1,3 +1,3 @@
 module Kickstart_rails
-  VERSION = "3.0.60"
+  VERSION = "3.0.61"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kickstart_rails
 version: !ruby/object:Gem::Version
-  version: 3.0.60
+  version: 3.0.61
 platform: ruby
 authors:
 - Adam Kochanowicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler