middleman-oulu 0.5.37 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +0 -17
  3. data/assets/stylesheets/_oulu-base.sass +3 -23
  4. data/assets/stylesheets/helper/_base-helper.sass +1 -4
  5. data/assets/stylesheets/helper/_margin-padding.sass +1 -1
  6. data/assets/stylesheets/helper/_typoglaphy.sass +1 -1
  7. data/assets/stylesheets/options/glitch/_glitch.sass +3 -3
  8. data/assets/stylesheets/options/oulu-buttons/_button-basic.sass +2 -2
  9. data/assets/stylesheets/settings/initializers/_reset.sass +41 -13
  10. data/assets/stylesheets/settings/mixins/_animation.sass +0 -17
  11. data/assets/stylesheets/settings/mixins/_background.sass +0 -20
  12. data/assets/stylesheets/settings/mixins/_block.sass +19 -6
  13. data/assets/stylesheets/settings/mixins/_border-radius.sass +45 -0
  14. data/assets/stylesheets/settings/mixins/_color.sass +1 -1
  15. data/assets/stylesheets/settings/mixins/_filters.sass +1 -1
  16. data/assets/stylesheets/settings/mixins/_form.sass +3 -0
  17. data/assets/stylesheets/settings/mixins/_grids.sass +2 -3
  18. data/assets/stylesheets/settings/mixins/_image.sass +3 -1
  19. data/assets/stylesheets/settings/mixins/_link.sass +25 -1
  20. data/assets/stylesheets/settings/mixins/_rem.sass +2 -2
  21. data/assets/stylesheets/settings/mixins/_resets.sass +33 -26
  22. data/assets/stylesheets/settings/variables/_default.sass +0 -10
  23. data/lib/middleman-oulu/version.rb +1 -1
  24. data/lib/middleman-oulu.rb +1 -2
  25. data/middleman-oulu.gemspec +1 -3
  26. metadata +3 -35
  27. data/assets/stylesheets/settings/mixins/_button.sass +0 -27
  28. data/assets/stylesheets/settings/mixins/_html5-input-types.scss +0 -118
  29. data/assets/stylesheets/settings/mixins/_reset.sass +0 -14
  30. data/assets/stylesheets/settings/mixins/_sassmatic.sass +0 -172
  31. data/assets/stylesheets/settings/mixins/_sprite-background.sass +0 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4462f7fcc536ba8fdf3bc344c41f68fa9506577d
4
- data.tar.gz: 30b6d1f9a407e8b8fb89e80d4024c97556c1f2e5
3
+ metadata.gz: 9a50714fad9bc2c113ce58e5d888c7679df03523
4
+ data.tar.gz: 6a11ac337b29d808b4e43dd1be85394bc3740ee3
5
5
  SHA512:
6
- metadata.gz: 73171624542f991e72116125b64f2032e2dc0d8293bd63a750abc1c752c74e12e0227c88e8289e58b7b094ed83f35acc9dd89b3a31da9fb4ceb959e0efa8f41a
7
- data.tar.gz: f0e1f52ad525d727f216020c13c92d4d9c932bfef3831e22bc7869e44656e9c759f8be7942e9e926a62171bab47c2b57f757d6a3475fcae70733848a8e597840
6
+ metadata.gz: c47d85f4ded944ae378f114f664a4c6fd3a8a794ff2ef3b4abeee24f1769a0a3128a6c34de3a3c90927b025a6307b12ae323cee40d940b6e5f0f5cc05ba5d588
7
+ data.tar.gz: dc038d938764da4a2f467e92d21ee4dada6c96c0632af1c93c05dcc8b5692b2b9d388a3958470a769fc61a67d9fb29e6a924e345045f36a923e9ff60980e08d3
data/README.md CHANGED
@@ -4,23 +4,6 @@ Middleman プロジェクト用の oulu。
4
4
 
5
5
  ## Usage
6
6
 
7
- Middleman のプロジェクトでは次のように使用します。
8
-
9
- $ middleman init PROJECT
10
- $ cd PROJECT
11
- $ vi Gemfile
12
-
13
- Gemfile の中に次の内容を追加します。
14
-
15
- gem "middleman-oulu", :github => 'oulu/middleman-oulu'
16
-
17
- ファイルを保存してから `bundle` コマンドを使ってインストールします。
18
-
19
- $ bundle install --path vendor/bundle
20
-
21
- これで Middleman の中から利用したいライブラリを呼び出すことができます。`source` 以下のファイルを編集したら Middleman を起動しましょう。
22
-
23
- $ bundle exec middleman server
24
7
 
25
8
  ## Contributing
26
9
 
@@ -2,22 +2,10 @@
2
2
  //settings
3
3
  //////////////
4
4
 
5
- // compass
5
+ // bourbon
6
6
  ///////////////////
7
7
 
8
- @import compass/css3
9
- @import compass/typography/links
10
- @import compass/typography/lists
11
- @import compass/typography/text
12
- @import compass/utilities/general
13
- @import compass/utilities/sprites
14
- @import compass/utilities/tables
15
-
16
- // compass plugins
17
- ///////////////////
18
-
19
- // compass-rgbapng https://github.com/aaronrussell/compass-rgbapng
20
- @import rgbapng
8
+ @import bourbon
21
9
 
