leather 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714806637994d05adc0eeb9dfdac5697d3a64507
-  data.tar.gz: 23bf11e4bd547f64d0b109036dba8cc6f8b0693b
+  metadata.gz: 43eabab4009a76849f175719778c30c2c5a3bc94
+  data.tar.gz: 22023eff4f4cccd72ad27f775589f35d8f1102f7
 SHA512:
-  metadata.gz: f3693be45cb5a6b3db851ef0fa35f940a282c345fe8cfaf844de6de28946274497b411e805fca2b1286a29a1780134b327fdd9af1ccea0b8da72f7465573acae
-  data.tar.gz: c1f0e9aa758163ac0e49fe131dc45879df5190e6fd5c93ffd72f8bbd2951a96985014aac96e545b1639c3d255e0d02de0d3cbc06d652b32667ec255d2def42d4
+  metadata.gz: a5d0b74bb6e1553ae57fdeb375aa433d2388748f594eaeffbdb57eb439d7ac01a7abc3969de5e0e77efb2b74a37a4710fa7f5fbf9dd6505aa4c3e1f76d6c4cc2
+  data.tar.gz: 1811276929d7855dc5c0a620b577ef06b31dcea19facb5a8c79ac479007b61c400bd6121226f8c9f957c8312e73dd0efea132cf3a2f8c03a6c8b14c053440c73

data/app/assets/javascripts/leather/off_canvas.js.coffee

@@ -0,0 +1,44 @@
+$ ->
+  if $(".off-canvas").length > 0
+    offCanvas.init()
+
+offCanvas =
+  init: ->
+    @setupDocument()
+    @bindEvents()
+
+  setupDocument: ->
+    $('body').wrapInner("<div id='off-canvas-wrapper' />")
+    $(".off-canvas, .fixed").each ->
+      $("#off-canvas-wrapper").before(this)
+
+  bindEvents: ->
+    $(document).on 'click', '[data-toggle="off-canvas"]', (e) ->
+      if e.handled != true
+        e.handled = offCanvas.toggle($(this), e)
+
+    $(document).on 'click touchstart', '.off-canvas-show-left, .off-canvas-show-right', (e) ->
+      clicked = $(e.target)
+      if e.handled != true
+        if (!clicked.hasClass("off-canvas") && clicked.parents(".off-canvas").length == 0 && clicked.data('toggle') != "off-canvas")
+          e.preventDefault()
+        else if (clicked.data('toggle') == "off-canvas" || (clicked.parents(".off-canvas").length && clicked.hasClass("close")))
+          e.handled = offCanvas.close(e)
+
+  toggle: (target, e) ->
+    e.stopPropagation()
+    e.preventDefault()
+    side = target.data('side')
+    if side == "left"
+      $('body').removeClass "off-canvas-show-right"
+    if side == "right"
+      $('body').removeClass "off-canvas-show-left"
+    $('body').toggleClass("off-canvas-show-#{side}")
+    true
+
+  close: (e) ->
+    e.preventDefault()
+    e.stopPropagation()
+    $('body').removeClass("off-canvas-show-right")
+    $('body').removeClass("off-canvas-show-left")
+    true

data/app/assets/javascripts/leather.js

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_directory .
+//= require_tree .

data/app/assets/stylesheets/{_devise.css.scss → leather/_devise.css.scss}

