oulu 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a91843c16419c38b969e51569a7a094d2602d00
-  data.tar.gz: 62e200a5c694af24a56637a24accd11f047a563a
+  metadata.gz: 493edf11fbb5767dc062a1ad7d63a008b03db1af
+  data.tar.gz: 8a7dcc101bf0b8d2cdd5a105cdeb4a67187fa474
 SHA512:
-  metadata.gz: f24a145c603164372a48fdfa41193eebfba394af99bdf53d476cfe61e4b1a7ceea7256f2f269452fc86db473d0ec1de12436e5d526772ef44d680999e87d7a8a
-  data.tar.gz: c8ad80d0f02ef8cfacdf77ba3c6d7fc2087524999a55fbe097ac9f6b507055bcfb0e0a0a80a66afb333fd7f2b50805706ad02e3ac12e70afcbd70dcda2997f40
+  metadata.gz: 8c8bd383f5fac09a7c5016d859530364377db156f777e5487cd702fb2836ede9b1348b62e94fd97975787afc71380fc2c6ae7920a61a5d275f09f5a7e0cb97a1
+  data.tar.gz: 89803681962694a3a677bfcaa3287312eb01bfc2f97b6d935c8fcfd3d4d6f3c8087ba394b1c07c0089a7fb4031937c889a5210c8f9e9fd139d5f4a8e8254a5db

data/app/assets/stylesheets/_oulu-mixins.sass

@@ -27,3 +27,4 @@
 @import settings/mixins/image
 @import settings/mixins/word-wrap
 @import settings/mixins/flex
+@import settings/mixins/font-awesome

data/app/assets/stylesheets/modules/buttons/_button-base.sass

@@ -56,7 +56,7 @@
   @if $font-size > .6875rem and 1rem > $font-size
     font-weight: 600
   @else if .999999rem < $font-size
-    font-weight: bold
+    font-weight: 700
   i,
   .is-button-icon
     @if $font-size > 1.75rem

data/app/assets/stylesheets/modules/buttons/_button-sizes.sass

