oulu 0.9.11 → 0.10.1

data/app/assets/stylesheets/settings/mixins/_background.sass

@@ -1,33 +1,34 @@
-=bg-size($value)
-  @if list($value)
-    @if str-slice(nth($value, 1), 1, 1) == '/'
-      $bg-size-value: str-slice(nth($value, 1), 2) nth($value, 2)
-      +background-size($bg-size-value)
-    @else
-      +background-size($value)
-  @else
-    @if str-slice(nth($value, 1), 1, 1) == '/'
-      $bg-size-value: str-slice(nth($value, 1), 2)
-      +background-size($bg-size-value)
-    @else
-      +background-size($value)
-
-// どこでも background-color と background-image と background-position と background-repeat が書ける設定
-=background-basics($value)
-  @if background_color($value)
-    background-color: $value
-  @else if background_image($value)
-    background-image: image_url("#{$value}")
-  @else if background_position($value)
-    background-position: $value
-  @else if background_repeat($value)
-    background-repeat: $value
-  @else if background_attachment($value)
-    background-attachment: $value
-  @else if background_size($value)
-    +bg-size($value)
-
-// +bg(black 'image.png' (left center) no-repeat fixed (/ 20px 30px))
-=bg($value)
-  @for $i from 1 through length($value)
-    +background-basics(nth($value, $i))
+=background($values...)
+  $background-values: ()
+  @each $value in $values
+    $background-value: ()
+    $background-color: ()
+    $background-image: ()
+    $background-gradient: ()
+    $background-position: ()
+    $background-repeat: ()
+    $background-attachment: ()
+    $background-size: ()
+    $background-clip: ()
+    @each $property in $value
+      @if background_color($property)
+        $background-color: $property
+      @else if background_image($property)
+        $background-image: $property
+      @else if background_gradient($property)
+        $background-gradient: $property
+      @else if background_position($property)
+        $background-position: $property
+      @else if background_repeat($property)
+        $background-repeat: $property
+      @else if background_attachment($property)
+        $background-attachment: $property
+      @else if background_size($property)
+        $background-size: background_size($property)
+      @else if background_clip($property)
+        $background-clip: background_clip($property)
+      @if background-size != () and $background-position == ()
+        $background-position: (left top)
+      $background-value: $background-color $background-image $background-gradient $background-position $background-size $background-repeat $background-attachment $background-clip
+    $background-values: append($background-values, $background-value, comma)
+  background: $background-values

data/app/assets/stylesheets/settings/mixins/_block.sass

@@ -14,17 +14,19 @@
   +fixed(left 50%, $block-z-index)
   margin-left: $block-width / 2 * -1
 
-=square-block($values)
-  $square-block-size: optional_nth($values, 1)
-  $square-block-height: optional_nth($values, 2)
-  $square-block-line-height: optional_nth($values, 3)
-  +size($square-block-size if($square-block-height, $square-block-height, $square-block-size))
-  @if $square-block-line-height
-    line-height: $square-block-line-height
-  @else if $square-block-height
-    line-height: $square-block-height
+=size($value)
+  $width: nth($value, 1)
+  $height: $width
+  @if length($value) > 1
+    $height: nth($value, 2)
+  @if is-size($height)
+    height: $height
   @else
-    line-height: $square-block-size
+    @warn "`#{$height}` is not a valid length for the `$height` parameter in the `size` mixin."
+  @if is-size($width)
+    width: $width
+  @else
+    @warn "`#{$width}` is not a valid length for the `$width` parameter in the `size` mixin."
 
 =overflow($values)
   $overflow-x: optional_nth($values, 1)
@@ -39,14 +41,8 @@
   display: inline-block
   vertical-align: $value
 
-=background-size($values)
-  +prefixer(background-size, $values, webkit moz spec)
-
-=background-clip($value)
-  +prefixer(background-clip, $value, webkit moz spec)
-
-=box-shadow($values...)
-  box-shadow: $values
-
-=text-shadow($values...)
-  text-shadow: $values
+=clearfix
+  &::after
+    clear: both
+    content: ""
+    display: table

data/app/assets/stylesheets/settings/mixins/_line.sass

@@ -4,14 +4,14 @@
   $gatter-width: optional_nth($stripe, 2, 4px)
   $size: optional_nth($stripe, 3, 1px)
   @if length($stripe-color) == 1