@@ -1,8 +1,4 @@
-html, body {
-  height: 100%;
-}
-
-.text-white { color: $white; }
+.text-white { color: #ffffff; }
 
 .devise_sessions, .devise_registrations, .devise_passwords {
   &.new, &.create {
@@ -34,7 +30,7 @@ html, body {
         text-decoration: none;
         @include transition(color 0.25s linear);
         &:hover {
-          color: darken($white, 20%);
+          color: darken(#ffffff, 20%);
         }
       }
     }
@@ -45,8 +41,8 @@ html, body {
   form {
     @include border-top-radius($border-radius-base);
     @include border-bottom-radius($border-radius-base);
-    border: 1px solid $white;
-    background: $white;
+    border: 1px solid #ffffff;
+    background: #ffffff;
     box-shadow: 1px 1px 3px $gray-dark;
     padding: 40px 40px 20px;
     border-top: 6px solid $devise-box-border-color;

data/app/assets/stylesheets/{_off_canvas.css.scss → leather/_off_canvas.css.scss}

@@ -8,9 +8,42 @@
   color: $off-canvas-color;
   &.off-canvas-right {
     right: -$off-canvas-width;
+    border-left: 1px solid $off-canvas-border;
   }
   &.off-canvas-left {
     left: -$off-canvas-width;
+    border-right: 1px solid $off-canvas-border;
+  }
+  &.off-canvas-inverse {
+    background: $off-canvas-inverse-bg;
+    color: $off-canvas-inverse-color;
+    &.off-canvas-right {
+      border-color: $off-canvas-inverse-border;
+    }
+    &.off-canvas-left {
+      border-color: $off-canvas-inverse-border;
+    }
+
+    .brand {
+      color: $off-canvas-inverse-brand-color;
+    }
+
+    .close {
+      color: $off-canvas-inverse-brand-color;
+      opacity: 0.8;
+    }
+  }
+
+  .brand {
+    padding: 15px;
+    font-size: 18px;
+    line-height: 20px;
+    color: $navbar-default-brand-color;
+
+    .close {
+      position: relative;
+      top: -3px;
+    }
   }
 }
 

data/app/assets/stylesheets/leather/_variables.css.scss

@@ -0,0 +1,13 @@
+$devise-bg-gradient-start: #355069 !default;
+$devise-bg-gradient-end:   #5E7A9B !default;
+$devise-box-border-color:  #6ED5E4 !default;
+
+$off-canvas-width:         300px   !default;
+$off-canvas-bg-color:      $navbar-default-bg !default;
+$off-canvas-border:        $navbar-default-border !default;
+$off-canvas-color:         #333333 !default;
+
+$off-canvas-inverse-bg:           $navbar-inverse-bg !default;
+$off-canvas-inverse-color:        $navbar-inverse-link-hover-color !default;
+$off-canvas-inverse-border:       $navbar-inverse-border !default;
+$off-canvas-inverse-brand-color:  $navbar-inverse-link-hover-color !default;

data/app/assets/stylesheets/leather.css.scss

@@ -1,3 +1,3 @@
-@import "variables.css.scss";
-@import "devise";
-@import "off_canvas";
+@import "leather/variables.css.scss";
+@import "leather/devise";
+@import "leather/off_canvas";

data/app/views/leather/application/ui_kit.html.haml

@@ -62,13 +62,17 @@
 
 .container
   %h1.page-header Off-Canvas Menus
-  = link_to "Left", "#", data: { toggle: "off-canvas", side: "left"}, class: "btn btn-primary", style: "z-index: 9005;"
-  = link_to "Right", "#", data: { toggle: "off-canvas", side: "right"}, class: "btn btn-primary", style: "z-index: 9005;"
+  = link_to "Left", "#", data: { toggle: "off-canvas", side: "left"}, class: "btn btn-primary"
+  = link_to "Right", "#", data: { toggle: "off-canvas", side: "right"}, class: "btn btn-primary"
 
-  .off-canvas.off-canvas-left
-    TEST
+  .off-canvas.off-canvas-inverse.off-canvas-left
+    .brand
+      Off-Canvas Left
+      .close ×
   .off-canvas.off-canvas-right
-    TEST
+    .brand
+      Off-Canvas Right
+      .close ×
 
   %h1.page-header Typography
   %h3 Headings
@@ -136,6 +140,16 @@
   %button.btn.btn-danger{type: "button"} Danger
   / Deemphasize a button by making it look like a link while maintaining button behavior
   %button.btn.btn-link{type: "button"} Link
+    
+  %hr
+
+  .row
+    .col-md-12
+      %button.btn.btn-default.btn-lg{type: "button"} Large
+      %button.btn.btn-default{type: "button"} Default
+      %button.btn.btn-default.btn-sm{type: "button"} Small
+      %button.btn.btn-default.btn-xs{type: "button"} Extra Small
+
   %h1.page-header Tables
   %h3 Basic Table
   = render 'table', table_class: ""

data/app/views/leather/bootstrap_components/_nav_item.html.haml

@@ -1,2 +1,2 @@
 %li{ class: active_class(href, options) }
-  =link_to text, href#, options
+  = link_to text, href, options

data/lib/leather/version.rb

@@ -1,3 +1,3 @@
 module Leather
-  VERSION = "0.2.25"
+  VERSION = "0.2.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leather
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - David Van Der Beek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,11 +146,11 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/assets/javascripts/leather.js
-- app/assets/javascripts/off_canvas.js.coffee
-- app/assets/stylesheets/_devise.css.scss
-- app/assets/stylesheets/_off_canvas.css.scss
-- app/assets/stylesheets/_variables.css.scss
+- app/assets/javascripts/leather/off_canvas.js.coffee
 - app/assets/stylesheets/leather.css.scss
+- app/assets/stylesheets/leather/_devise.css.scss
+- app/assets/stylesheets/leather/_off_canvas.css.scss
+- app/assets/stylesheets/leather/_variables.css.scss
 - app/controllers/leather/application_controller.rb
 - app/helpers/leather/application_helper.rb
 - app/views/leather/application/_table.html.haml

data/app/assets/javascripts/off_canvas.js.coffee

@@ -1,30 +0,0 @@
-$ ->
-  if $(".off-canvas").length > 0
-    console.log "setting up off-canvas"
-    
-    $('body').wrapInner("<div id='off-canvas-wrapper' />")
-
-    $(".off-canvas, .fixed").each ->
-      $("#off-canvas-wrapper").before(this)
-
-    $(document).on 'click', '[data-toggle="off-canvas"]', (e) ->
-      e.stopPropagation()
-      e.preventDefault()
-      if e.handled != true
-        side = $(this).data('side')
-        if side == "left"
-          $('body').removeClass "off-canvas-show-right"
-        if side == "right"
-          $('body').removeClass "off-canvas-show-left"
-        $('body').toggleClass("off-canvas-show-#{side}")
-        e.handled = true
-      else
-        false
-
-    $(document).on 'click touchstart', '.off-canvas-show-left, .off-canvas-show-right', (e) ->
-      if e.handled != true
-        e.preventDefault()
-        unless ($(e.target).hasClass("off-canvas") || $(e.target).data('toggle') == "off-canvas")
-          $(this).removeClass("off-canvas-show-right")
-          $(this).removeClass("off-canvas-show-left")
-        e.handled = true

data/app/assets/stylesheets/_variables.css.scss

@@ -1,9 +0,0 @@
-$white:                    #ffffff !default;
-
-$devise-bg-gradient-start: #355069 !default;
-$devise-bg-gradient-end:   #5E7A9B !default;
-$devise-box-border-color:  #6ED5E4 !default;
-
-$off-canvas-width:         300px   !default;
-$off-canvas-bg-color:      #f1f1f1 !default;
-$off-canvas-color:         #333333 !default;