@@ -0,0 +1,131 @@
+=set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
+  font-size: $font-size
+  min-height: $button-height
+  +padding(horizontal, ($font-size * $horizontal-padding))
+  +padding(vertical, $vertical-padding)
+
+=button-style-border($color)
+  color: $color
+  border-color: $color
+  &:hover
+    background-color: rgba($color, .2)
+  &:active
+    background-color: $color
+    color: luma_contrast_color($color)
+
+=button-style-colord($color)
+  color: luma_contrast_color($color)
+  background-color: $color
+  &:hover
+    background-color: darken($color, 20%)
+  &:active
+    background-color: darken($color, 20%)
+
+.is-button
+  line-height: 1.45
+  transition: all .2s ease-in
+  i,
+  .is-button__icon
+    margin-right: .4em
+  &.is-xs
+    $font-size: $xs-button-font-size
+    $button-height: $font-size * $button-xs-height-ratio
+    $vertical-padding: ($button-height - ($font-size * 1.45))/2
+    $horizontal-padding: $button-xs-horizontal-padding
+    +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
+    &.is-icon
+      font-size: $font-size * 1.5
+    &.is-border
+      +padding(vertical, $vertical-padding - .125rem)
+      &.is-icon
+        +padding(vertical, 0)
+  &.is-sm
+    $font-size: $sm-button-font-size
+    $button-height: $font-size * $button-sm-height-ratio
+    $vertical-padding: ($button-height - ($font-size * 1.45))/2
+    $horizontal-padding: $button-sm-horizontal-padding
+    +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
+    &.is-icon
+      font-size: $font-size * 1.5
+    &.is-border
+      +padding(vertical, $vertical-padding - .125rem)
+      &.is-icon
+        +padding(vertical, 0)
+  &.is-md
+    $font-size: $md-button-font-size
+    $button-height: $font-size * $button-md-height-ratio
+    $vertical-padding: ($button-height - ($font-size * 1.45))/2
+    $horizontal-padding: $button-md-horizontal-padding
+    +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
+    &.is-icon
+      font-size: $font-size * 1.5
+    &.is-border
+      +padding(vertical, $vertical-padding - .125rem)
+      &.is-icon
+        +padding(vertical, 0)
+  &.is-lg
+    $font-size: $lg-button-font-size
+    $button-height: $font-size * $button-lg-height-ratio
+    $vertical-padding: ($button-height - ($font-size * 1.45))/2
+    $horizontal-padding: $button-lg-horizontal-padding
+    +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
+    &.is-icon
+      font-size: $font-size * 1.5
+    &.is-border
+      +padding(vertical, $vertical-padding - .125rem)
+      &.is-icon
+        +padding(vertical, 0)
+  &.is-xl
+    $font-size: $xl-button-font-size
+    $button-height: $font-size * $button-xl-height-ratio
+    $vertical-padding: ($button-height - ($font-size * 1.45))/2
+    $horizontal-padding: $button-xl-horizontal-padding
+    +set-button-size($font-size, $button-height, $horizontal-padding, $vertical-padding)
+    &.is-icon
+      font-size: $font-size * 1.5
+    &.is-border
+      +padding(vertical, $vertical-padding - .125rem)
+      &.is-icon
+        +padding(vertical, 0)
+  &.is-icon
+    +padding(vertical, 0)
+
+  &.is-border-radius
+    border-radius: .25rem
+    .is-button-group li:first-child &
+      +border-radius(left, .25rem)
+    .is-button-group li:last-child &
+      +border-radius(right, .25rem)
+  &.is-left-border-radius
+    +border-radius(left, .25rem)
+  &.is-right-border-radius
+    +border-radius(right, .25rem)
+
+  &.is-border
+    border: solid .0625rem
+    .is-button-group li:not(:last-child) &
+      border-right: none
+    &.is-primary
+      +button-style-border($primary)
+    &.is-secondary
+      +button-style-border($secondary)
+    &.is-warning
+      +button-style-border($warning)
+    &.is-danger
+      +button-style-border($danger)
+    &.is-info
+      +button-style-border($info)
+
+  &.is-colord
+    .is-button-group li:not(:last-child) &
+      border-right: none
+    &.is-primary
+      +button-style-colord($primary)
+    &.is-secondary
+      +button-style-colord($secondary)
+    &.is-warning
+      +button-style-colord($warning)
+    &.is-danger
+      +button-style-colord($danger)
+    &.is-info
+      +button-style-colord($info)

data/app/assets/stylesheets/modules/buttons/_buttons.sass

@@ -11,6 +11,7 @@
 @import styles/standard
 
 @import button-helper
+@import button-sizes
 
 =button($style, $size, $color, $options: false)
   @if $style == normal

data/app/assets/stylesheets/modules/buttons/styles/_flat.sass

@@ -28,6 +28,7 @@
   &.is-checkbox
     &:before
       box-shadow: $color 0 0 0 1px
+      background-color: darken($color, 20%)
 
   // checked
   &.is-checked
@@ -46,6 +47,8 @@
   // disabled
   &.is-disabled,
   &:disabled
-    $color: if(luma_bright($color), shade($color, 20%), tint($color, 20%))
+    $background-color: darken($color, 20%)
+    $color: if(luma_bright($color), shade($color, 30%), tint($color, 30%))
     color: rgba($color, .7)
     border-color: $color
+    box-shadow: none

data/app/assets/stylesheets/settings/variables/_default.sass

@@ -59,3 +59,4 @@ $placeholder-text: $muted-text !default
 $bright-text: $reversal-text !default
 $dark-text: $default-text !default
 $text-input-color: $default-text !default
+$background-color: #fff !default

data/app/assets/stylesheets/settings/variables/_modules.sass