22
10
  // variables
23
11
  ///////////////////
@@ -53,6 +41,7 @@
53
41
  @import settings/mixins/block
54
42
  @import settings/mixins/link
55
43
  @import settings/mixins/border
44
+ @import settings/mixins/border-radius
56
45
  @import settings/mixins/table
57
46
  @import settings/mixins/list
58
47
  @import settings/mixins/color
@@ -64,18 +53,9 @@
64
53
  @import settings/mixins/responsive-utilities
65
54
  @import settings/mixins/background
66
55
  @import settings/mixins/line
67
- @import settings/mixins/button
68
56
  @import settings/mixins/image
69
- @import settings/mixins/reset
70
-
71
- // http://sassmatic.com/
72
- // @import settings/mixins/sassmatic
73
-
74
- // sass3.3以上のみ使用可
75
- @import settings/mixins/html5-input-types
76
57
 
77
58
  // initializers
78
59
  ///////////////////
79
60
 
80
- @import compass/reset
81
61
  @import settings/initializers/reset
@@ -84,12 +84,9 @@
84
84
  text-align: left
85
85
 
86
86
  // list
87
- .is-horizontal-list
88
- +horizontal-list(0)
89
-
90
87
  .is-inline-blocks
91
88
  >*
92
- +inline-block(bottom)
89
+ display: inline-block
93
90
 
94
91
  .is-nowrap
95
92
  white-space: nowrap
@@ -1,5 +1,5 @@
1
1
  body
2
- @for $i from 0 through 16
2
+ @for $i from 0 through 20
3
3
  .is-margin-bottom-#{$i*4}