-    +background-image(linear-gradient(left, color-stops($stripe-color, $stripe-color (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%)))
+    background-image: linear-gradient(to right, color-stops($stripe-color, $stripe-color (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%))
   @else
     @if percent(nth($stripe-color, 2))
       $mix-stripe-color: darken(nth($stripe-color, 1), nth($stripe-color, 2))
-      +background-image(linear-gradient(left, color-stops($mix-stripe-color, $mix-stripe-color (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%)))
+      background-image: linear-gradient(to right, color-stops($mix-stripe-color, $mix-stripe-color (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%))
       background-color: nth($stripe-color, 1)
     @else if color(nth($stripe-color, 2))
-      +background-image(linear-gradient(left, color-stops(nth($stripe-color, 1), nth($stripe-color, 1) (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%)))
+      background-image: linear-gradient(to right, color-stops(nth($stripe-color, 1), nth($stripe-color, 1) (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent (strip_unit($stripe-width)/(strip_unit($stripe-width) + strip_unit($gatter-width)))*100%, transparent 100%))
       background-color: nth($stripe-color, 2)
   +background-size(($stripe-width + $gatter-width) ($stripe-width + $gatter-width))
   height: $size
@@ -19,14 +19,14 @@
 // http://codepen.io/anon/pen/tGhLp を改造
 =striped-line($stripe-color: #000000, $size: 20px)
   @if length($stripe-color) == 1
-    +background-image(linear-gradient(-45deg, $stripe-color 25%, transparent 25%, transparent 50%, $stripe-color 50%, $stripe-color 75%, transparent 75%, transparent))
+    background-image: linear-gradient(-45deg, $stripe-color 25%, transparent 25%, transparent 50%, $stripe-color 50%, $stripe-color 75%, transparent 75%, transparent)
   @else
     @if percent(nth($stripe-color, 2))
       $mix-stripe-color: darken(nth($stripe-color, 1), nth($stripe-color, 2))
-      +background-image(linear-gradient(-45deg, $mix-stripe-color 25%, transparent 25%, transparent 50%, $mix-stripe-color 50%, $mix-stripe-color 75%, transparent 75%, transparent))
+      background-image: linear-gradient(-45deg, $mix-stripe-color 25%, transparent 25%, transparent 50%, $mix-stripe-color 50%, $mix-stripe-color 75%, transparent 75%, transparent)
       background-color: nth($stripe-color, 1)
     @else
-      +background-image(linear-gradient(-45deg, nth($stripe-color, 1) 25%, transparent 25%, transparent 50%, nth($stripe-color, 1) 50%, nth($stripe-color, 1) 75%, transparent 75%, transparent))
+      background-image: linear-gradient(-45deg, nth($stripe-color, 1) 25%, transparent 25%, transparent 50%, nth($stripe-color, 1) 50%, nth($stripe-color, 1) 75%, transparent 75%, transparent)
       background-color: nth($stripe-color, 2)
-  +background-size($size $size)
+  background-size: $size $size
   height: $size

data/app/assets/stylesheets/settings/mixins/_text.sass

@@ -6,8 +6,6 @@
   white-space: if(white_space($value), $value, null)
   display: if(display($value), $value, null)
   text-decoration: if(text_decoration($value), $value, null)
-  @if unit_number($value)
-    +top($value, null)
 
 // +text-block($font-size $line-height $margin-bottom, $font-weight $text-align $color $top)
 =text-block($value1: null, $value2: null)
@@ -17,6 +15,13 @@
   @if ($value2)
     @for $i from 1 through length($value2)
       +text-block-options(nth($value2, $i))
+      @if unit_number(nth($value2, $i))
+        @if index($value2, center)
+          letter-spacing: nth($value2, $i)
+          text-indent: nth($value2, $i)
+        @else
+          letter-spacing: nth($value2, $i)
+
 
 =letter-spacing-center($space-width: null)
   letter-spacing: $space-width
@@ -46,5 +51,5 @@
 
 =small-font($font-size)
   // 9px以下のfont-sizeを使う設定（IE8不可）
-  +transform(scale3d(strip_unit($font-size / 10), strip_unit($font-size/ 10), 1))
-  +transform-origin(0 0)
+  transform: scale3d(strip_unit($font-size / 10), strip_unit($font-size/ 10), 1)
+  transform-origin: 0 0

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

@@ -1,9 +1,3 @@
-/////////////////
-// constant
-////////////////
-
-$pi: 3.14159265359
-
 /////////////////
 // positions
 ////////////////
@@ -20,14 +14,6 @@ $container-class-name: container !default
 $container-max-width: 1100px !default
 $container-horizontal-padding: 16px !default
 
-/////////////////
-// text-color
-////////////////
-
-$bright-text-color: white !default
-$dark-text-color: black !default
-$luma-threshold: 100 / $pi !default
-
 /////////////////
 // grids
 ////////////////
@@ -101,7 +87,7 @@ $container-lg: $container-large-desktop !default
 
 $fw: 400 !default
 
-$basic-sans-serif: "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans", "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "游ゴシック", YuGothic, "メイリオ", Meiryo, "ＭＳ Ｐゴシック", Helvetica, Arial, Verdana, sans-serif !default
+$basic-sans-serif: "ヒラギノ角ゴ Pro W3", Hiragino Kaku Gothic Pro, "メイリオ", Meiryo, sans-serif !default
 $basic-bold-sans-serif: "ヒラギノ角ゴ StdN", "Hiragino Kaku Gothic StdN", "メイリオ", Meiryo, Roboto, "Droid Sans", "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, "ＭＳ Ｐゴシック", Helvetica, Arial, Verdana, sans-serif, "ＭＳ Ｐゴシック", Helvetica, Arial, Verdana, sans-serif !default
 $basic-serif: "Times New Roman", "ヒラギノ明朝 ProN", "Hiragino Mincho ProN", "HGS明朝E", "游明朝", YuMincho,'ＭＳ Ｐ明朝','MS PMincho', serif !default
 $basic-mono: Osaka-mono, "MS Gothic", monospace !default
@@ -109,35 +95,29 @@ $basic-maru: "Varela Round", "Lucida Grande", "Lucida Sans Unicode", Roboto, "Dr
 $basic-fonts: $basic-sans-serif !default
 
 /////////////////
-// UI colors
+// text colors
 ////////////////
 
-$default: #ffffff !default
-$primary: #337AB7 !default
-$success: #5CB85C !default
-$info: #5BC0DE !default
-$warning: #F0AD4E !default
-$danger: #D9534F !default
+$default-text: #434a54 !default
+$reversal-text: white !default
+$bright-text-color: $reversal-text !default
+$dark-text-color: $default-text !default
 
 /////////////////
-// text colors
+// luma contrast color
 ////////////////
 
-$default-text: black !default
-$reversal-text: white !default
+$luma-contrast-bright-color: $default-text !default
+$luma-contrast-dark-color: $reversal-text !default
 
 /////////////////
 // SNS colors
 ////////////////
 
-$twitter: #55acee
-$facebook: #3b5998
-$hatena: #008FDE
-$pocket: #f23c53
-
-// luma contrast color
-$luma-contrast-bright-color: $default-text !global
-$luma-contrast-dark-color: $reversal-text !global
+$twitter: #55acee !default
+$facebook: #3b5998 !default
+$hatena: #008FDE !default
+$pocket: #f23c53 !default
 
 /////////////////
 // sanitize.css
@@ -145,7 +125,7 @@ $luma-contrast-dark-color: $reversal-text !global
 
 $root-background-color: #FFFFFF !default
 $root-box-sizing: border-box !default
-$root-color: #000000 !default
+$root-color: $default-text !default
 $root-cursor: default !default
 $root-font-family: $basic-sans-serif !default
 $root-font-size: 100% !default
@@ -166,13 +146,3 @@ $small-font-size: 75% !default
 $table-border-collapse: collapse !default
 $table-border-spacing: 0 !default
 $textarea-resize: vertical !default
-
-/////////////////
-// buttons
-////////////////
-
-$xs-button-font-size: 12px !default
-$sm-button-font-size: 14px !default
-$md-button-font-size: 16px !default
-$lg-button-font-size: 18px !default
-$xl-button-font-size: 20px !default

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

@@ -0,0 +1,55 @@
+/////////////////
+// brand colors
+////////////////
+
+$base-color: white !default
+$main-color: #4FC1E9 !default
+$sub-color: #FFCE54 !default
+$accent-color: #FC6E51 !default
+
+/////////////////
+// UI colors
+////////////////
+
+$secondary: #ffffff !default
+$primary: #4fc1e9 !default
+$success: #8cc152 !default
+$info: #37bc9b !default
+$warning: #f6bb42 !default
+$danger: #da4453 !default
+
+$primary-text: luma_add_contrast($base-color, $primary) !default
+$info-text: luma_add_contrast($base-color, $info) !default
+$success-text: luma_add_contrast($base-color, $success) !default
+$warning-text: luma_add_contrast($base-color, $warning) !default
+$danger-text: luma_add_contrast($base-color, $danger) !default
+$faint-text: gray !default
+
+/////////////////
+// buttons
+////////////////
+
+$xs-button-font-size: 12px !default
+$sm-button-font-size: 14px !default
+$md-button-font-size: 16px !default
+$lg-button-font-size: 18px !default
+$xl-button-font-size: 20px !default
+
+$button-sizes: xs, sm, md, lg, xl !default
+$button-color-names: secondary, primary, success, info, warning, danger !default
+$button-styles: normal, border, bold-border, flat-emboss, material, flat-round, super-bold-border !default
+
+$checked: shade($main-color, 30%)
+$checked-icon: $sub-color
+
+/////////////////
+// tab navs
+////////////////
+
+$tabs-nav-border-color: black !default
+$tabs-nav-background-color: white !default
+$tabs-nav-border-width: 2px !default
+$tabs-nav-font-size: 16px !default
+$tabs-nav-item-gutter: 8px !default
+$tabs-nav-font-color: black !default
+$tabs-nav-current-font-color: red !default

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "oulu",
-  "version": "0.9.11",
+  "version": "0.10.1",
   "main": "index.js",
   "repository": {
     "type": "git",
@@ -16,9 +16,6 @@
     "Rakefile",
     "Gemfile"
     ],
-  "devDependencies": {
-    "bourbon": "~4.2.1"
-  },
   "authors": [
     "machida"
   ],

data/lib/oulu/version.rb

@@ -1,3 +1,3 @@
 module Oulu
-  VERSION = "0.9.11"
+  VERSION = "0.10.1"
 end

data/oulu.gemspec

@@ -20,6 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency("thor", "~> 0.19")
   spec.add_runtime_dependency("rake")
-  spec.add_runtime_dependency("sass", "~> 3.4.5")
-  spec.add_runtime_dependency("bourbon")
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oulu",
-  "version": "0.9.11",
+  "version": "0.10.1",
   "main": "index.js",
   "repository": {
     "type": "git",
@@ -13,8 +13,5 @@
   "contributors": [
     "machida"
   ],
-  "license": "MIT",
-  "devDependencies": {
-    "bourbon": "~4.2.1"
-  }
+  "license": "MIT"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oulu
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.10.1
 platform: ruby
 authors:
 - machida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.5
-- !ruby/object:Gem::Dependency
-  name: bourbon
-  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'
 description: This gem provides assets files for Middleman Project.
 email:
 - machidanohimitsu@gmail.com
@@ -85,6 +57,7 @@ files:
 - app/assets/stylesheets/helpers/_margin-padding.sass
 - app/assets/stylesheets/helpers/_position.sass
 - app/assets/stylesheets/helpers/_typoglaphy.sass
+- 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/_buttons.sass
@@ -93,34 +66,36 @@ files:
 - app/assets/stylesheets/modules/buttons/styles/_flat-round.sass
 - app/assets/stylesheets/modules/buttons/styles/_material.sass
 - app/assets/stylesheets/modules/buttons/styles/_normal.sass
+- app/assets/stylesheets/modules/buttons/styles/_super-bold-border.sass
+- app/assets/stylesheets/modules/glitch/_glitch.sass
+- app/assets/stylesheets/modules/glitch/_glitch.sass~organize-modules
 - app/assets/stylesheets/modules/navs/_tabs-nav.sass
-- app/assets/stylesheets/options/amazlet/_amazlet.sass
-- app/assets/stylesheets/options/glitch/_glitch.sass
-- app/assets/stylesheets/options/web-fonts/_cousine.sass
-- app/assets/stylesheets/options/web-fonts/_droid-sans.sass
-- app/assets/stylesheets/options/web-fonts/_font-awsome.sass
-- app/assets/stylesheets/options/web-fonts/_icomoon.sass
-- app/assets/stylesheets/options/web-fonts/_inconsolata.sass
-- app/assets/stylesheets/options/web-fonts/_lato.sass
-- app/assets/stylesheets/options/web-fonts/_merriweather-sans.sass
-- app/assets/stylesheets/options/web-fonts/_montserrat.sass
-- app/assets/stylesheets/options/web-fonts/_old-standard.sass
-- app/assets/stylesheets/options/web-fonts/_open-sans.sass
-- app/assets/stylesheets/options/web-fonts/_podkova.sass
-- app/assets/stylesheets/options/web-fonts/_pt-sans.sass
-- app/assets/stylesheets/options/web-fonts/_raleway.sass
-- app/assets/stylesheets/options/web-fonts/_roboto-condensed.sass
-- app/assets/stylesheets/options/web-fonts/_roboto-mono.sass
-- app/assets/stylesheets/options/web-fonts/_roboto.sass
-- app/assets/stylesheets/options/web-fonts/_satisfy.sass
-- app/assets/stylesheets/options/web-fonts/_source-code-pro.sass
-- app/assets/stylesheets/options/web-fonts/_source-sans-pro.sass
-- app/assets/stylesheets/options/web-fonts/_special-elite.sass
-- app/assets/stylesheets/options/web-fonts/_tauri.sass
-- app/assets/stylesheets/options/web-fonts/_ubuntu-mono.sass
-- app/assets/stylesheets/options/web-fonts/_ubuntu.sass
-- app/assets/stylesheets/options/web-fonts/_varela-round.sass
-- app/assets/stylesheets/options/web-fonts/_vt323.sass
+- app/assets/stylesheets/modules/text-input/_text-inputs.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
+- app/assets/stylesheets/modules/web-fonts/_merriweather-sans.sass
+- app/assets/stylesheets/modules/web-fonts/_montserrat.sass
+- app/assets/stylesheets/modules/web-fonts/_old-standard.sass
+- app/assets/stylesheets/modules/web-fonts/_open-sans.sass
+- app/assets/stylesheets/modules/web-fonts/_podkova.sass
+- app/assets/stylesheets/modules/web-fonts/_pt-sans.sass
+- app/assets/stylesheets/modules/web-fonts/_raleway.sass
+- app/assets/stylesheets/modules/web-fonts/_roboto-condensed.sass
+- app/assets/stylesheets/modules/web-fonts/_roboto-mono.sass
+- app/assets/stylesheets/modules/web-fonts/_roboto.sass
+- app/assets/stylesheets/modules/web-fonts/_satisfy.sass
+- app/assets/stylesheets/modules/web-fonts/_source-code-pro.sass
+- app/assets/stylesheets/modules/web-fonts/_source-sans-pro.sass
+- app/assets/stylesheets/modules/web-fonts/_special-elite.sass
+- app/assets/stylesheets/modules/web-fonts/_tauri.sass
+- app/assets/stylesheets/modules/web-fonts/_ubuntu-mono.sass
+- app/assets/stylesheets/modules/web-fonts/_ubuntu.sass
+- app/assets/stylesheets/modules/web-fonts/_varela-round.sass
+- app/assets/stylesheets/modules/web-fonts/_vt323.sass
 - app/assets/stylesheets/settings/functions/_animation.sass
 - app/assets/stylesheets/settings/functions/_background.sass
 - app/assets/stylesheets/settings/functions/_bool.sass
@@ -139,6 +114,7 @@ files:
 - app/assets/stylesheets/settings/functions/_reverse.sass
 - app/assets/stylesheets/settings/functions/_string.sass
 - app/assets/stylesheets/settings/functions/_text.sass
+- app/assets/stylesheets/settings/functions/_timing.sass
 - app/assets/stylesheets/settings/initializers/_reboot.sass
 - app/assets/stylesheets/settings/initializers/_sanitize.sass
 - app/assets/stylesheets/settings/mixins/_animation.sass
@@ -167,6 +143,7 @@ files:
 - app/assets/stylesheets/settings/mixins/grid/_grid-framework.scss
 - app/assets/stylesheets/settings/mixins/grid/_grid.scss
 - app/assets/stylesheets/settings/variables/_default.sass
+- app/assets/stylesheets/settings/variables/_modules.sass
 - bower.json
 - index.js
 - lib/oulu.rb