@@ -35,6 +35,12 @@ $button-md-width-ratio: 1.6 !default
 $button-lg-width-ratio: 1.6 !default
 $button-xl-width-ratio: 1.6 !default
 
+$button-xs-horizontal-padding: 1 !default
+$button-sm-horizontal-padding: 1 !default
+$button-md-horizontal-padding: 1 !default
+$button-lg-horizontal-padding: 1 !default
+$button-xl-horizontal-padding: 1 !default
+
 $button-checked-color: #4FC1E9 !default
 $button-checked-icon-color: #FC6E51 !default
 

data/app/assets/stylesheets/settings/variables/_sanitize.sass

@@ -1,7 +1,7 @@
-$root-background-color: #FFFFFF !default
+$root-background-color: $background-color !default
 $root-box-sizing: border-box !default
 $root-color: $default-text !default
-$root-font-family: sans-serif !default
+$root-font-family: $basic-sans-serif !default
 $root-font-size: if($base-px = 100px, 100%, $base-px) !default
 $root-line-height: 1 !default
 $root-text-rendering: optimizeLegibility !default

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "oulu",
-  "version": "0.13.4",
+  "version": "0.14.0",
   "main": "index.js",
   "repository": {
     "type": "git",

data/circle.yml

@@ -0,0 +1,13 @@
+machine:
+  ruby:
+    version: 2.4.0
+  node:
+    version: 8.2.0
+dependencies:
+  pre:
+    - gem install sass
+    - npm install node-sass
+test:
+  override:
+    - node-sass app/assets/stylesheets/_oulu.sass > /tmp/oulu.css
+    - sass app/assets/stylesheets/_oulu.sass > /tmp/oulu.css

data/lib/oulu/version.rb

@@ -1,3 +1,3 @@
 module Oulu
-  VERSION = "0.13.4"
+  VERSION = "0.14.0"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oulu",
-  "version": "0.13.4",
+  "version": "0.14.0",
   "main": "index.js",
   "repository": {
     "type": "git",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oulu
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - machida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -70,6 +70,7 @@ files:
 - app/assets/stylesheets/modules/amazlet/_amazlet.sass
 - app/assets/stylesheets/modules/buttons/_button-base.sass
 - app/assets/stylesheets/modules/buttons/_button-helper.sass
+- app/assets/stylesheets/modules/buttons/_button-sizes.sass
 - app/assets/stylesheets/modules/buttons/_buttons.sass
 - app/assets/stylesheets/modules/buttons/styles/_border.sass
 - app/assets/stylesheets/modules/buttons/styles/_flat-emboss.sass
@@ -85,7 +86,6 @@ files:
 - app/assets/stylesheets/modules/typography/_long-text.sass
 - app/assets/stylesheets/modules/web-fonts/_cousine.sass
 - app/assets/stylesheets/modules/web-fonts/_droid-sans.sass
-- app/assets/stylesheets/modules/web-fonts/_font-awsome.sass
 - app/assets/stylesheets/modules/web-fonts/_icomoon.sass
 - app/assets/stylesheets/modules/web-fonts/_inconsolata.sass
 - app/assets/stylesheets/modules/web-fonts/_lato.sass
@@ -142,6 +142,7 @@ files:
 - app/assets/stylesheets/settings/mixins/_break-points.sass
 - app/assets/stylesheets/settings/mixins/_filters.sass
 - app/assets/stylesheets/settings/mixins/_flex.sass
+- app/assets/stylesheets/settings/mixins/_font-awesome.sass
 - app/assets/stylesheets/settings/mixins/_grid.sass
 - app/assets/stylesheets/settings/mixins/_ie-hacks.sass
 - app/assets/stylesheets/settings/mixins/_image.sass
@@ -163,6 +164,7 @@ files:
 - app/assets/stylesheets/settings/variables/_modules.sass
 - app/assets/stylesheets/settings/variables/_sanitize.sass
 - bower.json
+- circle.yml
 - index.js
 - lib/oulu.rb
 - lib/oulu/engine.rb