spina-template 0.2.18 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 780a1eb48dc0218a45bce11b8332bf7f6a2802a7
-  data.tar.gz: f80bd87f2284a21e93b0a8a6bc007ab0ba3dc73b
+  metadata.gz: 178b0b2d2b2f06fb50223042049e893389d500b4
+  data.tar.gz: af4c4155b1b004f6a42ea91965e31e63084de82a
 SHA512:
-  metadata.gz: fa5a959171139c4df19d3fe701e690678dc9c26d2a304abd6cc50f03d8e76f91a0c93866eedd29ec79b95ded5fd868e7b6fc0dc0653f7361fe381815f5f34857
-  data.tar.gz: a8e2cc12a1e331b9678781bbceaf45df648b44aa8bf909af09df67c0132c86446351b695287ad4001dc8136cc7c0338530f80b2ea0403dcb76f56ac10f5ae0dc
+  metadata.gz: 6f652b8848309b0630cf674a2bb0072a266503fd22312a475c9e800ea8d1417c8ab29ffa2a020a238d75165ddd7956e6b1bb0f322dcc8136f4d9ca216dedf1e6
+  data.tar.gz: e237df198fcee0b39e8f84b0183977ba561900b642d8cc519f23183ba9d21c18a7536e2602ab4940d4c9f0fd7a95493311d8726dbefd2531c7c01b38266755ba

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/app/assets/javascripts/{spina.js.coffee.erb → spina.coffee.erb}

@@ -10,7 +10,7 @@
 #= require spina/nprogress
 #= require spina/wysihtml5
 #= require spina/wysihtml5_parser_rules
-
+#= require spina/trix
 #= require spina/switch
 #= require spina/modal
 #= require spina/tabs

data/app/assets/stylesheets/spina/{_buttons.css.sass → _buttons.sass}

@@ -10,10 +10,10 @@ button, input[type="submit"]
   display: inline-block
   font-size: 14px
   font-weight: bold
-  line-height: 36px
+  line-height: 20px
   margin: 0 4px 4px 0
   outline: none
-  padding: 0 16px
+  padding: 8 16px
   text-decoration: none
   @include transition(all .3s ease)
 
@@ -75,32 +75,25 @@ button, input[type="submit"]
     margin-right: 0
 
   &.icon-mini:before
-    font-size: 8px
-    line-height: 12px
     margin-right: 4px
 
   &.button-large
     border-radius: 4px
-    font-size: 15px
-    line-height: 42px
-    padding: 0 18px
+    padding: 11px 18px
 
     &:before
       margin-right: 10px
 
   &.button-small
     font-size: 13px
-    line-height: 32px
-    padding: 0 12px
+    padding: 6px 12px
 
     i.icon
-      font-size: 16px
       margin-right: 4px
 
   &.button-mini
     font-size: 12px
-    line-height: 26px
-    padding: 0 10px
+    padding: 3px 10px
 
   &.button-hollow
     background: none
@@ -125,7 +118,7 @@ button, input[type="submit"]
     display: inline-block
     @include animation(rotate 3.0s linear infinite)
 
-@include keyframes(rotate) 
+@include keyframes(rotate)
   from
     @include transform(rotate(0deg))
   to
@@ -183,8 +176,8 @@ button, input[type="submit"]
     font-size: 14px
     font-style: normal
     font-weight: 600
-    line-height: 32px
-    padding: 0 8px
+    line-height: 20px
+    padding: 6px 8px
 
     &:first-child
       padding-left: 0
@@ -225,7 +218,7 @@ button, input[type="submit"]
     width: 0
     border-bottom: 8px solid #aaa
     border-left: 8px solid transparent
-    border-right: 8px solid transparent          
+    border-right: 8px solid transparent
 
   ul:after, .sliding-dropdown:after
     content: ""
@@ -293,6 +286,9 @@ button, input[type="submit"]
       position: absolute
       top: 0px
 
+      .icon:before
+        line-height: 44px
+
       &:hover
         color: #333
 
@@ -354,4 +350,4 @@ button, input[type="submit"]
       width: 4px
 
       &.active
-        background: #333
+        background: #333

data/app/assets/stylesheets/spina/{_fonts.css.sass → _fonts.sass}

@@ -3,16 +3,16 @@
 @include font-face("icons_spina", "spina/icons_spina")
 
 .icon
+  display: inline-block
   vertical-align: middle
