oulu-rails 0.5.34 → 0.5.37

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 462916f4098417ed3dd5637bbc333e3a0df724ff
4
- data.tar.gz: c801e1bd5acd696da30fe602e6eeb354abf74cb3
3
+ metadata.gz: 2ad074b951dbe92730dd2855d5eadc4ff5fee569
4
+ data.tar.gz: d888b3843a5b2fe5cd84e1405c2d8012414e86fd
5
5
  SHA512:
6
- metadata.gz: 60c8801ae502299f3cecf8fdb8cbfa50f02f4ee2dfc38db387e28093965d2a4c46ad748c115a4b8859ad3896a6d4c1a18c17f90e5090852cec200a1c13aeab59
7
- data.tar.gz: cc686051d5f054ce73f96ef0a3686a6b8b688456f455a150dc7b3cbd5f3fe44ada6b63a9587835a809f9b41e281dd9be6fb779f13bf664ae4c7ba498ba490d3c
6
+ metadata.gz: a8c28a7f8acadda48e63aeeeb4bbb2579de2f89a58c4f140bca5857c427d9cb1123c2770a9bd0a39394b420dbe3ee15b4b0a8c27fb921150002b7f181d7d7e78
7
+ data.tar.gz: 0ea81a8b5b50fb42a5e212feb40a6fc4e0715ba9862863b8286298a760dafca0f7d97e456864643f8b3495c475ddc9181832b89661740e913648de9206edf4c7
@@ -1,3 +1,3 @@
1
1
  module OuluRails
2
- VERSION = "0.5.34"
2
+ VERSION = "0.5.37"
3
3
  end
@@ -0,0 +1,12 @@
1
+ // ヒラギノ丸を使うときに使う
2
+ @import url(//fonts.googleapis.com/css?family=Varela+Round)
3
+ =varela-round($fw: 400, $ls: 0, $fs: null, $tx-rendering: true)
4
+ // $fw: フォントの太さ, $ls: 字間, $fs: フォントスタイル
5
+ font-family: 'Varela Round', sans-serif
6
+ font-weight: $fw
7
+ @if not $ls == 0
8
+ letter-spacing: $ls
9
+ @if (not $fs == null)
10
+ font-style: italic
11
+ @if $tx-rendering
12
+ text-rendering: optimizelegibility
@@ -10,6 +10,12 @@
10
10
  @if $text-rendering
11
11
  text-rendering: optimizelegibility
12
12
 
13
+ =maru-serif($text-rendering: true)
14
+ font-family: $basic-maru
15
+ *font-family: $basic-legacy-ie-sans-serif
16
+ @if $text-rendering
17
+ text-rendering: optimizelegibility
18
+
13
19
  =bold-ja($text-rendering: true)
14
20
  font-family: $basic-bold-sans-serif
15
21
  *font-family: $basic-legacy-ie-sans-serif
@@ -28,3 +28,12 @@
28
28
  +rem('line-height', $square-block-height)
29
29
  @else
30
30
  +rem('line-height', $square-block-size)
31
+
32
+ =over-flow($values)
33
+ $over-flow-x: optional_nth($values, 1)
34
+ $over-flow-y: optional_nth($values, 2)
35
+ @if equal_nth($values, 2)
36
+ over-flow-x: $over-flow-x
37
+ over-flow-y: $over-flow-y
38
+ @else
39
+ over-flow: $over-flow-x
@@ -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,7 +1,11 @@
1
1
  =block-link
2
2
  display: block
3
3
  text-decoration: none
4
-
4
+
5
+ =inline-block-link($value: false)
6
+ +inline-block($value)
7
+ text-decoration: none
8
+
5
9
  =hover-link-reverse($modifire-class: null)
6
10
  text-decoration: underline
7
11
  &:hover,
@@ -2,9 +2,9 @@
2
2
  // positions
3
3
  ////////////////
4
4
 
5
- $all: top right bottom left
6
- $horizontal: left right
7
- $vertical: top bottom
5
+ $all: top right bottom left !default
6
+ $horizontal: left right !default
7
+ $vertical: top bottom !default
8
8
 
9
9
  /////////////////
10
10
  // compass
@@ -66,7 +66,7 @@ $basic-sans-serif: "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans",
66
66
  $basic-legacy-ie-sans-serif: "MS Pゴシック", "Lucida Sans Unicode", sans-serif !default
67
67
  $basic-bold-sans-serif: "ヒラギノ角ゴ StdN", "Hiragino Kaku Gothic StdN", "メイリオ", Meiryo, Roboto, "Droid Sans", "游ゴシック", YuGothic, "ヒラギノ角ゴ ProN", "Hiragino Kaku Gothic ProN", "メイリオ", Meiryo, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif !default
68
68
  $basic-serif: "Times New Roman", "ヒラギノ明朝 ProN", "Hiragino Mincho ProN", "HGS明朝E", "游明朝", YuMincho, Meiryo, serif !default
69
- $basic-mono: Osaka-mono, "MS Gothic", monospace
70
-
69
+ $basic-mono: Osaka-mono, "MS Gothic", monospace !default
70
+ $basic-maru: "Varela Round", "Lucida Grande", "Lucida Sans Unicode", Roboto, "Droid Sans", "HG丸ゴシックM-PRO", "Hiragino Maru Gothic Pro", "游ゴシック", YuGothic, "メイリオ", Meiryo, "MS Pゴシック", Helvetica, Arial, Verdana, sans-serif !default
71
71
  $basic-fonts: $basic-sans-serif !default
72
72
  $basic-legacy-ie-fonts: $basic-legacy-ie-sans-serif !default
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.34
4
+ version: 0.5.37
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-02 00:00:00.000000000 Z
11
+ date: 2015-03-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass-rails
@@ -240,6 +240,7 @@ files:
240
240
  - vendor/assets/stylesheets/options/web-fonts/_tauri.sass
241
241
  - vendor/assets/stylesheets/options/web-fonts/_ubuntu-mono.sass
242
242
  - vendor/assets/stylesheets/options/web-fonts/_ubuntu.sass
243
+ - vendor/assets/stylesheets/options/web-fonts/_varela-round.sass
243
244
  - vendor/assets/stylesheets/options/web-fonts/_vt323.sass
244
245
  - vendor/assets/stylesheets/settings/functions/_animation.sass
245
246
  - vendor/assets/stylesheets/settings/functions/_background.sass