twbs_sass_rails 0.3.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b67434e4903f10c68e22e60d2c1b1e1d861ea028
4
- data.tar.gz: f98d03175a3d7fd647db2fcfd5a57c7f53563d61
3
+ metadata.gz: 861d87c1a9a25530f073ceeb6fae4803146ba4cc
4
+ data.tar.gz: 83616462648eb9ed792519b95c51cafb6bb653bd
5
5
  SHA512:
6
- metadata.gz: b95b458b1c781f4cd427076574b7038405ea129bd3f0fbfb92843194a634ace3f5f021e0827d4da7fd7f6e02dae17a9d28401f21ee43a6246c487e91f7150fee
7
- data.tar.gz: c4aefe9d014468b1294f7b103137928956f81258e26d5f9e07aee3b7dd63694587a0bef28949b16635043b7324cfdeb175cda825fb31cba453b42269edaa7f39
6
+ metadata.gz: c246850ea54d310c27b064a9a8c18bbcb74ead99cec3683937ed08324fcf0664ac649a9ff1ee028324becc0047ce47d4400f0ce4516da5096732a8a798d0603a
7
+ data.tar.gz: ecd42e9310d0b343b3517247e0ebe34fd40c3e7521f94a106d99f13c69f9dbb36d722b5326af8bfa68650af5b3161c5c482d5887eb5507b2b74fe11ccbeaefa8
data/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.4.2
4
+
5
+ * Fixed submodules
6
+
7
+ ## 0.4.1
8
+
9
+ * Fixed submodules
10
+
11
+ ## 0.4.0
12
+
13
+ * bootstrap-sass 3.1.0+2
14
+ * Respond.js 1.4.2 @ [3fde262748](https://github.com/scottjehl/Respond/commit/3fde2627484f8cb38e2bd4dbf2374cf41184b0f4)
15
+ * Updated readme
16
+
3
17
  ## 0.3.1
4
18
 
5
19
  * Fixed dependencies
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- twbs_sass_rails (0.3.1)
4
+ twbs_sass_rails (0.4.1)
5
5
  rails (>= 3.2.16)
6
6
  sass-rails (>= 3.2)
7
7
 
data/README.md CHANGED
@@ -103,12 +103,12 @@ Take a look at [the whole list of Javascript components](/vendor/assets/javascri
103
103
 
104
104
  To launch the tests against Rails 4, run from the root folder of the repository:
105
105
  ```bash
106
- BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.rails-4.0.x rake
106
+ BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.rails-4.0.x bundle exec rake
107
107
  ```
108
108
 
109
109
  For Rails 3.2 run instead:
110
110
  ```bash
111
- BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.rails-3.2.x rake
111
+ BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.rails-3.2.x bundle exec rake
112
112
  ```
113
113
 
114
114
 
@@ -1,3 +1,3 @@
1
1
  module TwbsSassRails
2
- VERSION = "0.3.1"
2
+ VERSION = "0.4.2"
3
3
  end
@@ -1,4 +1 @@
1
1
  require "twbs_sass_rails/engine"
2
-
3
- module TwbsSassRails
4
- end
@@ -154,10 +154,10 @@
154
154
  -ms-transform: rotate($degrees); // IE9 only
155
155
  transform: rotate($degrees);
156
156
  }
157
- @mixin scale($ratio, $ratio-y...) {
158
- -webkit-transform: scale($ratio, $ratio-y);
159
- -ms-transform: scale($ratio, $ratio-y); // IE9 only
160
- transform: scale($ratio, $ratio-y);
157
+ @mixin scale($scale-args...) {
158
+ -webkit-transform: scale($scale-args);
159
+ -ms-transform: scale($scale-args); // IE9 only
160
+ transform: scale($scale-args);
161
161
  }
162
162
  @mixin translate($x, $y) {
163
163
  -webkit-transform: translate($x, $y);
@@ -590,18 +590,24 @@
590
590
 
591
591
  // Contextual backgrounds
592
592
  // -------------------------
593
- @mixin bg-variant($color) {
594
- background-color: $color;
595
- a:hover {
593
+ // [converter] $parent hack
594
+ @mixin bg-variant($parent, $color) {
595
+ #{$parent} {
596
+ background-color: $color;
597
+ }
598
+ a#{$parent}:hover {
596
599
  background-color: darken($color, 10%);
597
600
  }
598
601
  }
599
602
 
600
603
  // Typography
601
604
  // -------------------------
602
- @mixin text-emphasis-variant($color) {
603
- color: $color;
604
- a:hover {
605
+ // [converter] $parent hack
606
+ @mixin text-emphasis-variant($parent, $color) {
607
+ #{$parent} {
608
+ color: $color;
609
+ }
610
+ a#{$parent}:hover {
605
611
  color: darken($color, 10%);
606
612
  }
607
613
  }
@@ -629,7 +635,9 @@
629
635
  // More easily include all the states for responsive-utilities.less.
630
636
  // [converter] $parent hack
631
637
  @mixin responsive-visibility($parent) {
632
- #{$parent} { display: block !important; }
638
+ #{$parent} {
639
+ display: block !important;
640
+ }
633
641
  table#{$parent} { display: table; }
634
642
  tr#{$parent} { display: table-row !important; }
635
643
  th#{$parent},
@@ -638,10 +646,9 @@
638
646
 
639
647
  // [converter] $parent hack
640
648
  @mixin responsive-invisibility($parent) {
641
- #{$parent},
642
- tr#{$parent},
643
- th#{$parent},
644
- td#{$parent} { display: none !important; }
649
+ #{$parent} {
650
+ display: none !important;
651
+ }
645
652
  }
646
653
 
647
654
 
@@ -914,11 +921,14 @@
914
921
 
915
922
  // [converter] $parent hack
916
923
  @mixin input-size($parent, $input-height, $padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
917
- #{$parent} { height: $input-height;
918
- padding: $padding-vertical $padding-horizontal;
919
- font-size: $font-size;
920
- line-height: $line-height;
921
- border-radius: $border-radius; }
924
+ #{$parent} {
925
+ height: $input-height;
926
+ padding: $padding-vertical $padding-horizontal;
927
+ font-size: $font-size;
928
+ line-height: $line-height;
929
+ border-radius: $border-radius;
930
+ }
931
+
922
932
  select#{$parent} {
923
933
  height: $input-height;
924
934
  line-height: $input-height;
@@ -121,7 +121,6 @@
121
121
 
122
122
  // Scale up the modal
123
123
  @media (min-width: $screen-sm-min) {
124
-
125
124
  // Automatically set modal's width for larger viewports
126
125
  .modal-dialog {
127
126
  width: $modal-md;
@@ -133,6 +132,8 @@
133
132
 
134
133
  // Modal sizes
135
134
  .modal-sm { width: $modal-sm; }
136
- .modal-lg { width: $modal-lg; }
135
+ }
137
136
 
137
+ @media (min-width: $screen-md-min) {
138
+ .modal-lg { width: $modal-lg; }
138
139
  }
@@ -155,7 +155,7 @@
155
155
  padding: $navbar-padding-vertical $navbar-padding-horizontal;
156
156
  font-size: $font-size-large;
157
157
  line-height: $line-height-computed;
158
- height: $line-height-computed;
158
+ height: $navbar-height;
159
159
 
160
160
  &:hover,
161
161
  &:focus {
@@ -48,7 +48,7 @@
48
48
  //
49
49
  // .arrow is outer, .arrow:after is inner
50
50
 
51
- .popover .arrow {
51
+ .popover > .arrow {
52
52
  &,
53
53
  &:after {
54
54
  position: absolute;
@@ -59,16 +59,16 @@
59
59
  border-style: solid;
60
60
  }
61
61
  }
62
- .popover .arrow {
62
+ .popover > .arrow {
63
63
  border-width: $popover-arrow-outer-width;
64
64
  }
65
- .popover .arrow:after {
65
+ .popover > .arrow:after {
66
66
  border-width: $popover-arrow-width;
67
67
  content: "";
68
68
  }
69
69
 
70
70
  .popover {
71
- &.top .arrow {
71
+ &.top > .arrow {
72
72
  left: 50%;
73
73
  margin-left: -$popover-arrow-outer-width;
74
74
  border-bottom-width: 0;
@@ -83,7 +83,7 @@
83
83
  border-top-color: $popover-arrow-color;
84
84
  }
85
85
  }
86
- &.right .arrow {
86
+ &.right > .arrow {
87
87
  top: 50%;
88
88
  left: -$popover-arrow-outer-width;
89
89
  margin-top: -$popover-arrow-outer-width;
@@ -98,7 +98,7 @@
98
98
  border-right-color: $popover-arrow-color;
99
99
  }
100
100
  }
101
- &.bottom .arrow {
101
+ &.bottom > .arrow {
102
102
  left: 50%;
103
103
  margin-left: -$popover-arrow-outer-width;
104
104
  border-top-width: 0;
@@ -114,7 +114,7 @@
114
114
  }
115
115
  }
116
116
 
117
- &.left .arrow {
117
+ &.left > .arrow {
118
118
  top: 50%;
119
119
  right: -$popover-arrow-outer-width;
120
120
  margin-top: -$popover-arrow-outer-width;
@@ -24,26 +24,20 @@
24
24
 
25
25
  // Visibility utilities
26
26
 
27
- @include responsive-invisibility('.visible-xs');
27
+ @include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
28
28
 
29
29
  @media (max-width: $screen-xs-max) {
30
30
  @include responsive-visibility('.visible-xs');
31
31
  }
32
32
 
33
- @include responsive-invisibility('.visible-sm');
34
-
35
33
  @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
36
34
  @include responsive-visibility('.visible-sm');
37
35
  }
38
36
 
39
- @include responsive-invisibility('.visible-md');
40
-
41
37
  @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
42
38
  @include responsive-visibility('.visible-md');
43
39
  }
44
40
 
45
- @include responsive-invisibility('.visible-lg');
46
-
47
41
  @media (min-width: $screen-lg-min) {
48
42
  @include responsive-visibility('.visible-lg');
49
43
  }
@@ -21,10 +21,7 @@
21
21
  margin-right: auto;
22
22
  }
23
23
 
24
- // Add a hover state for linked versions only
25
- a:hover,
26
- a:focus,
27
- // [converter] extracted a&.active to a.thumbnail.active
24
+ // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
28
25
 
29
26
  // Image captions
30
27
  .caption {
@@ -33,6 +30,9 @@
33
30
  }
34
31
  }
35
32
 
33
+ // Add a hover state for linked versions only
34
+ a.thumbnail:hover,
35
+ a.thumbnail:focus,
36
36
  a.thumbnail.active {
37
37
  border-color: $link-color;
38
38
  }
@@ -91,21 +91,16 @@ cite { font-style: normal; }
91
91
  .text-muted {
92
92
  color: $text-muted;
93
93
  }
94
- .text-primary {
95
- @include text-emphasis-variant($brand-primary);
96
- }
97
- .text-success {
98
- @include text-emphasis-variant($state-success-text);
99
- }
100
- .text-info {
101
- @include text-emphasis-variant($state-info-text);
102
- }
103
- .text-warning {
104
- @include text-emphasis-variant($state-warning-text);
105
- }
106
- .text-danger {
107
- @include text-emphasis-variant($state-danger-text);
108
- }
94
+
95
+ @include text-emphasis-variant('.text-primary', $brand-primary);
96
+
97
+ @include text-emphasis-variant('.text-success', $state-success-text);
98
+
99
+ @include text-emphasis-variant('.text-info', $state-info-text);
100
+
101
+ @include text-emphasis-variant('.text-warning', $state-warning-text);
102
+
103
+ @include text-emphasis-variant('.text-danger', $state-danger-text);
109
104
 
110
105
  // Contextual backgrounds
111
106
  // For now we'll leave these alongside the text classes until v4 when we can
@@ -114,20 +109,16 @@ cite { font-style: normal; }
114
109
  // Given the contrast here, this is the only class to have its color inverted
115
110
  // automatically.
116
111
  color: #fff;
117
- @include bg-variant($brand-primary);
118
- }
119
- .bg-success {
120
- @include bg-variant($state-success-bg);
121
- }
122
- .bg-info {
123
- @include bg-variant($state-info-bg);
124
- }
125
- .bg-warning {
126
- @include bg-variant($state-warning-bg);
127
- }
128
- .bg-danger {
129
- @include bg-variant($state-danger-bg);
130
112
  }
113
+ @include bg-variant('.bg-primary', $brand-primary);
114
+
115
+ @include bg-variant('.bg-success', $state-success-bg);
116
+
117
+ @include bg-variant('.bg-info', $state-info-bg);
118
+
119
+ @include bg-variant('.bg-warning', $state-warning-bg);
120
+
121
+ @include bg-variant('.bg-danger', $state-danger-bg);
131
122
 
132
123
 
133
124
  // Page header
@@ -78,7 +78,7 @@ $headings-color: inherit !default;
78
78
 
79
79
  $icon-font-path: "bootstrap/" !default;
80
80
  $icon-font-name: "glyphicons-halflings-regular" !default;
81
- $icon-font-svg-id: "glyphicons_halflingsregular" !default;
81
+ $icon-font-svg-id: "glyphicons_halflingsregular" !default;
82
82
 
83
83
  //== Components
84
84
  //
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twbs_sass_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - diowa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-31 00:00:00.000000000 Z
11
+ date: 2014-02-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
293
293
  version: '0'
294
294
  requirements: []
295
295
  rubyforge_project:
296
- rubygems_version: 2.2.1
296
+ rubygems_version: 2.2.0
297
297
  signing_key:
298
298
  specification_version: 4
299
299
  summary: Bootstrap and FontAwesome assets in Rails applications