-
-.icon:before
+  font-size: inherit
+  line-height: inherit // NOTE: should be 1
   font-family: "icons_spina" !important
   font-style: normal !important
-  font-weight: normal !important
   font-variant: normal !important
-  line-height: 1
+  font-weight: normal !important
   text-transform: none !important
   speak: none
-  vertical-align: middle
+  text-rendering: auto
   -webkit-font-smoothing: antialiased
-  -moz-osx-font-smoothing: grayscale
+  -moz-osx-font-smoothing: grayscale

data/app/assets/stylesheets/spina/{_forms.css.sass → _forms.sass}

@@ -1,4 +1,44 @@
-#{$all-text-inputs}, textarea
+// Horizontal form
+.horizontal-form
+  .horizontal-form-group
+    margin-bottom: 30px
+    @include display(flex)
+
+  .horizontal-form-label
+    color: #333
+    font-size: 13px
+    font-weight: 600
+    line-height: 18px
+    width: 240px
+    @include justify-content(center)
+    @include display(flex)
+    @include flex-direction(column)
+
+    small
+      color: #666
+      display: block
+      font-size: 13px
+      font-weight: normal
+
+  .horizontal-form-content
+    @include flex(1)
+    @include align-self(flex-start)
+
+  .image
+    border-radius: 3px
+    display: inline-block
+    height: 85px
+    overflow: hidden
+    width: 152px
+
+    img
+      display: block
+      height: 100%
+      width: 100%
+
+// Inputs
+
+#{$all-text-inputs}, textarea, .text-input
   border: 1px solid #c3c3c3
   border-radius: 3px
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, .16)
@@ -38,7 +78,7 @@
     height: 10px
     width: 10px
 
-#{$all-text-inputs-focus}, textarea:focus
+#{$all-text-inputs-focus}, textarea:focus, .text-input:focus
   border-color: $primary-color
   outline: none
 
@@ -52,7 +92,7 @@ fieldset
 
 // Errors
 
-.field_with_errors 
+.field_with_errors
   #{$all-text-inputs}, textarea
     border: 1px solid $error-color
 
@@ -121,7 +161,7 @@ fieldset
 
     &:hover .restaurant-dish-price .remove_fields
       opacity: 1
-  
+
   .add_fields.button
     background: #f5f5f5
     font-size: 13px
@@ -206,7 +246,7 @@ input.datepicker
 
 .checkbox, .radio
   display: inline-block
-  
+
   input[type="checkbox"], input[type="radio"]
     display: none
 
@@ -282,7 +322,6 @@ input.datepicker
 
   &:before
     color: #666
-    font-family: "FontAwesome"
     font-size: 14px
     font-weight: normal
     line-height: 28px
@@ -299,7 +338,8 @@ input.datepicker
     color: #666
     cursor: pointer
     display: inline-block
-    font-size: 14px
+    font-family: $font-family
+    font-size: 13px
     font-weight: 600
     line-height: 16px
     margin: 0
@@ -313,14 +353,13 @@ input.datepicker
 // Structure form
 
 .structure-form
-  margin-bottom: 40px
+  margin-left: -40px
   position: relative
   @include display(flex)
 
   .structure-form-menu
     box-sizing: content-box
-    min-width: 240px
-    width: 240px
+    min-width: 280px
 
     label
       display: block
@@ -339,12 +378,12 @@ input.datepicker
       right: -1px
       top: -40px
       width: 1px
