middleman-oulu 0.6.30 → 0.6.32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/assets/stylesheets/modules/buttons/_button-base.sass +7 -2
  3. data/assets/stylesheets/modules/buttons/_buttons.sass +8 -5
  4. data/assets/stylesheets/modules/buttons/styles/_border.sass +0 -1
  5. data/assets/stylesheets/modules/buttons/styles/_flat-emboss.sass +0 -1
  6. data/assets/stylesheets/modules/buttons/styles/_normal.sass +0 -1
  7. data/assets/stylesheets/settings/variables/_default.sass +3 -0
  8. data/lib/middleman-oulu/version.rb +1 -1
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1b480da6570ec87960e7c4199214a0cefc539114
4
- data.tar.gz: 27d62e82b829df3642a760d0c133e209711a145e
3
+ metadata.gz: 979f279136b3c9189c2b07a385a4557d06162c7c
4
+ data.tar.gz: 84167a914cda46a5ca763a1e68a575a2112c312e
5
5
  SHA512:
6
- metadata.gz: 8eed4c685c84844a8b13b8db39ec6184d05d6882530e356ef141f34a1270d2426b5af9bfe8387e151dc955490d01dbbf980c3c464d7a7d5874a1e8feaf09f028
7
- data.tar.gz: 43e0c5ca94010185d947837193b3f5e2d8ca28cd85542f9ac43f81916037ec4f99df3997253cb2e95aef74e7b9589c9d8b9ed74ef866d8c5270f72cd6d31675e
6
+ metadata.gz: a9e5e35d17f88716ab96e7eaf14f8db403c9e8664e3ea477e5bee3e8d1ec4b18ad1eb1dcc323fe2d5c4301806a8c1c20d356351617397b96f098f36df1cad337
7
+ data.tar.gz: 30df0305ab95fc5bee4f143e018e4e82038ee815c50ac0e2b9b4ed0cbfab323b5009e7ce08a4b65b4fe8cc5fea0deb850a1c2e4559e33cebeda1f961322b124d
data/assets/stylesheets/modules/buttons/_button-base.sass CHANGED
@@ -8,7 +8,7 @@
8
8
  text-decoration: none
9
9
  -webkit-tap-highlight-color: transparent
10
10
 
11
- =button-size($size, $border-width: 0)
11
+ =button-size($size, $border-width: 0, $border-radius: 4px)
12
12
  $font-size: ""
13
13
  @if $size == 'xs'
14
14
  $font-size: 12px
@@ -21,10 +21,15 @@
21
21
  @else if $size == 'xl'
22
22
  $font-size: 20px
23
23
  $height: round($font-size * 2 + $font-size/2.2)
24
- +border(all, $border-width)
24
+ @if $border-width
25
+ +border(all, $border-width)
26
+ @else
27
+ $border-width: 0
25
28
  +text-block($font-size $height - ($border-width*2))
26
29
  +rem('height', $height)
27
30
  +padding(horizontal, $height/2)
31
+ @if $border-radius
32
+ +border-radius($border-radius)
28
33
  @if $font-size > 12px
29
34
  font-weight: bold
30
35
  i,
data/assets/stylesheets/modules/buttons/_buttons.sass CHANGED
@@ -1,6 +1,6 @@
1
1
  $button-sizes: xs, sm, md, lg, xl !default
2
2
  $button-color-names: default, primary, success, warning, danger !default
3
- $button-styles: normal, border, flat-emboss, material !default
3
+ $button-styles: normal, border, bold-border, flat-emboss, material !default
4
4
 
5
5
  @import button-base
6
6
 
@@ -21,16 +21,19 @@ input[type= submit]
21
21
  =button($style, $size, $color, $options: false)
22
22
  +button-base
23
23
  @if $style == normal
24
- +button-size($size, 1px)
24
+ +button-size($size, 1px, 4px)
25
25
  +normal-button($color)
26
26
  @else if $style == border
27
- +button-size($size, 1px)
27
+ +button-size($size, 1px, 4px)
28
+ +border-button($color)
29
+ @else if $style == bold-border
30
+ +button-size($size, 4px, 8px)
28
31
  +border-button($color)
29
32
  @else if $style == flat-emboss
30
- +button-size($size)
33
+ +button-size($size, false, 4px)
31
34
  +flat-emboss-button($color)
32
35
  @else if $style == material
33
- +button-size($size)
36
+ +button-size($size, false, false)
34
37
  +material-button($color)
35
38
  @each $option in $options
36
39
  @if $option == 'left'
data/assets/stylesheets/modules/buttons/styles/_border.sass CHANGED
@@ -1,6 +1,5 @@
1
1
  =border-button($color)
2
2
  +border(all, solid)
3
- +border-radius(4px)
4
3
  @if $color == $default
5
4
  $color: $text-color
6
5
  @else
data/assets/stylesheets/modules/buttons/styles/_flat-emboss.sass CHANGED
@@ -1,6 +1,5 @@
1
1
  =flat-emboss-button($color: blue)
2
2
  +transition(.5s (background-image))
3
- +border-radius(4px)
4
3
  background-color: $color
5
4
  color: luma_contrast_color($color)
6
5
  box-shadow: shade($color, 18%) 0 3px 0
data/assets/stylesheets/modules/buttons/styles/_normal.sass CHANGED
@@ -16,7 +16,6 @@
16
16
 
17
17
  =normal-button($color: blue)
18
18
  +transition(.5s (background-image))
19
- +border-radius(4px)
20
19
  @if $color == white
21
20
  +normal-button-color(#f2f2f2)
22
21
  @else
data/assets/stylesheets/settings/variables/_default.sass CHANGED
@@ -85,6 +85,9 @@ $facebook: #3b5998
85
85
  $hatena: #008FDE
86
86
  $pocket: #f23c53
87
87
 
88
+ $default-text: black !default
89
+ $reversal-text: white !default
90
+
88
91
  // luma contrast color
89
92
  $luma-contrast-bright-color: $default-text !global
90
93
  $luma-contrast-dark-color: $reversal-text !global
data/lib/middleman-oulu/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module Oulu
3
- VERSION = "0.6.30"
3
+ VERSION = "0.6.32"
4
4
  end
5
5
  end
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.30
4
+ version: 0.6.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-07-26 00:00:00.000000000 Z
11
+ date: 2015-07-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler