twbs_sass_rails 0.1.0 → 0.2.0

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: b4ab951d2c05d424af00b83f3782ff795b81f499
4
- data.tar.gz: 62256265e159fb8349cf8ef245327d1635f98baa
3
+ metadata.gz: 767a8153221d4000e8191c8fc7b9acded3583a4c
4
+ data.tar.gz: 7d269cd07cf13856f845edb243ea5ae686994b3d
5
5
  SHA512:
6
- metadata.gz: d35e19e6213681f5ade6bcc7284689e1e89c5be9f290292f08554adb5663e40217e7dd0414a08ef21438e8bcb65e1b7e87bbc8bc8e28e8c1c3b17296800bc96f
7
- data.tar.gz: 6199124a1a168bffeee9da894010703b4b5474a4e862f0a9bf9e835d0d27b5b591d227d50046704b52c495894b00467e31f7f730c0f3322c2103106a939c39bd
6
+ metadata.gz: f46db5179ba8b71a9167778927ab60568bcdfa19cc675f120a3e58a8f67efac9e2108c37998bc374ad7eb1231c5ae3068d46e847c94f944998473569083ce582
7
+ data.tar.gz: c12d10737bd70272f30103e9804c6d9b97cc3d139518f94c8809d6aec5f9bfdce9bfe022c575057fab179a3b48a9ba42aa52499c0f833de058edb83293a60ef1
data/CHANGELOG.md CHANGED
@@ -1,6 +1,10 @@
1
1
  Changelog
2
2
  =========
3
3
 
4
+ 0.2.0
5
+ -----
6
+ * Bootstrap 3.0 @ [31dfc3218e](https://github.com/twbs/bootstrap/commit/31dfc3218e4aafca3a3963a632a22ee018362c00)
7
+
4
8
  0.1.0
5
9
  -----
6
10
  * Bootstrap 3.0 @ [73f10843a4](https://github.com/twbs/bootstrap/commit/73f10843a487ee94bed755ecfd7c853cb657bf38)
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- twbs_sass_rails (0.0.1)
4
+ twbs_sass_rails (0.1.0)
5
5
  less-rails
6
6
  rails (>= 3.2.14)
7
7
  therubyracer
@@ -45,7 +45,7 @@ GEM
45
45
  xpath (~> 2.0)
46
46
  colorize (0.5.8)
47
47
  columnize (0.3.6)
48
- commonjs (0.2.6)
48
+ commonjs (0.2.7)
49
49
  coveralls (0.6.7)
50
50
  colorize
51
51
  multi_json (~> 1.3)
@@ -61,16 +61,16 @@ GEM
61
61
  erubis (2.7.0)
62
62
  hike (1.2.3)
63
63
  i18n (0.6.5)
64
- less (2.3.2)
65
- commonjs (~> 0.2.6)
66
- less-rails (2.3.3)
64
+ less (2.4.0)
65
+ commonjs (~> 0.2.7)
66
+ less-rails (2.4.0)
67
67
  actionpack (>= 3.1)
68
- less (~> 2.3.1)
68
+ less (~> 2.4.0)
69
69
  libv8 (3.16.14.3)
70
70
  mail (2.5.4)
71
71
  mime-types (~> 1.16)
72
72
  treetop (~> 1.4.8)
73
- mime-types (1.24)
73
+ mime-types (1.25)
74
74
  mini_portile (0.5.1)
75
75
  minitest (4.7.5)
76
76
  multi_json (1.7.9)
@@ -1,3 +1,3 @@
1
1
  module TwbsSassRails
2
- VERSION = "0.1.0"
2
+ VERSION = "0.2.0"
3
3
  end
@@ -3,7 +3,7 @@ require 'test_helper'
3
3
  describe "twbs sass rails integration" do
4
4
  it "does not default to glyphicons" do
5
5
  visit '/assets/default-twbs.css'
6
- page.text.wont_include 'glyphicons'
6
+ page.text.wont_include 'Glyphicons Halflings'
7
7
  end
8
8
 
9
9
  it "provides bootstrap stylesheet on the asset pipeline" do
@@ -12,7 +12,7 @@
12
12
  > li {
13
13
  display: inline-block;
14
14
  &+li:before {
15
- content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
15
+ content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
16
16
  padding: 0 5px;
17
17
  color: @breadcrumb-color;
18
18
  }
@@ -17,6 +17,7 @@
17
17
  text-align: center;
18
18
  vertical-align: middle;
19
19
  cursor: pointer;
20
+ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
20
21
  border: 1px solid transparent;
21
22
  border-radius: @border-radius-base;
22
23
  white-space: nowrap;
@@ -186,13 +186,17 @@
186
186
  @media screen and (min-width: @screen-sm) {
187
187
 
188
188
  // Scale up the controls a smidge
189
- .carousel-control .icon-prev,
190
- .carousel-control .icon-next {
191
- width: 30px;
192
- height: 30px;
193
- margin-top: -15px;
194
- margin-left: -15px;
195
- font-size: 30px;
189
+ .carousel-control {
190
+ .glyphicons-chevron-left,
191
+ .glyphicons-chevron-right
192
+ .icon-prev,
193
+ .icon-next {
194
+ width: 30px;
195
+ height: 30px;
196
+ margin-top: -15px;
197
+ margin-left: -15px;
198
+ font-size: 30px;
199
+ }
196
200
  }
197
201
 
198
202
  // Show and left align the captions
@@ -133,6 +133,7 @@ output {
133
133
  color: @input-color;
134
134
  vertical-align: middle;
135
135
  background-color: @input-bg;
136
+ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
136
137
  border: 1px solid @input-border;
137
138
  border-radius: @input-border-radius;
138
139
  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -76,7 +76,7 @@
76
76
  // Grid classes for extra small devices like smartphones. No offset, push, or
77
77
  // pull classes are present here due to the size of the target.
78
78
  //
79
- // Note that `.col-xs-12` doesn't get floated on purposethere's no need since
79
+ // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
80
80
  // it's full-width.
81
81
 
82
82
  .col-xs-1,
@@ -111,12 +111,12 @@
111
111
  // Columns, offsets, pushes, and pulls for the small device range, from phones
112
112
  // to tablets.
113
113
  //
114
- // Note that `.col-sm-12` doesn't get floated on purposethere's no need since
114
+ // Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
115
115
  // it's full-width.
116
116
 
117
117
  @media (min-width: @screen-sm) {
118
118
  .container {
119
- max-width: @container-tablet;
119
+ width: @container-sm;
120
120
  }
121
121
 
122
122
  .col-sm-1,
@@ -189,12 +189,12 @@
189
189
  //
190
190
  // Columns, offsets, pushes, and pulls for the desktop device range.
191
191
  //
192
- // Note that `.col-md-12` doesn't get floated on purposethere's no need since
192
+ // Note that `.col-md-12` doesn't get floated on purpose--there's no need since
193
193
  // it's full-width.
194
194
 
195
195
  @media (min-width: @screen-md) {
196
196
  .container {
197
- max-width: @container-desktop;
197
+ width: @container-md;
198
198
  }
199
199
  .col-md-1,
200
200
  .col-md-2,
@@ -269,12 +269,12 @@
269
269
  //
270
270
  // Columns, offsets, pushes, and pulls for the large desktop device range.
271
271
  //
272
- // Note that `.col-lg-12` doesn't get floated on purposethere's no need since
272
+ // Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
273
273
  // it's full-width.
274
274
 
275
- @media (min-width: @screen-lg-desktop) {
275
+ @media (min-width: @screen-lg-min) {
276
276
  .container {
277
- max-width: @container-lg-desktop;
277
+ width: @container-lg;
278
278
  }
279
279
 
280
280
  .col-lg-1,
@@ -61,6 +61,7 @@
61
61
  font-size: @font-size-base;
62
62
  font-weight: normal;
63
63
  line-height: 1;
64
+ color: @input-color;
64
65
  text-align: center;
65
66
  background-color: @input-group-addon-bg;
66
67
  border: 1px solid @input-group-addon-border-color;
@@ -618,7 +618,7 @@
618
618
  }
619
619
  }
620
620
 
621
- // Generate the large column offsets
621
+ // Generate the medium column offsets
622
622
  .make-md-column-offset(@columns) {
623
623
  @media (min-width: @screen-md-min) {
624
624
  margin-left: percentage((@columns / @grid-columns));
@@ -51,12 +51,17 @@
51
51
  }
52
52
  }
53
53
 
54
- // Dividers (basically an hr) within the dropdown
54
+ // Nav dividers (deprecated with v3.0.1)
55
+ //
56
+ // This should have been removed in v3 with the dropping of `.nav-list`, but
57
+ // we missed it. We don't currently support this anywhere, but in the interest
58
+ // of maintaining backward compatibility in case you use it, it's deprecated.
55
59
  .nav-divider {
56
60
  .nav-divider();
57
61
  }
58
62
 
59
63
  // Prevent IE8 from misplacing imgs
64
+ //
60
65
  // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
61
66
  > li > a > img {
62
67
  max-width: none;
@@ -119,11 +119,6 @@
119
119
  border-bottom: 1px solid @panel-inner-border;
120
120
  }
121
121
  }
122
-
123
- // New subcomponent for wrapping collapsable content for proper animations
124
- .panel-collapse {
125
-
126
- }
127
122
  }
128
123
 
129
124
 
@@ -51,6 +51,7 @@
51
51
  width: 0%;
52
52
  height: 100%;
53
53
  font-size: @font-size-small;
54
+ line-height: @line-height-computed;
54
55
  color: @progress-bar-color;
55
56
  text-align: center;
56
57
  background-color: @progress-bar-bg;
@@ -37,17 +37,6 @@ textarea {
37
37
  line-height: inherit;
38
38
  }
39
39
 
40
- // Reset unusual Firefox-on-Android default style.
41
- //
42
- // See https://github.com/necolas/normalize.css/issues/214
43
-
44
- button,
45
- input,
46
- select[multiple],
47
- textarea {
48
- background-image: none;
49
- }
50
-
51
40
 
52
41
  // Links
53
42
 
@@ -18,9 +18,9 @@ th {
18
18
  width: 100%;
19
19
  margin-bottom: @line-height-computed;
20
20
  // Cells
21
- thead,
22
- tbody,
23
- tfoot {
21
+ > thead,
22
+ > tbody,
23
+ > tfoot {
24
24
  > tr {
25
25
  > th,
26
26
  > td {
@@ -32,22 +32,23 @@ th {
32
32
  }
33
33
  }
34
34
  // Bottom align for column headings
35
- thead > tr > th {
35
+ > thead > tr > th {
36
36
  vertical-align: bottom;
37
37
  border-bottom: 2px solid @table-border-color;
38
38
  }
39
39
  // Remove top border from thead by default
40
- caption + thead,
41
- colgroup + thead,
42
- thead:first-child {
43
- tr:first-child {
44
- th, td {
40
+ > caption + thead,
41
+ > colgroup + thead,
42
+ > thead:first-child {
43
+ > tr:first-child {
44
+ > th,
45
+ > td {
45
46
  border-top: 0;
46
47
  }
47
48
  }
48
49
  }
49
50
  // Account for multiple tbody instances
50
- tbody + tbody {
51
+ > tbody + tbody {
51
52
  border-top: 2px solid @table-border-color;
52
53
  }
53
54
 
@@ -61,9 +62,9 @@ th {
61
62
  // Condensed table w/ half padding
62
63
 
63
64
  .table-condensed {
64
- thead,
65
- tbody,
66
- tfoot {
65
+ > thead,
66
+ > tbody,
67
+ > tfoot {
67
68
  > tr {
68
69
  > th,
69
70
  > td {
@@ -84,12 +84,15 @@
84
84
  // --------------------------------------------------
85
85
 
86
86
  .dropdown-menu > li > a:hover,
87
- .dropdown-menu > li > a:focus,
87
+ .dropdown-menu > li > a:focus {
88
+ #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
89
+ background-color: darken(@dropdown-link-hover-bg, 5%);
90
+ }
88
91
  .dropdown-menu > .active > a,
89
92
  .dropdown-menu > .active > a:hover,
90
93
  .dropdown-menu > .active > a:focus {
91
- #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
92
- background-color: darken(@dropdown-link-hover-bg, 5%);
94
+ #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
95
+ background-color: darken(@dropdown-link-active-bg, 5%);
93
96
  }
94
97
 
95
98
 
@@ -15,7 +15,7 @@ p {
15
15
  font-weight: 200;
16
16
  line-height: 1.4;
17
17
 
18
- @media (min-width: 768px) {
18
+ @media (min-width: @screen-sm) {
19
19
  font-size: (@font-size-base * 1.5);
20
20
  }
21
21
  }
@@ -25,18 +25,46 @@ p {
25
25
  // -------------------------
26
26
 
27
27
  // Ex: 14px base font * 85% = about 12px
28
- small { font-size: 85%; }
28
+ small,
29
+ .small { font-size: 85%; }
29
30
 
30
31
  // Undo browser default styling
31
32
  cite { font-style: normal; }
32
33
 
33
34
  // Contextual emphasis
34
- .text-muted { color: @text-muted; }
35
- .text-primary { color: @brand-primary; }
36
- .text-warning { color: @state-warning-text; }
37
- .text-danger { color: @state-danger-text; }
38
- .text-success { color: @state-success-text; }
39
- .text-info { color: @state-info-text; }
35
+ .text-muted {
36
+ color: @text-muted;
37
+ }
38
+ .text-primary {
39
+ color: @brand-primary;
40
+ &:hover {
41
+ color: darken(@brand-primary, 10%);
42
+ }
43
+ }
44
+ .text-warning {
45
+ color: @state-warning-text;
46
+ &:hover {
47
+ color: darken(@state-warning-text, 10%);
48
+ }
49
+ }
50
+ .text-danger {
51
+ color: @state-danger-text;
52
+ &:hover {
53
+ color: darken(@state-danger-text, 10%);
54
+ }
55
+ }
56
+ .text-success {
57
+ color: @state-success-text;
58
+ &:hover {
59
+ color: darken(@state-success-text, 10%);
60
+ }
61
+ }
62
+ .text-info {
63
+ color: @state-info-text;
64
+ &:hover {
65
+ color: darken(@state-info-text, 10%);
66
+ }
67
+ }
40
68
 
41
69
  // Alignment
42
70
  .text-left { text-align: left; }
@@ -52,6 +80,7 @@ h1, h2, h3, h4, h5, h6,
52
80
  font-family: @headings-font-family;
53
81
  font-weight: @headings-font-weight;
54
82
  line-height: @headings-line-height;
83
+ color: @headings-color;
55
84
 
56
85
  small {
57
86
  font-weight: normal;
@@ -9,6 +9,9 @@
9
9
  .clearfix {
10
10
  .clearfix();
11
11
  }
12
+ .center-block {
13
+ .center-block();
14
+ }
12
15
  .pull-right {
13
16
  float: right !important;
14
17
  }
@@ -61,6 +61,8 @@
61
61
  @headings-font-family: @font-family-base;
62
62
  @headings-font-weight: 500;
63
63
  @headings-line-height: 1.1;
64
+ @headings-color: inherit;
65
+
64
66
 
65
67
  // Iconography
66
68
  // -------------------------
@@ -89,6 +91,7 @@
89
91
  @border-radius-large: 6px;
90
92
  @border-radius-small: 3px;
91
93
 
94
+ @component-active-color: #fff;
92
95
  @component-active-bg: @brand-primary;
93
96
 
94
97
  @caret-width-base: 4px;
@@ -172,12 +175,12 @@
172
175
  @dropdown-fallback-border: #ccc;
173
176
  @dropdown-divider-bg: #e5e5e5;
174
177
 
175
- @dropdown-link-active-color: #fff;
176
- @dropdown-link-active-bg: @component-active-bg;
177
-
178
178
  @dropdown-link-color: @gray-dark;
179
- @dropdown-link-hover-color: #fff;
180
- @dropdown-link-hover-bg: @dropdown-link-active-bg;
179
+ @dropdown-link-hover-color: darken(@gray-dark, 5%);
180
+ @dropdown-link-hover-bg: #f5f5f5;
181
+
182
+ @dropdown-link-active-color: @component-active-color;
183
+ @dropdown-link-active-bg: @component-active-bg;
181
184
 
182
185
  @dropdown-link-disabled-color: @gray-light;
183
186
 
@@ -271,7 +274,7 @@
271
274
 
272
275
  // Navbar brand label
273
276
  @navbar-default-brand-color: @navbar-default-link-color;
274
- @navbar-default-brand-hover-color: darken(@navbar-default-link-color, 10%);
277
+ @navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);
275
278
  @navbar-default-brand-hover-bg: transparent;
276
279
 
277
280
  // Navbar toggle
@@ -333,7 +336,7 @@
333
336
 
334
337
  // Pills
335
338
  @nav-pills-active-link-hover-bg: @component-active-bg;
336
- @nav-pills-active-link-hover-color: #fff;
339
+ @nav-pills-active-link-hover-color: @component-active-color;
337
340
 
338
341
 
339
342
  // Pagination
@@ -486,7 +489,7 @@
486
489
  @list-group-border-radius: @border-radius-base;
487
490
 
488
491
  @list-group-hover-bg: #f5f5f5;
489
- @list-group-active-color: #fff;
492
+ @list-group-active-color: @component-active-color;
490
493
  @list-group-active-bg: @component-active-bg;
491
494
  @list-group-active-border: @list-group-active-bg;
492
495
 
@@ -561,6 +564,7 @@
561
564
  @breadcrumb-bg: #f5f5f5;
562
565
  @breadcrumb-color: #ccc;
563
566
  @breadcrumb-active-color: @gray-light;
567
+ @breadcrumb-separator: "/";
564
568
 
565
569
 
566
570
  // Carousel
@@ -619,10 +623,13 @@
619
623
  // --------------------------------------------------
620
624
 
621
625
  // Small screen / tablet
622
- @container-tablet: ((720px + @grid-gutter-width));
626
+ @container-tablet: ((720px + @grid-gutter-width));
627
+ @container-sm: @container-tablet;
623
628
 
624
629
  // Medium screen / desktop
625
- @container-desktop: ((940px + @grid-gutter-width));
630
+ @container-desktop: ((940px + @grid-gutter-width));
631
+ @container-md: @container-desktop;
626
632
 
627
633
  // Large screen / wide desktop
628
- @container-lg-desktop: ((1140px + @grid-gutter-width));
634
+ @container-large-desktop: ((1140px + @grid-gutter-width));
635
+ @container-lg: @container-large-desktop;
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.1.0
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - diowa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-08-28 00:00:00.000000000 Z
11
+ date: 2013-09-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -178,7 +178,6 @@ files:
178
178
  - LICENSE
179
179
  - README.md
180
180
  - Rakefile
181
- - VERSION
182
181
  - app/assets/fonts/fontawesome-webfont.eot
183
182
  - app/assets/fonts/fontawesome-webfont.svg
184
183
  - app/assets/fonts/fontawesome-webfont.ttf
@@ -332,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
332
331
  version: '0'
333
332
  requirements: []
334
333
  rubyforge_project:
335
- rubygems_version: 2.0.3
334
+ rubygems_version: 2.0.6
336
335
  signing_key:
337
336
  specification_version: 4
338
337
  summary: Bootstrap Sass assets in a Rails application.
data/VERSION DELETED
@@ -1 +0,0 @@
1
- 0.1.0