-      @include linear-gradient(transparent, #ddd)
+      @include linear-gradient(rgba(255, 255, 255, 0), #ddd)
 
     ul:after
       bottom: -40px
       top: auto
-      @include linear-gradient(bottom, transparent, #ddd)
+      @include linear-gradient(bottom, rgba(255, 255, 255, 0), #ddd)
 
     ul li .structure-item-remove
       color: #999
@@ -354,6 +393,8 @@ input.datepicker
       color: #333
       cursor: pointer
       display: block
+      font-weight: 600
+      font-size: 13px
       height: 50px
       line-height: 50px
       outline: none
@@ -406,7 +447,6 @@ input.datepicker
 
   .structure-form-content
     padding-left: 12px
-    padding-right: 40px
     width: 100%
 
     .structure-form-pane
@@ -522,7 +562,7 @@ input.datepicker
   .customfile.loading
     &:before
       display: none
-    
+
     &:after
       display: block
 
@@ -552,7 +592,6 @@ input.datepicker
   border-radius: 3px
   color: #333
   display: block
-  height: 100%
   margin-top: 2px
   position: relative
 
@@ -561,7 +600,7 @@ input.datepicker
 
   &:active .button
     background: shade(#efefef, 10%)
-  
+
   &:before
     background: rgba(255, 255, 255, .5)
     content: ""
@@ -586,7 +625,7 @@ input.datepicker
       margin-right: 6px
       vertical-align: middle
 
-ul.sortable-grid 
+ul.sortable-grid
   .image, .sortable-placeholder
     border-radius: 3px
     display: inline-block

data/app/assets/stylesheets/spina/{_gallery.css.sass → _gallery.sass}

@@ -72,6 +72,9 @@
 
 .gallery-select
   margin: 0
+
+  form
+    margin: 0
   
   .item
     border-radius: 3px

data/app/assets/stylesheets/spina/{_login.css.sass → _login.sass}

@@ -1,17 +1,22 @@
 #login_container
-  background: url(asset-path('spina/bg.jpg'))
-  background-size: cover
-  background-position: center
+  background: tint($primary-color, 90%)
   display: block
   height: 100%
   position: fixed
   width: 100%
 
 #login_wrapper
-  border-radius: 3px
   margin: 50px auto
   max-width: 280px
 
+  .notification
+    padding: 0px
+    text-align: center
+
+  img
+    display: block
+    margin: 0 auto 25px auto
+
   input, button
     box-shadow: none
     border: none
@@ -24,7 +29,7 @@
 
 
   button
-    padding: 9px 14px
+    padding: 12px 14px
     
     &:before
       font-size: 26px

data/app/assets/stylesheets/spina/{_modal.css.sass → _modal.sass}

@@ -15,6 +15,7 @@
   margin: 0 auto
   max-width: 480px
   min-height: 100px
+  overflow: hidden
   position: relative
   @include animation-duration(.4s)
 
@@ -37,8 +38,8 @@
   header h3
     border-radius: 2px 2px 0 0
     color: #232323
-    font-size: 16px
-    font-weight: 400
+    font-size: 18px
+    font-weight: 500
     margin: 0
     padding: 20px
 

data/app/assets/stylesheets/spina/{_tables.css.sass → _tables.sass}

@@ -65,6 +65,7 @@ table.table
 
 table.table.table-form
   tr td:first-child
+    font-weight: 600
     width: 240px
 
   thead tr, tbody tr

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

@@ -0,0 +1,30 @@
+trix-toolbar
+  margin-bottom: 6px
+
+  .button-group
+    margin-right: 10px
+
+  .button.active
+    background: $primary-color
+    color: #fff
+
+trix-editor
+  line-height: 18px
+  font-weight: normal
+  min-height: 100px
+
+  ul
+    list-style: disc
+    padding-left: 20px
+
+  figure.attachment
+    margin-bottom: 12px
+    max-width: 200px
+    overflow: hidden
+
+    .remove
+      display: none
+
+    img
+      border-radius: 3px
+      width: 100%

data/app/assets/stylesheets/spina/{_wysihtml5.css.sass → _wysihtml5.sass}

@@ -30,7 +30,10 @@ textarea.wysihtml5
       width: 40px
 
     a.command i
-      vertical-align: middle
+      vertical-align: middle 
+
+    a.command i:before
+      line-height: 40px
 
     a.wysihtml5-command-active, a.command:hover
       color: #333

data/app/assets/stylesheets/{spina.css.sass → spina.sass}

@@ -31,6 +31,7 @@
 @import spina/gallery
 @import spina/login
 @import spina/cards
+@import spina/trix
 
 // Plugins
 @import spina/morris
@@ -44,7 +45,7 @@ html
 html, body
   height: 100%
   font-family: $font-family
-  font-weight: 600
+  -webkit-font-smoothing: antialiased
 
 body
   @include display(flex)
@@ -183,6 +184,7 @@ nav#secondary
     display: block
     float: left
     font-size: 24px
+    line-height: 1
     margin-left: -36px
     text-align: center
     width: 24px
@@ -529,6 +531,9 @@ label
 .pull-right
   float: right
 
+.clearfix
+  @include clearfix()
+
 .spina-logo
   bottom: 0px
   opacity: .5
@@ -541,4 +546,4 @@ label
     opacity: 1
 
   img
-    display: block
+    display: block

data/lib/spina/template/version.rb

@@ -1,5 +1,5 @@
 module Spina
   module Template
-    VERSION = "0.2.18"
+    VERSION = "0.3.0"
   end
 end