4
4
  +rem('margin-bottom', #{$i*4}px)
5
5
  .is-margin-top-#{$i*4}
@@ -1,6 +1,6 @@
1
1
  // typoglaphy
2
2
  .is-ja
3
- =basic-font
3
+ +basic-font
4
4
  .is-serif
5
5
  +serif
6
6
  .is-bold-ja
@@ -12,7 +12,7 @@
12
12
  =glitch($cl: white, $bg-col: black)
13
13
  +relative
14
14
  overflow: hidden
15
- +inline-block
15
+ display: inline-block
16
16
  color: $cl
17
17
  &:after,
18
18
  &:before
@@ -24,8 +24,8 @@
24
24
  &:after
25
25
  +absolute(left 1px, top 0)
26
26
  +text-shadow(-1px 0 0 rgba(red, 0.4))
27
- +experimental('animation', noise-anim 2s infinite linear alternate-reverse)
27
+ +animation(noise-anim 2s infinite linear alternate-reverse)
28
28
  &:before
29
29
  +absolute(left -1px, top 0)
30
30
  +text-shadow(1px 0 0 rgba(blue, 0.4))
31
- +experimental('animation', noise-anim-2 3s infinite linear alternate-reverse)
31
+ +animation(noise-anim-2 3s infinite linear alternate-reverse)
@@ -1,5 +1,5 @@
1
1
  =button-basic($bt-fz: 16px, $bt-ht: 30px, $bt-icon-pt: null)
2
- +inline-block(bottom)
2
+ display: inline-block
3
3
  +text-block($bt-fz, $bt-ht)
4
4
  +rem('height', $bt-ht)
5
5
  +rem('padding-left', $bt-fz*.9)
@@ -15,7 +15,7 @@
15
15
  +rem('margin-right', $bt-fz/6)
16
16
 
17
17
  =icon-button-basic($bt-fz: 18px, $bt-ht: 30px)
18
- +inline-block(bottom)
18
+ display: inline-block
19
19
  +text-block($bt-fz, $bt-ht)
20
20
  +rem('height', $bt-ht)
21
21
  +rem('width', $bt-fz*1.6)
@@ -1,18 +1,51 @@
1
+ // http://meyerweb.com/eric/tools/css/reset/
2
+ // v2.0 | 20110126
3
+ // License: none (public domain)
4
+
5
+ =meyer-reset
6
+ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video
7
+ margin: 0
8
+ padding: 0
9
+ border: 0
10
+ font-size: 100%
11
+ font: inherit
12
+ vertical-align: baseline
13
+ // HTML5 display-role reset for older browsers
14
+ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section
15
+ display: block
16
+ body
17
+ line-height: 1
18
+ ol, ul
19
+ list-style: none
20
+ blockquote, q
21
+ quotes: none
22
+ blockquote
23
+ &:before, &:after
24
+ content: ""
25
+ content: none
26
+ q
27
+ &:before, &:after
28
+ content: ""
29
+ content: none
30
+ table
31
+ border-collapse: collapse
32
+ border-spacing: 0
33
+ +meyer-reset
34
+
35
+ // 以下、追加設定
36
+
1
37
  html
2
38
  font-size: 62.5%
3
39
  +basic-font
4
- +experimental(backface-visibility, hidden)
40
+ +prefixer(backface-visibility, hidden, webkit moz spec)
5
41
 
6
42
  .mobile
7
43
  // 自動文字サイズ調整
8
- +experimental(text-size-adjust, 100%)
44
+ +prefixer(text-size-adjust, 100%, webkit moz spec)
9
45
  // タップ時のハイライトカラー
10
- +experimental(tap-highlight-color, rgba(0, 0, 0, 0))
11
- // input以外はテキスト、画像の選択不可に
12
- // *:not(input)
13
- // +experimental(user-select, none)
46
+ +prefixer(tap-highlight-color, rgba(black, 0), webkit moz spec)
14
47
  // リンクの長時間タップでリンク内容をポップアップで表示させない場合
15
- +experimental(touch-callout, none)
48
+ +prefixer(touch-callout, none, webkit moz spec)
16
49
 
17
50
  input,
18
51
  button,
@@ -25,7 +58,7 @@ textarea
25
58
  +basic-font
26
59
 
27
60
  button
28
- -webkit-appearance: button
61
+ +appearance(button)
29
62
 
30
63
  img
31
64
  vertical-align: bottom
@@ -39,10 +72,6 @@ hr
39
72
  strong
40
73
  font-weight: bold
41
74
 
42
- .pie
43
- zoom: 1
44
- position: relative
45
-
46
75
  // form
47
76
  #{$all-button-inputs},
48
77
  button
@@ -67,7 +96,6 @@ input[type="file"]::-webkit-file-upload-button
67
96
  cursor: pointer !important
68
97
 
69
98
  // selection
70
-
71
99
  *::selection
72
100
  background: $selection-bg-color
73
101
  color: $selection-tx-color
@@ -1,20 +1,3 @@
1
- =transition($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null, $value7: null, $value8: null, $value9: null, $value10: null)
2
- $list: $value1 $value2 $value3 $value4 $value5 $value6 $value7 $value8 $value9 $value10
3
- $transition-properties: ()
4
- $transition-durations: ()
5
- $transition-timing-functions: ()
6
- $transition-delays: ()
7
- @each $value in $list
8
- @for $i from 1 through length($value)
9
- $transition-properties: append($transition-properties, if(transition_property(nth($value, $i)), nth($value, $i), null), comma)
10
- $transition-durations: append($transition-durations, if(transition_duration(nth($value, $i)), nth($value, $i), null), comma)
11
- $transition-timing-functions: append($transition-timing-functions, if(transition_timing_function(nth($value, $i)), nth($value, $i), null), comma)
12
- $transition-delays: append($transition-delays, if(transition_delay(nth($value, $i)), transition_delay(nth($value, $i)), null), comma)
13
- +transition-property($transition-properties)
14
- +transition_duration($transition-durations)
15
- +transition_timing_function($transition-timing-functions)
16
- +transition-delay($transition-delays)
17
-
18
1
  =animations($value1: null, $value2: null, $value3: null, $value4: null, $value5: null, $value6: null, $value7: null, $value8: null, $value9: null, $value10: null)
19
2
  $list: $value1 $value2 $value3 $value4 $value5 $value6 $value7 $value8 $value9 $value10
20
3
  $animation-names: ()
@@ -1,23 +1,3 @@
1
- // http://qiita.com/orangemittoo/items/1c9f32296836d3ea125e
2
-
3
- $sprites-images-directory: sprites !default
4
- $sprite-map: sprite-map("#{$sprites-images-directory}/*.png", $layout: smart)
5
- $map-img: sprite-url($sprite-map)
6
-
7
- =sprite-background($name, $background-size: null, $background-repeat: null)
8
- // block;
9
- background-image: $map-img
10
- $pos: sprite-position($sprite-map, $name)
11
- background-position: nth($pos, 1) / 2 nth($pos, 2) / 2
12
- @if $background-size
13
- +background-size($background-size)
14
- @else
15
- +background-size(ceil(image-width(sprite-path($sprite-map)) / 2) auto)
16
- @if $background-repeat
17
- background-repeat: $background-repeat
18
- @else
19
- background-repeat: no-repeat
20
-
21
1
  =bg-size($value)
22
2
  @if list($value)
23
3
  @if str-slice(nth($value, 1), 1, 1) == '/'
@@ -1,16 +1,16 @@
1
- =size($values)
1
+ =block-size($values)
2
2
  @if equal_nth($values, 2)
3
- +rem('height', nth($values, 1))
4
- +rem('width', nth($values, 2))
3
+ +rem('width', nth($values, 1))
4
+ +rem('height', nth($values, 2))
5
5
  @else
6
6
  +rem('width', nth($values, 1))
7
7
  +rem('height', nth($values, 1))
8
8
 
9
9
  =center-block($values)
10
- $block-height: optional_nth($values, 1)
11
- $block-width: optional_nth($values, 2)
10
+ $block-width: optional_nth($values, 1)
11
+ $block-height: optional_nth($values, 2)
12
12
  $block-z-index: optional_nth($values, 3)
13
- +size($block-height $block-width)
13
+ +block-size($block-width $block-height)
14
14
  +fixed(left 50%, top 50%, $block-z-index)
15
15
  +rem('margin-top', $block-height / 2 * -1)
16
16
  +rem('margin-left', $block-width / 2 * -1)
@@ -37,3 +37,16 @@
37
37
  over-flow-y: $over-flow-y
38
38
  @else
39
39
  over-flow: $over-flow-x
40
+
41
+ =border-radius($values)
42
+ +prefixer(border-radius, $values, webkit moz spec)
43
+
44
+ =inline-block($value: null)
45
+ display: inline-block
46
+ vertical-align: $value
47
+
48
+ =background-size($values)
49
+ +prefixer(background-size, $values, webkit moz spec)
50
+
51
+ =background-clip($value)
52
+ +prefixer(background-clip, $value, webkit moz spec)
@@ -0,0 +1,45 @@
1
+ // 使い方
2
+ // +border-radius(vertical, 4px)
3
+
4
+ =border-radius($value1: null, $value2: null)
5
+ @if number(nth($value1, 1))
6
+ +rem('border-radius', $value1)
7
+ @else
8
+ @for $i from 1 through length($value1)
9
+ @if nth($value1, $i) == 'all'
10
+ +rem('border-radius', $value2)
11
+ @else if vertical(nth($value1, $i))
12
+ +rem('border-top-radius', $value2)
13
+ +rem('border-bottom-radius', $value2)
14
+ @else if horizontal(nth($value1, $i))
15
+ +rem('border-left-radius', $value2)
16
+ +rem('border-right-radius', $value2)
17
+ @else if top(nth($value1, $i))
18
+ +rem('border-top-radius', $value2)
19
+ @else if bottom(nth($value1, $i))
20
+ +rem('border-bottom-radius', $value2)
21
+ @else if left(nth($value1, $i))
22
+ +rem('border-left-radius', $value2)
23
+ @else if right(nth($value1, $i))
24
+ +rem('border-right-radius', $value2)
25
+
26
+ // 使い方
27
+ // +reset-border-radius(vertical, 4px)
28
+ =reset-border-radius($value: 'all')
29
+ @for $i from 1 through length($value1)
30
+ @if nth($value1, $i) == 'all'
31
+ border-radius: 0
32
+ @else if vertical(nth($value1, $i))
33
+ border-top-radius: 0
34
+ border-bottom-radius: 0
35
+ @else if horizontal(nth($value1, $i))
36
+ border-left-radius: 0
37
+ border-right-radius: 0
38
+ @else if top(nth($value1, $i))
39
+ border-top-radius: 0
40
+ @else if bottom(nth($value1, $i))
41
+ border-bottom-radius: 0
42
+ @else if left(nth($value1, $i))
43
+ border-left-radius: 0
44
+ @else if right(nth($value1, $i))
45
+ border-right-radius: 0
@@ -1,4 +1,4 @@
1
- // +ie-rgba(rgba(0, 0, 0, .4), white, background-color)
1
+ // +ie-rgba(rgba(black, .4), white, background-color)
2
2
  =ie-rgba($foreground, $backdrop: white, $property: "background-color")
3
3
  @if $property == "background-color"
4
4
  +rgba-background($foreground)
@@ -2,4 +2,4 @@
2
2
  // 例 +filter(sepia(100%) hue-rotate(33deg) contrast(69%) unquote("saturate(2)"))
3
3
 
4
4
  =filter($var)
5
- +experimental('filter', $var)
5
+ +prefixer('filter', $var, webkit moz spec)
@@ -5,3 +5,6 @@
5
5
  @content
6
6
  &.placeholder
7
7
  @content
8
+
9
+ $inputs-en-list: 'input[type="email"]', 'input[type="number"]', 'input[type="search"]', 'input[type="tel"]', 'input[type="url"]', 'input[type="color"]', 'input[type="date"]', 'input[type="datetime"]', 'input[type="datetime-local"]', 'input[type="time"]'
10
+ $all-en-text-inputs: assign-inputs($inputs-en-list)
@@ -85,9 +85,8 @@ $break-points: $break-point-xs-namespace, $break-point-sm-namespace, $break-poin
85
85
  #{$row-class-name}
86
86
  // カラムのマージン分だけ両サイドにネガティブマージンを取る
87
87
  +margin(horizontal, ($gutter-width / 2) * -1)
88
- // clearfix
89
88
  +rem('min-height', 1px)
90
- +pie-clearfix
89
+ +clearfix
91
90
 
92
91
  // カラムの基本設定
93
92
  =column($number, $columns-gutter-width: $gutter-width)
@@ -134,7 +133,7 @@ $break-points: $break-point-xs-namespace, $break-point-sm-namespace, $break-poin
134
133
  #{$grid-columns-row-class-name}
135
134
  // カラムのマージン分だけ両サイドにネガティブマージンを取る
136
135
  +margin(horizontal, ($columns-gutter-width / 2) * -1)
137
- +micro-clearfix
136
+ +clearfix
138
137
  // カラムをサイズごとに作る
139
138
  $break-points: ()
140
139
  @each $temp-break-point in $temp-break-points
@@ -1,3 +1,5 @@
1
- =center-image
1
+ =center-image($values: false)
2
2
  display: block
3
3
  +margin(horizontal, auto)
4
+ @if $values
5
+ +size($values)
@@ -1,10 +1,34 @@
1
+ =link-colors($normal, $hover: false, $active: false, $visited: false, $focus: false)
2
+ color: $normal
3
+ @if $visited
4
+ &:visited
5
+ color: $visited
6
+ @if $focus
7
+ &:focus
8
+ color: $focus
9
+ @if $hover
10
+ &:hover
11
+ color: $hover
12
+ @if $active
13
+ &:active
14
+ color: $active
15
+
1
16
  =block-link
2
17
  display: block
3
18
  text-decoration: none
4
19
 
5
20
  =inline-block-link($value: false)
6
- +inline-block($value)
21
+ display: inline-block
22
+ text-decoration: none
23
+ vertical-align: $value
24
+
25
+ =hover-link($modifire-class: null)
7
26
  text-decoration: none
27
+ &:hover,
28
+ &:active
29
+ text-decoration: underline
30
+ @if $modifire-class
31
+ #{$modifire-class}: underline
8
32
 
9
33
  =hover-link-reverse($modifire-class: null)
10
34
  text-decoration: underline
@@ -16,8 +16,8 @@ $baseline-px: 10px !default
16
16
  @if $property == "font-size" and $px-values < 10px
17
17
  // 9px以下のfont-sizeを使う設定(IE8不可)
18
18
  +base-font-size
19
- +scale3d(strip_unit($px-values / strip_unit($baseline-px)), strip_unit($px-values/ strip_unit($baseline-px)), 1)
20
- +transform-origin(0, 0)
19
+ +transform(scale3d(strip_unit($px-values / strip_unit($baseline-px)) strip_unit($px-values/ strip_unit($baseline-px)) 1))
20
+ +transform-origin(0 0)
21
21
  @else
22
22
  // Convert the baseline into rems
23
23
  $baseline-rem: $baseline-px / 1rem
@@ -1,40 +1,47 @@
1
+ =reset-select
2
+ +appearance(none)
3
+ +border(none)
4
+ border: none
5
+ margin: 0
6
+ padding: 0
7
+ background: none transparent
8
+ vertical-align: middle
9
+ font-size: inherit
10
+ color: inherit
11
+ box-sizing: content-box
12
+ &:active,
13
+ &:focus
14
+ outline: none
15
+
1
16
  =reset-margin($directions: all)
2
- @if $directions == 'all'
17
+ @if all($directions)
3
18
  margin: 0
4
- @else if $directions == 'horizontal'
5
- margin-left: 0
6
- margin-right: 0
7
- @else if $directions == 'vertical'
8
- margin-top: 0
9
- margin-bottom: 0
19
+ @else if horizontal($directions)
20
+ +margin(horizontal, 0)
21
+ @else if vertical($directions)
22
+ +margin(vertical, 0)
10
23
  @else
11
24
  @each $direction in $directions
12
- @if $direction == 'horizontal'
13
- margin-left: 0
14
- margin-right: 0
15
- @else if $direction == 'vertical'
16
- margin-top: 0
17
- margin-bottom: 0
25
+ @if horizontal($direction)
26
+ +margin(horizontal, 0)
27
+ @else if vertical($direction)
28
+ +margin(vertical, 0)
18
29
  @else
19
30
  margin-#{$direction}: 0
20
31
 
21
32
  =reset-padding($directions: all)
22
- @if $directions == 'all'
33
+ @if all($directions)
23
34
  padding: 0
24
- @else if $directions == 'horizontal'
25
- padding-left: 0
26
- padding-right: 0
27
- @else if $directions == 'vertical'
28
- padding-top: 0
29
- padding-bottom: 0
35
+ @else if horizontal($directions)
36
+ +padding(horizontal, 0px)
37
+ @else if vertical($directions)
38
+ +padding(vertical, 0px)
30
39
  @else
31
40
  @each $direction in $directions
32
- @if $direction == 'horizontal'
33
- padding-left: 0
34
- padding-right: 0
35
- @else if $direction == 'vertical'
36
- padding-top: 0
37
- padding-bottom: 0
41
+ @if horizontal($direction)
42
+ +padding(horizontal, 0px)
43
+ @else if vertical($direction)
44
+ +padding(vertical, 0px)
38
45
  @else
39
46
  padding-#{$direction}: 0
40
47
 
@@ -6,14 +6,6 @@ $all: top right bottom left !default
6
6
  $horizontal: left right !default
7
7
  $vertical: top bottom !default
8
8
 
9
- /////////////////
10
- // compass
11
- ////////////////
12
-
13
- // rgbapng
14
- $rgbapng_path: 'rgbapngs' !default
15
- $rgbapng_px_size: 8 !default
16
-
17
9
  /////////////////
18
10
  // layout
19
11
  ////////////////
@@ -58,8 +50,6 @@ $gutter-width: 50px !default
58
50
  // font
59
51
  ////////////////
60
52
 
61
- $ms-base: 16px !default
62
-
63
53
  $fw: 400 !default
64
54
 
65
55
  $basic-sans-serif: "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans", "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "游ゴシック", YuGothic, "メイリオ", Meiryo, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif !default
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module Oulu
3
- VERSION = "0.5.37"
3
+ VERSION = "0.6.1"
4
4
  end
5
5
  end
@@ -1,8 +1,7 @@
1
1
  require "middleman-oulu/version"
2
- require 'compass'
2
+ require 'bourbon'
3
3
 
4
4
  module Middleman
5
5
  module Oulu
6
- require 'rgbapng'
7
6
  end
8
7
  end
@@ -21,8 +21,6 @@ Gem::Specification.new do |spec|
21
21
  spec.add_runtime_dependency("bundler", "~> 1.3")
22
22
  spec.add_runtime_dependency("rake")
23
23
  spec.add_runtime_dependency("sass", "~> 3.4.5")
24
- spec.add_runtime_dependency("compass", "~> 1.0.1")
25
- spec.add_runtime_dependency("oily_png")
26
- spec.add_runtime_dependency("compass-rgbapng")
24
+ spec.add_runtime_dependency("bourbon")
27
25
 
28
26
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-oulu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.37
4
+ version: 0.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
@@ -53,35 +53,7 @@ dependencies:
53
53
  - !ruby/object:Gem::Version
54
54
  version: 3.4.5
55
55
  - !ruby/object:Gem::Dependency
56
- name: compass
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: 1.0.1
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: 1.0.1
69
- - !ruby/object:Gem::Dependency
70
- name: oily_png
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :runtime
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- version: '0'
83
- - !ruby/object:Gem::Dependency
84
- name: compass-rgbapng
56
+ name: bourbon
85
57
  requirement: !ruby/object:Gem::Requirement
86
58
  requirements:
87
59
  - - ">="
@@ -198,13 +170,12 @@ files:
198
170
  - assets/stylesheets/settings/mixins/_balloon-tail.sass
199
171
  - assets/stylesheets/settings/mixins/_basic-font.sass
200
172
  - assets/stylesheets/settings/mixins/_block.sass
173
+ - assets/stylesheets/settings/mixins/_border-radius.sass
201
174
  - assets/stylesheets/settings/mixins/_border.sass
202
- - assets/stylesheets/settings/mixins/_button.sass
203
175
  - assets/stylesheets/settings/mixins/_color.sass
204
176
  - assets/stylesheets/settings/mixins/_filters.sass
205
177
  - assets/stylesheets/settings/mixins/_form.sass
206
178
  - assets/stylesheets/settings/mixins/_grids.sass
207
- - assets/stylesheets/settings/mixins/_html5-input-types.scss
208
179
  - assets/stylesheets/settings/mixins/_ie-hacks.sass
209
180
  - assets/stylesheets/settings/mixins/_image.sass
210
181
  - assets/stylesheets/settings/mixins/_line.sass
@@ -214,11 +185,8 @@ files:
214
185
  - assets/stylesheets/settings/mixins/_overlay.sass
215
186
  - assets/stylesheets/settings/mixins/_positions.sass
216
187
  - assets/stylesheets/settings/mixins/_rem.sass
217
- - assets/stylesheets/settings/mixins/_reset.sass
218
188
  - assets/stylesheets/settings/mixins/_resets.sass
219
189
  - assets/stylesheets/settings/mixins/_responsive-utilities.sass
220
- - assets/stylesheets/settings/mixins/_sassmatic.sass
221
- - assets/stylesheets/settings/mixins/_sprite-background.sass
222
190
  - assets/stylesheets/settings/mixins/_table.sass
223
191
  - assets/stylesheets/settings/mixins/_text.sass
224
192
  - assets/stylesheets/settings/variables/_default.sass
@@ -1,27 +0,0 @@
1
- =button-base($font-size: 12px, $height: 30px, $font-weight: bold, $width: auto, $is-block: null, $is-center: null, $icon-font-size: 14px, $icon-position: null)
2
- +rem('font-size', $font-size)
3
- +rem('height', $height)
4
- +rem('line-height', $height)
5
- font-weight: $font-weight
6
- +rem('width', $width)
7
- text-decoration: none
8
- +relative(1)
9
- text-align: center
10
- @if $is-block == "true"
11
- display: block
12
- @else
13
- +inline-block
14
- @if $is-center == "true"
15
- +margin(horizontal, auto)
16
- @if $icon-font-size
17
- i
18
- +text-block($icon-font-size, $height)
19
- +rem('width', $height)
20
- display: block
21
- text-align: center
22
- @if $icon-position == "left"
23
- i
24
- +absolute(left, 0, top, 0)
25
- @else if $icon-position == "right"
26
- i
27
- +absolute(right, 0, top, 0)
@@ -1,118 +0,0 @@
1
- // https://github.com/thoughtbot/bourbon/blob/master/app/assets/stylesheets/functions/_assign.scss
2
-
3
- @function assign-inputs($inputs, $pseudo: null) {
4
- $list : ();
5
-
6
- @each $input in $inputs {
7
- $input: unquote($input);
8
- $input: if($pseudo, $input + ":" + $pseudo, $input);
9
- $list: append($list, $input, comma);
10
- }
11
-
12
- @return $list;
13
- }
14
-
15
- //************************************************************************//
16
- // Generate a variable ($all-text-inputs) with a list of all html5
17
- // input types that have a text-based input, excluding textarea.
18
- // http://diveintohtml5.org/forms.html
19
- //************************************************************************//
20
- $inputs-list: 'input[type="email"]',
21
- 'input[type="number"]',
22
- 'input[type="password"]',
23
- 'input[type="search"]',
24
- 'input[type="tel"]',
25
- 'input[type="text"]',
26
- 'input[type="url"]',
27
-
28
- // Webkit & Gecko may change the display of these in the future
29
- 'input[type="color"]',
30
- 'input[type="date"]',
31
- 'input[type="datetime"]',
32
- 'input[type="datetime-local"]',
33
- 'input[type="month"]',
34
- 'input[type="time"]',
35
- 'input[type="week"]';
36
-
37
- $inputs-en-list: 'input[type="email"]',
38
- 'input[type="number"]',
39
- 'input[type="search"]',
40
- 'input[type="tel"]',
41
- 'input[type="url"]',
42
-
43
- // Webkit & Gecko may change the display of these in the future
44
- 'input[type="color"]',
45
- 'input[type="date"]',
46
- 'input[type="datetime"]',
47
- 'input[type="datetime-local"]',
48
- 'input[type="time"]';
49
-
50
-
51
- // Bare inputs
52
- //************************************************************************//
53
- $all-text-inputs: assign-inputs($inputs-list);
54
-
55
- // English inputs
56
- //************************************************************************//
57
- $all-en-text-inputs: assign-inputs($inputs-en-list);
58
-
59
- // Hover Pseudo-class
60
- //************************************************************************//
61
- $all-text-inputs-hover: assign-inputs($inputs-list, hover);
62
-
63
- // Focus Pseudo-class
64
- //************************************************************************//
65
- $all-text-inputs-focus: assign-inputs($inputs-list, focus);
66
-
67
-
68
-
69
- // You must use interpolation on the variable:
70
- // #{$all-text-inputs}
71
- // #{$all-text-inputs-hover}
72
- // #{$all-text-inputs-focus}
73
-
74
- // Example
75
- //************************************************************************//
76
- // #{$all-text-inputs}, textarea {
77
- // border: 1px solid red;
78
- // }
79
-
80
-
81
-
82
- //************************************************************************//
83
- // Generate a variable ($all-button-inputs) with a list of all html5
84
- // input types that have a button-based input, excluding button.
85
- //************************************************************************//
86
- $inputs-button-list: 'input[type="button"]',
87
- 'input[type="reset"]',
88
- 'input[type="submit"]';
89
-
90
- // Bare inputs
91
- //************************************************************************//
92
- $all-button-inputs: assign-inputs($inputs-button-list);
93
-
94
- // Hover Pseudo-class
95
- //************************************************************************//
96
- $all-button-inputs-hover: assign-inputs($inputs-button-list, hover);
97
-
98
- // Focus Pseudo-class
99
- //************************************************************************//
100
- $all-button-inputs-focus: assign-inputs($inputs-button-list, focus);
101
-
102
- // Active Pseudo-class
103
- //************************************************************************//
104
- $all-button-inputs-active: assign-inputs($inputs-button-list, active);
105
-
106
-
107
-
108
- // You must use interpolation on the variable:
109
- // #{$all-button-inputs}
110
- // #{$all-button-inputs-hover}
111
- // #{$all-button-inputs-focus}
112
- // #{$all-button-inputs-active}
113
-
114
- // Example
115
- //************************************************************************//
116
- // #{$all-button-inputs}, button {
117
- // border: 1px solid red;
118
- // }
@@ -1,14 +0,0 @@
1
- =reset-select
2
- +appearance(none)
3
- +border(none)
4
- border: none
5
- margin: 0
6
- padding: 0
7
- background: none transparent
8
- vertical-align: middle
9
- font-size: inherit
10
- color: inherit
11
- box-sizing: content-box
12
- &:active,
13
- &:focus
14
- outline: none
@@ -1,172 +0,0 @@
1
- // sassmatic by
2
- // # TEAM
3
- // Hugo Darby-Brown -- Author -- @darbybrown
4
- // # THANKS
5
- // The Sass Team
6
- // The Compass Team
7
- // Jesse taylor for JS on the demo @Jesse__Taylor
8
-
9
- =filter-setup
10
- content: ""
11
- +absolute(bottom 0, left 0, right 0, top 0, 4)
12
- +opacity(.4)
13
-
14
- /* =========================================
15
- *Filter Washout
16
- *=========================================
17
-
18
- %filter-washout
19
- +filter(sepia(10%) saturate(0.8) brightness(1.5) contrast(0.8))
20
- position: relative
21
- &:after
22
- +background-image(radial-gradient(center, ellipse cover, rgba(white, 0) 40%, rgba(white, 0.9) 100%))
23
- +filter-setup
24
-
25
- /* =========================================
26
- *Filter Nikki
27
- *=========================================
28
-
29
- %filter-nikki
30
- +filter(saturate(1.3) brightness(1.1) contrast(1.1))
31
- position: relative
32
-
33
- /* =========================================
34
- *Filter Deadwood
35
- *=========================================
36
-
37
- %filter-deadwood
38
- +filter(sepia(40%) brightness(1.4) saturate(0.8))
39
- position: relative
40
- &:after
41
- background: black
42
- +filter-setup
43
-
44
- /* =========================================
45
- *Filter SanFran
46
- *=========================================
47
-
48
- %filter-sanfran
49
- +filter(brightness(1.2) contrast(0.8) saturate(2) sepia(0.1))
50
- position: relative
51
- &:after
52
- +background-image(radial-gradient(center, ellipse cover, rgba(white, 0) 0%, rgba(white, 0.5) 100%))
53
- +filter-setup
54
-
55
- /* =========================================
56
- *Filter Noire
57
- *=========================================
58
-
59
- %filter-noire
60
- +filter(grayscale(90%) contrast(1.3))
61
- position: relative
62
- &:after
63
- +background-image(radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.65) 82%, rgba(0, 0, 0, 0.69) 83%, rgba(0, 0, 0, 1) 90%))
64
- +filter-setup
65
- +opacity(.7)
66
-
67
- /* =========================================
68
- *Filter Neptune
69
- *=========================================
70
-
71
- %filter-neptune
72
- +filter(brightness(1.4) contrast(1) saturate(1))
73
- position: relative
74
- &:after
75
- +background-image(radial-gradient(center, ellipse cover, rgba(125, 185, 232, 0) 0%, rgba(30, 87, 153, 1) 100%))
76
- +filter-setup
77
-
78
- /* =========================================
79
- *Filter Lomo
80
- *=========================================
81
-
82
- %filter-lomo
83
- +filter(contrast(1.3) saturate(1.2) brightness(140%))
84
- position: relative
85
- &:after
86
- +filter(radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.65) 92%, rgba(0, 0, 0, 0.69) 93%, rgba(0, 0, 0, 1) 100%))
87
- +filter-setup
88
- +opacity(.9)
89
-
90
- /* =========================================
91
- *Filter Warming
92
- *=========================================
93
-
94
- %filter-warming
95
- +filter(sepia(10%) saturate(0.9) brightness(140%))
96
- position: relative
97
- &:after
98
- +rgba-background-inline(rgba(236, 138, 0, 0.2))
99
- +filter-setup
100
- +opacity(.6)
101
-
102
- /* =========================================
103
- *Filter Cooling
104
- *=========================================
105
-
106
- %filter-cooling
107
- +filter(sepia(10%) saturate(0.9) brightness(140%))
108
- position: relative
109
- &:after
110
- background-color: rgba(0, 109, 255, 0.35)
111
- +background-image(radial-gradient(center, ellipse cover, rgba(125, 185, 232, 0) 0%, rgba(30, 87, 153, 1) 100%))
112
- +filter-setup
113
-
114
- /* =========================================
115
- *Filter Pro
116
- *=========================================
117
-
118
- %filter-pro
119
- +filter(sepia(15%) contrast(1.7) saturate(0.7))
120
- position: relative
121
-
122
- /* =========================================
123
- *Filter Casablanca
124
- *=========================================
125
-
126
- %filter-casablanca
127
- +filter(grayscale(90%) contrast(0.8) brightness(110%))
128
- position: relative
129
- &:after
130
- +background-image(radial-gradient(center, ellipse cover, rgba(white, 0) 0%, rgba(white, 0.9) 100%))
131
- +filter-setup
132
-
133
- /* =========================================
134
- *Filter Glassic
135
- *=========================================
136
-
137
- %filter-glassic
138
- +filter(brightness(90%) contrast(1.2))
139
- position: relative
140
- &:after
141
- +background-image(linear-gradient(left bottom, rgba(244, 244, 244, 0.3) 0%, rgba(244, 244, 244, 0.3) 60%, rgba(244, 244, 244, 0.7) 60%, rgba(255, 255, 255, 1) 100%))
142
- +box-shadow( 0px 0px 10rem rgba(255, 255, 255, 1) inset)
143
- +filter-setup
144
- +opacity(.6)
145
-
146
- /* =========================================
147
- *Filter Custom
148
- *=========================================
149
-
150
- =filter-custom($var: none)
151
- +filter($var)
152
- position: relative
153
- &:after
154
- content: ""
155
- +absolute(right 0, bottom 0, top 0, left 0, 4)
156
-
157
- /* =========================================
158
- *Filter Color
159
- *=========================================
160
-
161
- =filter-color($color: #df8800, $opacity: 0.4)
162
- &:after
163
- +rgba-background-inline(rgba($color, $opacity))
164
-
165
- /* =========================================
166
- *Filter Vignette
167
- *=========================================
168
-
169
- =filter-vignette($color: black, $start: 80%, $stop: 95%, $extra: 0)
170
- &:after
171
- +background-image(radial-gradient(center, ellipse cover, rgba($color, 0) $start, rgba($color, 0.9) $stop))
172
- +box-shadow( 0 0 $extra rgba($color, 1) inset)
@@ -1,18 +0,0 @@
1
- // http://qiita.com/orangemittoo/items/1c9f32296836d3ea125e
2
-
3
- $sprite-map: sprite-map("sprites/*.png", $layout: smart)
4
- $map-img: sprite-url($sprite-map)
5
-
6
- =sprite-background($name, $background-size: null, $background-repeat: null)
7
- // block;
8
- background-image: $map-img
9
- $pos: sprite-position($sprite-map, $name)
10
- background-position: nth($pos, 1) / 2 nth($pos, 2) / 2
11
- @if $background-size
12
- +background-size($background-size)
13
- @else
14
- +background-size(ceil(image-width(sprite-path($sprite-map)) / 2) auto)
15
- @if $background-repeat
16
- background-repeat: $background-repeat
17
- @else
18
- background-repeat: no-repeat