spina-template 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ca3870f8e381ec3b765748341b5ac05ca00a5d3
-  data.tar.gz: 944baaa409c9eb71485030cb533f4b647ddb8b71
+  metadata.gz: f6e5e5ec59d72cbd8c6bc61f4be526f896295725
+  data.tar.gz: 9f05be11321dd29a93c9ffa256ac723dacb303b2
 SHA512:
-  metadata.gz: ba8e6663b5f441d0f86b4ebe084100fd57d2b410a6341d624c39423db2b3b733c701b7da77a3f66d554f2d679cb0ec1ec85b00e29dfccf7b6afcb5fc1fef1847
-  data.tar.gz: f45a33844ff06a7800e35aa4fec1681413be91a2b6c33be89b64f21a687b60708b57d207f0534a731d39c32b8fd86e8b0ff5957165a930eadded89a3a6247989
+  metadata.gz: f7ccb1bd81fe2215c1826905b2cc6823fdc27445923d3f2cd0d45af4e67f0f7e3ab3b088fcc80d64a43ec024223b4ae885fe0e91ec939bfd9ffb6198d108b793
+  data.tar.gz: 73eeeb591531c51d1f4053abcce3361a9054bcefc6af31c82107b5ccc50261d51755797d6d4cb8bf6c876ca250bcc049751aa7c01256e16b530c1b651f1efb8f

data/app/assets/stylesheets/spina/_buttons.css.sass

@@ -67,7 +67,7 @@ button, input[type="submit"]
     &:active, &.button-active
       color: #111
 
-  &:before
+  i.#{$fa-css-prefix}
     margin-right: 8px
     vertical-align: text-top
 

data/app/assets/stylesheets/spina/_configuration.css.sass

@@ -8,7 +8,7 @@ $alert-color: orange
 $asset-pipeline: true
 $font-family: "Proxima Nova", $helvetica
 $font-family-serif: "Skolar", $georgia
-$icon-font: "Spina"
+$icon-font: $font-family
 $gutter: 5em
 
 $desktop: min-width 768px 8

data/app/assets/stylesheets/spina/_fonts.css.sass

@@ -1,14 +1 @@
 // Icons
-
-[data-icon]:before
-  font-family: $icon-font
-  content: attr(data-icon)
-  font-style: normal
-  font-weight: normal !important
-  line-height: 1
-  speak: none
-  vertical-align: text-top
-  -webkit-font-smoothing: antialiased
-
-[data-icon].icon-dimmed:before
-  opacity: .25

data/app/assets/stylesheets/spina/_forms.css.sass

@@ -148,10 +148,10 @@ fieldset
     padding-right: 28px
 
 .search-input:before, .clear-input
+  @include fa-icon
+  @extend .fa-search
   color: #999
-  content: "k"
   display: block
-  font-family: $icon-font
   font-size: 14px
   font-weight: 400
   left: 9px
@@ -160,13 +160,15 @@ fieldset
 
 .clear-input
   color: #ccc
-  content: "m"
   display: none
   left: auto
   padding: 10px 9px
   right: 0
   top: 0
 
+  &:before
+    display: none
+
 .clear-input:hover
   color: #999
 
@@ -266,21 +268,23 @@ input.datepicker
   border-radius: 3px
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, .16)
   display: inline-block
+  font-family: $font-family
   line-height: 28px
   margin: 0
   overflow: hidden
   padding: 0
   position: relative
+  @extend .fa
+  @extend .fa-caret-down
   @include transition(border .2s ease)
 
   &:hover
     // background: #f5f5f5
     border: 1px solid $primary-color
 
-  &:after
+  &:before
     color: #666
-    content: "T"
-    font-family: $icon-font
+    font-family: "FontAwesome"
     font-size: 14px
     font-weight: normal
     line-height: 28px
@@ -436,20 +440,23 @@ input.datepicker
 
     &:before
       color: #bbb
-      content: "O"
       display: block
-      font-family: $icon-font
-      font-size: 42px
       font-weight: normal
+      line-height: 100px
+      vertical-align: middle
+      @extend .fa-cloud-upload:before
+      @include fa-icon
+      font-size: 42px
       @include transition(color .2s ease)
 
     &:after
       color: #bbb
-      content: "R"
+      font-weight: normal
+      @extend .fa-refresh:before
+      @include fa-icon
       display: none
-      font-family: $icon-font
       font-size: 42px
-      font-weight: normal
+      line-height: 100px
       @include animation("rotate" 2s linear infinite)
 
   .customfile.loading
