middleman-oulu 0.6.10 → 0.6.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/assets/stylesheets/_oulu-base.sass +0 -1
- data/assets/stylesheets/modules/buttons/_button-helper.sass +2 -2
- data/assets/stylesheets/modules/buttons/_buttons.sass +7 -0
- data/assets/stylesheets/options/web-fonts/_cousine.sass +1 -1
- data/assets/stylesheets/options/web-fonts/_inconsolata.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_lato.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_montserrat.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_old-standard.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_podkova.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_pt-sans.sass +1 -2
- data/assets/stylesheets/options/web-fonts/_satisfy.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_source-code-pro.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_source-sans-pro.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_special-elite.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_ubuntu-mono.sass +1 -2
- data/assets/stylesheets/options/web-fonts/_ubuntu.sass +0 -1
- data/assets/stylesheets/options/web-fonts/_vt323.sass +0 -1
- data/assets/stylesheets/settings/initializers/_reset.sass +0 -5
- data/assets/stylesheets/settings/mixins/_block.sass +2 -8
- data/assets/stylesheets/settings/mixins/_border-radius.sass +8 -10
- data/lib/middleman-oulu/version.rb +1 -1
- metadata +2 -4
- data/assets/stylesheets/options/oulu-buttons/_button-basic.sass +0 -31
- data/assets/stylesheets/settings/mixins/_color.sass +0 -11
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1e22302445d6398a69a0b50fef8870914b6d3cd8
|
|
4
|
+
data.tar.gz: 2c011e28c83f448b30e165ee72cd875d2421e6c2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 75ef9c1f66387b5204f289676729bdd70593e2d8122fdd3a05ea0a57bde82fec569d08e88a0d5452dce3309957f24b063ee111bde09a69b2bbc517250f205c95
|
|
7
|
+
data.tar.gz: 891a7680ffacb54f70709ea1ed24d4c1e913c829667ba507f3d9ab21029dc8d1a227c8ee408c565d364877a0687a08ebc59d1e57751786ecaeed6ec1ecdf5adc
|
|
@@ -4,6 +4,7 @@ $button-styles: normal, border, flat-emboss, material
|
|
|
4
4
|
|
|
5
5
|
@import button-base
|
|
6
6
|
|
|
7
|
+
// button styles
|
|
7
8
|
@import styles/normal
|
|
8
9
|
@import styles/border
|
|
9
10
|
@import styles/flat-emboss
|
|
@@ -11,6 +12,12 @@ $button-styles: normal, border, flat-emboss, material
|
|
|
11
12
|
|
|
12
13
|
@import button-helper
|
|
13
14
|
|
|
15
|
+
// inputのスタイルを継承させる
|
|
16
|
+
input[type= submit]
|
|
17
|
+
color: inherit
|
|
18
|
+
font-size: inherit
|
|
19
|
+
font-weight: inherit
|
|
20
|
+
|
|
14
21
|
=button($style, $size, $color, $options: false)
|
|
15
22
|
+button-base
|
|
16
23
|
@if $style == normal
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
@import url(
|
|
1
|
+
@import url(//fonts.googleapis.com/css?family=Cousine:400,700,400italic,700italic)
|
|
2
2
|
|
|
3
3
|
=cousine($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
|
|
4
4
|
// $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
@import url(
|
|
2
|
-
|
|
1
|
+
@import url(//fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic)
|
|
3
2
|
=pt-sans($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
|
|
4
3
|
// $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
|
|
5
4
|
font-family: 'PT Sans', sans-serif
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,900,200italic,300italic,400italic,600italic,700italic,900italic)
|
|
2
|
-
|
|
3
2
|
// 備考:Adobeのsans-serif
|
|
4
3
|
=source-sans-pro($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
|
|
5
4
|
// $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
@import url(
|
|
2
|
-
|
|
1
|
+
@import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic)
|
|
3
2
|
=ubuntu-mono($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
|
|
4
3
|
// $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
|
|
5
4
|
font-family: 'Ubuntu Mono', monospace
|
|
@@ -46,9 +46,6 @@
|
|
|
46
46
|
@else
|
|
47
47
|
over-flow: $over-flow-x
|
|
48
48
|
|
|
49
|
-
=border-radius($values)
|
|
50
|
-
+prefixer(border-radius, $values, webkit moz spec)
|
|
51
|
-
|
|
52
49
|
=inline-block($value: null)
|
|
53
50
|
display: inline-block
|
|
54
51
|
vertical-align: $value
|
|
@@ -59,11 +56,8 @@
|
|
|
59
56
|
=background-clip($value)
|
|
60
57
|
+prefixer(background-clip, $value, webkit moz spec)
|
|
61
58
|
|
|
62
|
-
=box-shadow($values)
|
|
59
|
+
=box-shadow($values...)
|
|
63
60
|
+rem(box-shadow, $values)
|
|
64
61
|
|
|
65
|
-
=text-shadow($values)
|
|
62
|
+
=text-shadow($values...)
|
|
66
63
|
+rem(text-shadow, $values)
|
|
67
|
-
|
|
68
|
-
=border-radius($values)
|
|
69
|
-
+rem(border-radius, $values)
|
|
@@ -8,20 +8,18 @@
|
|
|
8
8
|
@for $i from 1 through length($value1)
|
|
9
9
|
@if nth($value1, $i) == 'all'
|
|
10
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
11
|
@else if top(nth($value1, $i))
|
|
18
|
-
+rem('border-top-radius', $value2)
|
|
12
|
+
+rem('border-top-left-radius', $value2)
|
|
13
|
+
+rem('border-top-right-radius', $value2)
|
|
19
14
|
@else if bottom(nth($value1, $i))
|
|
20
|
-
+rem('border-bottom-radius', $value2)
|
|
15
|
+
+rem('border-bottom-left-radius', $value2)
|
|
16
|
+
+rem('border-bottom-right-radius', $value2)
|
|
21
17
|
@else if left(nth($value1, $i))
|
|
22
|
-
+rem('border-left-radius', $value2)
|
|
18
|
+
+rem('border-top-left-radius', $value2)
|
|
19
|
+
+rem('border-bottom-left-radius', $value2)
|
|
23
20
|
@else if right(nth($value1, $i))
|
|
24
|
-
+rem('border-right-radius', $value2)
|
|
21
|
+
+rem('border-top-right-radius', $value2)
|
|
22
|
+
+rem('border-bottom-right-radius', $value2)
|
|
25
23
|
|
|
26
24
|
// 使い方
|
|
27
25
|
// +reset-border-radius(vertical, 4px)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: middleman-oulu
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- machida
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-04-
|
|
11
|
+
date: 2015-04-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -133,7 +133,6 @@ files:
|
|
|
133
133
|
- assets/stylesheets/modules/navs/_tabs-nav.sass
|
|
134
134
|
- assets/stylesheets/options/amazlet/_amazlet.sass
|
|
135
135
|
- assets/stylesheets/options/glitch/_glitch.sass
|
|
136
|
-
- assets/stylesheets/options/oulu-buttons/_button-basic.sass
|
|
137
136
|
- assets/stylesheets/options/web-fonts/_cousine.sass
|
|
138
137
|
- assets/stylesheets/options/web-fonts/_font-awsome.sass
|
|
139
138
|
- assets/stylesheets/options/web-fonts/_icomoon.sass
|
|
@@ -180,7 +179,6 @@ files:
|
|
|
180
179
|
- assets/stylesheets/settings/mixins/_block.sass
|
|
181
180
|
- assets/stylesheets/settings/mixins/_border-radius.sass
|
|
182
181
|
- assets/stylesheets/settings/mixins/_border.sass
|
|
183
|
-
- assets/stylesheets/settings/mixins/_color.sass
|
|
184
182
|
- assets/stylesheets/settings/mixins/_filters.sass
|
|
185
183
|
- assets/stylesheets/settings/mixins/_form.sass
|
|
186
184
|
- assets/stylesheets/settings/mixins/_grids.sass
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
=button-basic($bt-fz: 16px, $bt-ht: 30px, $bt-icon-pt: null)
|
|
2
|
-
display: inline-block
|
|
3
|
-
+text-block($bt-fz, $bt-ht)
|
|
4
|
-
+rem('height', $bt-ht)
|
|
5
|
-
+rem('padding-left', $bt-fz*.9)
|
|
6
|
-
+rem('padding-right', $bt-fz*.9)
|
|
7
|
-
cursor: pointer
|
|
8
|
-
text-align: center
|
|
9
|
-
text-decoration: none
|
|
10
|
-
@if $bt-icon-pt == "right"
|
|
11
|
-
>i
|
|
12
|
-
+rem('margin-left', $bt-fz/6)
|
|
13
|
-
@else if $bt-icon-pt == "left"
|
|
14
|
-
>i
|
|
15
|
-
+rem('margin-right', $bt-fz/6)
|
|
16
|
-
|
|
17
|
-
=icon-button-basic($bt-fz: 18px, $bt-ht: 30px)
|
|
18
|
-
display: inline-block
|
|
19
|
-
+text-block($bt-fz, $bt-ht)
|
|
20
|
-
+rem('height', $bt-ht)
|
|
21
|
-
+rem('width', $bt-fz*1.6)
|
|
22
|
-
cursor: pointer
|
|
23
|
-
text-align: center
|
|
24
|
-
text-decoration: none
|
|
25
|
-
|
|
26
|
-
=border-style-border($bt-cl: red, $bt-bd-wd: 2px)
|
|
27
|
-
+border(all, $bt-bd-wd, solid, $bt-cl)
|
|
28
|
-
color: $bt-cl
|
|
29
|
-
&:hover
|
|
30
|
-
background-color: $bt-cl
|
|
31
|
-
color: #ffffff
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
// +ie-rgba(rgba(black, .4), white, background-color)
|
|
2
|
-
=ie-rgba($foreground, $backdrop: white, $property: "background-color")
|
|
3
|
-
@if $property == "background-color"
|
|
4
|
-
background-color: $foreground
|
|
5
|
-
@else
|
|
6
|
-
#{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))
|
|
7
|
-
// Browsers without color opacity
|
|
8
|
-
#{$property}: $foreground
|
|
9
|
-
// Decent browsers
|
|
10
|
-
#{$property}: mix(fade-in($foreground, 1), $backdrop, percentage(opacity($foreground)))\9
|
|
11
|
-
// IE8
|