oulu-rails 0.5.10 → 0.5.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/oulu-rails/version.rb +1 -1
- data/vendor/assets/stylesheets/_oulu-base.css.sass +0 -1
- data/vendor/assets/stylesheets/helper/_margin-padding.css.sass +30 -8
- data/vendor/assets/stylesheets/settings/mixins/_basic-font.css.sass +5 -0
- data/vendor/assets/stylesheets/settings/mixins/_rem.css.sass +9 -6
- data/vendor/assets/stylesheets/settings/mixins/_resets.css.sass +28 -2
- metadata +2 -3
- data/vendor/assets/stylesheets/settings/mixins/_clear-type.css.sass +0 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3cbe8227c8c6c3afecc31a02091f27e9772f8a2c
|
4
|
+
data.tar.gz: d665e2726ddac010c67e19f331be6d1e3d276903
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7b1e64c6922e39133b45bee025c409679dfb7fb40d6747ff4d1fff5087348c785524b64cd506376479b075703d013c47d7a868165aa128760afd23aafc14dc5a
|
7
|
+
data.tar.gz: ece677666d3d4de062d88182b8c2335138e33fe915c4288d48ae08a448f902f1471c8560a4f3ad0066e416c6f14c9b84406ce18f0bdf49e05e88802216ac3fb0
|
data/lib/oulu-rails/version.rb
CHANGED
@@ -1,16 +1,38 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
.is-
|
1
|
+
body
|
2
|
+
@for $i from 0 through 16
|
3
|
+
.is-margin-bottom-#{$i*4}
|
4
4
|
+rem('margin-bottom', #{$i*4}px)
|
5
|
+
.is-margin-top-#{$i*4}
|
6
|
+
+rem('margin-top', #{$i*4}px)
|
7
|
+
.is-margin-left-#{$i*4}
|
8
|
+
+rem('margin-left', #{$i*4}px)
|
9
|
+
.is-margin-right-#{$i*4}
|
10
|
+
+rem('margin-right', #{$i*4}px)
|
11
|
+
.is-margin-horizontal-#{$i*4}
|
12
|
+
+margin(horizontal, #{$i*4}px)
|
13
|
+
.is-padding-bottom-#{$i*4}
|
14
|
+
+rem('padding-bottom', #{$i*4}px)
|
15
|
+
.is-padding-top-#{$i*4}
|
16
|
+
+rem('padding-top', #{$i*4}px)
|
17
|
+
.is-padding-left-#{$i*4}
|
18
|
+
+rem('padding-left', #{$i*4}px)
|
19
|
+
.is-padding-right-#{$i*4}
|
20
|
+
+rem('padding-right', #{$i*4}px)
|
5
21
|
|
6
|
-
|
22
|
+
// will delete next ver
|
23
|
+
.is-mgb-#{$i*4}
|
24
|
+
+rem('margin-bottom', #{$i*4}px)
|
7
25
|
.is-mgt-#{$i*4}
|
8
26
|
+rem('margin-top', #{$i*4}px)
|
9
|
-
|
10
|
-
|
27
|
+
.is-mgl-#{$i*4}
|
28
|
+
+rem('margin-left', #{$i*4}px)
|
29
|
+
.is-mgr-#{$i*4}
|
30
|
+
+rem('margin-right', #{$i*4}px)
|
11
31
|
.is-pdb-#{$i*4}
|
12
32
|
+rem('padding-bottom', #{$i*4}px)
|
13
|
-
|
14
|
-
body
|
15
33
|
.is-pdt-#{$i*4}
|
16
34
|
+rem('padding-top', #{$i*4}px)
|
35
|
+
.is-pdl-#{$i*4}
|
36
|
+
+rem('padding-left', #{$i*4}px)
|
37
|
+
.is-pdr-#{$i*4}
|
38
|
+
+rem('padding-right', #{$i*4}px)
|
@@ -5,16 +5,16 @@
|
|
5
5
|
// original https://github.com/bitmanic/rem
|
6
6
|
// customize by machida
|
7
7
|
|
8
|
-
$baseline-px: 10px
|
8
|
+
$baseline-px: 10px !default
|
9
9
|
|
10
10
|
=base-font-size
|
11
11
|
font-size: $baseline-px
|
12
12
|
font-size: strip_unit($baseline-px / 10) * 1rem
|
13
13
|
|
14
14
|
=rem($property, $px-values, $important: null)
|
15
|
-
// 9px以下のfont-sizeを使う設定(IE8不可)
|
16
15
|
@if px($px-values) or list($px-values)
|
17
16
|
@if $property == "font-size" and $px-values < 10px
|
17
|
+
// 9px以下のfont-sizeを使う設定(IE8不可)
|
18
18
|
+base-font-size
|
19
19
|
+scale3d(strip_unit($px-values / strip_unit($baseline-px)), strip_unit($px-values/ strip_unit($baseline-px)), 1)
|
20
20
|
+transform-origin(0, 0)
|
@@ -36,11 +36,14 @@ $baseline-px: 10px
|
|
36
36
|
// Create an empty list that we can dump values into
|
37
37
|
$rem-values: ()
|
38
38
|
@each $value in $px-values
|
39
|
-
|
40
|
-
|
41
|
-
|
39
|
+
@if px($value)
|
40
|
+
// If the value is zero or not a number, return it
|
41
|
+
@if strip_unit($value) == 0 or type-of( $value ) != "number"
|
42
|
+
$rem-values: append($rem-values, $value)
|
43
|
+
@else
|
44
|
+
$rem-values: append($rem-values, $value / $baseline-rem)
|
42
45
|
@else
|
43
|
-
$rem-values: append($rem-values, $value
|
46
|
+
$rem-values: append($rem-values, $value)
|
44
47
|
// Return the property and its list of converted values
|
45
48
|
@if $important
|
46
49
|
#{$property}: $rem-values !important
|
@@ -1,16 +1,42 @@
|
|
1
1
|
=reset-margin($directions: all)
|
2
2
|
@if $directions == 'all'
|
3
3
|
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
|
4
10
|
@else
|
5
11
|
@each $direction in $directions
|
6
|
-
|
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
|
18
|
+
@else
|
19
|
+
margin-#{$direction}: 0
|
7
20
|
|
8
21
|
=reset-padding($directions: all)
|
9
22
|
@if $directions == 'all'
|
10
23
|
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
|
11
30
|
@else
|
12
31
|
@each $direction in $directions
|
13
|
-
|
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
|
38
|
+
@else
|
39
|
+
padding-#{$direction}: 0
|
14
40
|
|
15
41
|
=reset-text
|
16
42
|
margin: 0
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: oulu-rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- machida
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-11-
|
11
|
+
date: 2014-11-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sass-rails
|
@@ -362,7 +362,6 @@ files:
|
|
362
362
|
- vendor/assets/stylesheets/settings/mixins/_block.css.sass
|
363
363
|
- vendor/assets/stylesheets/settings/mixins/_border.css.sass
|
364
364
|
- vendor/assets/stylesheets/settings/mixins/_button-base.css.sass
|
365
|
-
- vendor/assets/stylesheets/settings/mixins/_clear-type.css.sass
|
366
365
|
- vendor/assets/stylesheets/settings/mixins/_color.css.sass
|
367
366
|
- vendor/assets/stylesheets/settings/mixins/_filters.css.sass
|
368
367
|
- vendor/assets/stylesheets/settings/mixins/_form.css.sass
|