@@ -494,18 +501,19 @@ input.datepicker
 
     &:before
       color: #bbb
-      content: "O"
       display: block
-      font-family: $icon-font
       font-weight: 400
-      font-size: 36px
+      @extend .fa-cloud-upload
+      @include fa-icon
+      font-size: 28px
+      vertical-align: middle
       @include transition(color .2s ease)
 
     &:after
       color: #bbb
-      content: "R"
+      @extend .fa-refresh
+      @include fa-icon
       display: none
-      font-family: $icon-font
       font-size: 36px
       @include animation("rotate" 2s linear infinite)
 

data/app/assets/stylesheets/spina/_sortable_lists.css.sass

@@ -19,10 +19,10 @@
   @include transform(translateX(0))
 
 .dd-item-inner:before
+  @include fa-icon
+  @extend .fa-bars:before
   color: #ccc
-  content: "7"
   display: inline-block
-  font-family: $icon-font
   height: 18px
   opacity: 0
   vertical-align: middle

data/app/assets/stylesheets/spina/_tables.css.sass

@@ -119,14 +119,14 @@ table.table.table-form
 .dataTable
   th.sorting_desc
     &:after
-      content: "0"
-      font-family: $icon-font
+      @include fa-icon
+      @extend .fa-caret-down:before
       float: right
 
   th.sorting_asc
     &:after
-      content: "1"
-      font-family: $icon-font
+      @include fa-icon
+      @extend .fa-caret-up:before
       float: right
 
 .dataTables_paginate

data/app/assets/stylesheets/spina/_wysihtml5.css.sass

@@ -29,6 +29,9 @@ textarea.wysihtml5
       text-align: center
       width: 40px
 
+    a.command i
+      vertical-align: middle
+
     a.wysihtml5-command-active, a.command:hover
       color: #333
 

data/app/assets/stylesheets/spina.css.sass

@@ -13,8 +13,9 @@
 // Grid
 @import spina/grid
 
-// Fonts
-@import spina/fonts
+// Icons
+@import font-awesome-sprockets
+@import font-awesome
 
 // Animations
 @import spina/animate
@@ -84,7 +85,7 @@ nav#primary
     left: 0
     position: absolute
 
-  ul li a:before
+  ul li a i.#{$fa-css-prefix}
     display: block
     font-size: 26px
     margin-bottom: 8px
@@ -164,21 +165,22 @@ nav#secondary
   ul li a:hover
     color: #333
 
-    small, &:before
+    small, i.#{$fa-css-prefix}
       color: inherit
 
   ul li.active a
     color: $primary-color
 
-    small, &:before
+    small, i.#{$fa-css-prefix}
       color: inherit
 
-  ul li a:before
+  ul li a i.#{$fa-css-prefix}
     color: #666
     display: block
     float: left
     font-size: 24px
     margin-left: -36px
+    text-align: center
     width: 24px
     @include transition(color .15s ease)
 
@@ -300,7 +302,7 @@ nav.tabs
   padding: 0 40px
   position: relative
 
-  &:before
+  i.#{$fa-css-prefix}
     font-size: 16px
     left: 14px
     opacity: .25

data/lib/spina/template/version.rb

@@ -1,5 +1,5 @@
 module Spina
   module Template
-    VERSION = "0.2.13"
+    VERSION = "0.2.14"
   end
 end

data/lib/spina/template.rb

@@ -2,6 +2,7 @@ require "spina/template/version"
 require 'bourbon'
 require 'neat'
 require 'jquery-fileupload-rails'
+require 'font-awesome-sass'
 
 module Spina
   module Template

data/spina-template.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bourbon", "~> 3.2"
   spec.add_dependency "neat", "~> 1.5"
+  spec.add_dependency "font-awesome-sass"
   spec.add_dependency "coffee-rails"
   spec.add_dependency 'jquery-fileupload-rails'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-template
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Bram Jetten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - app/.DS_Store
+- app/assets/.DS_Store
 - app/assets/images/.DS_Store
 - app/assets/images/spina/arrow-left.png
 - app/assets/images/spina/arrow-right.png
@@ -165,6 +180,7 @@ files:
 - vendor/assets/javascripts/spina/wysihtml5.js
 - vendor/assets/javascripts/spina/wysihtml5_parser_rules.js
 - vendor/assets/stylesheets/.DS_Store
+- vendor/assets/stylesheets/spina/.DS_Store
 - vendor/assets/stylesheets/spina/_animate.css
 - vendor/assets/stylesheets/spina/_morris.css
 - vendor/assets/stylesheets/spina/_normalize.css