twbs_sass_rails 0.9.2 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/README.md +1 -1
  4. data/app/assets/fonts/glyphicons-halflings-regular.svg +1 -1
  5. data/lib/twbs_sass_rails/version.rb +1 -1
  6. data/twbs_sass_rails.gemspec +6 -6
  7. data/vendor/assets/javascripts/twbs/bootstrap/affix.js +43 -23
  8. data/vendor/assets/javascripts/twbs/bootstrap/alert.js +6 -4
  9. data/vendor/assets/javascripts/twbs/bootstrap/button.js +16 -10
  10. data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +26 -10
  11. data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +69 -28
  12. data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +20 -10
  13. data/vendor/assets/javascripts/twbs/bootstrap/modal.js +22 -21
  14. data/vendor/assets/javascripts/twbs/bootstrap/popover.js +13 -7
  15. data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +12 -7
  16. data/vendor/assets/javascripts/twbs/bootstrap/tab.js +41 -16
  17. data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +60 -39
  18. data/vendor/assets/javascripts/twbs/bootstrap/transition.js +1 -1
  19. data/vendor/assets/stylesheets/twbs/bootstrap/_button-groups.scss +18 -11
  20. data/vendor/assets/stylesheets/twbs/bootstrap/_buttons.scss +8 -5
  21. data/vendor/assets/stylesheets/twbs/bootstrap/_carousel.scss +25 -1
  22. data/vendor/assets/stylesheets/twbs/bootstrap/_code.scss +1 -0
  23. data/vendor/assets/stylesheets/twbs/bootstrap/_component-animations.scss +5 -2
  24. data/vendor/assets/stylesheets/twbs/bootstrap/_dropdowns.scss +4 -6
  25. data/vendor/assets/stylesheets/twbs/bootstrap/_forms.scss +51 -28
  26. data/vendor/assets/stylesheets/twbs/bootstrap/_glyphicons.scss +2 -1
  27. data/vendor/assets/stylesheets/twbs/bootstrap/_grid.scss +4 -4
  28. data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +4 -4
  29. data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +1 -0
  30. data/vendor/assets/stylesheets/twbs/bootstrap/_media.scss +27 -36
  31. data/vendor/assets/stylesheets/twbs/bootstrap/_modals.scss +3 -4
  32. data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +35 -33
  33. data/vendor/assets/stylesheets/twbs/bootstrap/_navs.scss +5 -3
  34. data/vendor/assets/stylesheets/twbs/bootstrap/_normalize.scss +5 -3
  35. data/vendor/assets/stylesheets/twbs/bootstrap/_pager.scss +2 -3
  36. data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +1 -1
  37. data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +22 -4
  38. data/vendor/assets/stylesheets/twbs/bootstrap/_popovers.scss +5 -4
  39. data/vendor/assets/stylesheets/twbs/bootstrap/_print.scss +102 -96
  40. data/vendor/assets/stylesheets/twbs/bootstrap/_progress-bars.scss +2 -20
  41. data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-embed.scss +2 -1
  42. data/vendor/assets/stylesheets/twbs/bootstrap/_scaffolding.scss +3 -3
  43. data/vendor/assets/stylesheets/twbs/bootstrap/_tables.scss +11 -10
  44. data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +16 -14
  45. data/vendor/assets/stylesheets/twbs/bootstrap/_thumbnails.scss +2 -2
  46. data/vendor/assets/stylesheets/twbs/bootstrap/_type.scss +10 -16
  47. data/vendor/assets/stylesheets/twbs/bootstrap/_utilities.scss +3 -4
  48. data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +29 -19
  49. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_buttons.scss +2 -0
  50. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_forms.scss +5 -1
  51. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_grid.scss +2 -2
  52. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_hide-text.scss +1 -1
  53. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_image.scss +0 -1
  54. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_labels.scss +1 -1
  55. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_progress-bar.scss +1 -1
  56. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_vendor-prefixes.scss +6 -3
  57. metadata +24 -30
@@ -80,11 +80,6 @@ small,
80
80
  font-size: floor((100% * $font-size-small / $font-size-base));
81
81
  }
82
82
 
83
- // Undo browser default styling
84
- cite {
85
- font-style: normal;
86
- }
87
-
88
83
  mark,
89
84
  .mark {
90
85
  background-color: $state-warning-bg;
@@ -163,15 +158,20 @@ ol {
163
158
 
164
159
  // List options
165
160
 
166
- // Unstyled keeps list items block level, just removes default browser padding and list-style
167
- .list-unstyled {
161
+ // [converter] extracted from `.list-unstyled` for libsass compatibility
162
+ @mixin list-unstyled {
168
163
  padding-left: 0;
169
164
  list-style: none;
170
165
  }
166
+ // [converter] extracted as `@mixin list-unstyled` for libsass compatibility
167
+ .list-unstyled {
168
+ @include list-unstyled;
169
+ }
170
+
171
171
 
172
172
  // Inline turns list items into inline-block
173
173
  .list-inline {
174
- @extend .list-unstyled;
174
+ @include list-unstyled;
175
175
  margin-left: -5px;
176
176
 
177
177
  > li {
@@ -204,7 +204,7 @@ dd {
204
204
 
205
205
  .dl-horizontal {
206
206
  dd {
207
- @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
207
+ @include clearfix; // Clear the floated `dt` if an empty `dd` is present
208
208
  }
209
209
 
210
210
  @media (min-width: $grid-float-breakpoint) {
@@ -213,7 +213,7 @@ dd {
213
213
  width: ($dl-horizontal-offset - 20);
214
214
  clear: left;
215
215
  text-align: right;
216
- @include text-overflow();
216
+ @include text-overflow;
217
217
  }
218
218
  dd {
219
219
  margin-left: $dl-horizontal-offset;
@@ -290,12 +290,6 @@ blockquote.pull-right {
290
290
  }
291
291
  }
292
292
 
293
- // Quotes
294
- blockquote:before,
295
- blockquote:after {
296
- content: "";
297
- }
298
-
299
293
  // Addresses
300
294
  address {
301
295
  margin-bottom: $line-height-computed;
@@ -7,10 +7,10 @@
7
7
  // -------------------------
8
8
 
9
9
  .clearfix {
10
- @include clearfix();
10
+ @include clearfix;
11
11
  }
12
12
  .center-block {
13
- @include center-block();
13
+ @include center-block;
14
14
  }
15
15
  .pull-right {
16
16
  float: right !important;
@@ -34,7 +34,7 @@
34
34
  visibility: hidden;
35
35
  }
36
36
  .text-hide {
37
- @include text-hide();
37
+ @include text-hide;
38
38
  }
39
39
 
40
40
 
@@ -53,5 +53,4 @@
53
53
 
54
54
  .affix {
55
55
  position: fixed;
56
- @include translate3d(0, 0, 0);
57
56
  }
@@ -12,11 +12,12 @@ $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")
12
12
  //
13
13
  //## Gray and brand colors for use across Bootstrap.
14
14
 
15
- $gray-darker: lighten(#000, 13.5%) !default; // #222
16
- $gray-dark: lighten(#000, 20%) !default; // #333
17
- $gray: lighten(#000, 33.5%) !default; // #555
18
- $gray-light: lighten(#000, 46.7%) !default; // #777
19
- $gray-lighter: lighten(#000, 93.5%) !default; // #eee
15
+ $gray-base: #000 !default;
16
+ $gray-darker: lighten($gray-base, 13.5%) !default; // #222
17
+ $gray-dark: lighten($gray-base, 20%) !default; // #333
18
+ $gray: lighten($gray-base, 33.5%) !default; // #555
19
+ $gray-light: lighten($gray-base, 46.7%) !default; // #777
20
+ $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
20
21
 
21
22
  $brand-primary: #428bca !default;
22
23
  $brand-success: #5cb85c !default;
@@ -38,6 +39,8 @@ $text-color: $gray-dark !default;
38
39
  $link-color: $brand-primary !default;
39
40
  //** Link hover color set via `darken()` function.
40
41
  $link-hover-color: darken($link-color, 15%) !default;
42
+ //** Link hover decoration.
43
+ $link-hover-decoration: underline !default;
41
44
 
42
45
 
43
46
  //== Typography
@@ -189,13 +192,20 @@ $input-bg-disabled: $gray-lighter !default;
189
192
  $input-color: $gray !default;
190
193
  //** `<input>` border color
191
194
  $input-border: #ccc !default;
192
- //** `<input>` border radius
195
+
196
+ // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
197
+ //** Default `.form-control` border radius
193
198
  $input-border-radius: $border-radius-base !default;
199
+ //** Large `.form-control` border radius
200
+ $input-border-radius-large: $border-radius-large !default;
201
+ //** Small `.form-control` border radius
202
+ $input-border-radius-small: $border-radius-small !default;
203
+
194
204
  //** Border color for inputs on focus
195
205
  $input-border-focus: #66afe9 !default;
196
206
 
197
207
  //** Placeholder text color
198
- $input-color-placeholder: $gray-light !default;
208
+ $input-color-placeholder: #999 !default;
199
209
 
200
210
  //** Default `.form-control` height
201
211
  $input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
@@ -212,6 +222,9 @@ $input-group-addon-bg: $gray-lighter !default;
212
222
  //** Border color for textual input addons
213
223
  $input-group-addon-border-color: $input-border !default;
214
224
 
225
+ //** Disabled cursor for form controls and buttons.
226
+ $cursor-disabled: not-allowed !default;
227
+
215
228
 
216
229
  //== Dropdowns
217
230
  //
@@ -260,8 +273,7 @@ $zindex-dropdown: 1000 !default;
260
273
  $zindex-popover: 1060 !default;
261
274
  $zindex-tooltip: 1070 !default;
262
275
  $zindex-navbar-fixed: 1030 !default;
263
- $zindex-modal-background: 1040 !default;
264
- $zindex-modal: 1050 !default;
276
+ $zindex-modal: 1040 !default;
265
277
 
266
278
 
267
279
  //== Media queries breakpoints
@@ -323,17 +335,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
323
335
  //## Define the maximum width of `.container` for different screen sizes.
324
336
 
325
337
  // Small screen / tablet
326
- $container-tablet: ((720px + $grid-gutter-width)) !default;
338
+ $container-tablet: (720px + $grid-gutter-width) !default;
327
339
  //** For `$screen-sm-min` and up.
328
340
  $container-sm: $container-tablet !default;
329
341
 
330
342
  // Medium screen / desktop
331
- $container-desktop: ((940px + $grid-gutter-width)) !default;
343
+ $container-desktop: (940px + $grid-gutter-width) !default;
332
344
  //** For `$screen-md-min` and up.
333
345
  $container-md: $container-desktop !default;
334
346
 
335
347
  // Large screen / wide desktop
336
- $container-large-desktop: ((1140px + $grid-gutter-width)) !default;
348
+ $container-large-desktop: (1140px + $grid-gutter-width) !default;
337
349
  //** For `$screen-lg-min` and up.
338
350
  $container-lg: $container-large-desktop !default;
339
351
 
@@ -376,12 +388,12 @@ $navbar-default-toggle-border-color: #ddd !default;
376
388
 
377
389
  // Inverted navbar
378
390
  // Reset inverted navbar basics
379
- $navbar-inverse-color: $gray-light !default;
391
+ $navbar-inverse-color: lighten($gray-light, 15%) !default;
380
392
  $navbar-inverse-bg: #222 !default;
381
393
  $navbar-inverse-border: darken($navbar-inverse-bg, 10%) !default;
382
394
 
383
395
  // Inverted navbar links
384
- $navbar-inverse-link-color: $gray-light !default;
396
+ $navbar-inverse-link-color: lighten($gray-light, 15%) !default;
385
397
  $navbar-inverse-link-hover-color: #fff !default;
386
398
  $navbar-inverse-link-hover-bg: transparent !default;
387
399
  $navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default;
@@ -411,8 +423,6 @@ $nav-link-hover-bg: $gray-lighter !default;
411
423
  $nav-disabled-link-color: $gray-light !default;
412
424
  $nav-disabled-link-hover-color: $gray-light !default;
413
425
 
414
- $nav-open-link-hover-color: #fff !default;
415
-
416
426
  //== Tabs
417
427
  $nav-tabs-border-color: #ddd !default;
418
428
 
@@ -537,7 +547,7 @@ $popover-title-bg: darken($popover-bg, 3%) !default;
537
547
  //** Popover arrow width
538
548
  $popover-arrow-width: 10px !default;
539
549
  //** Popover arrow color
540
- $popover-arrow-color: #fff !default;
550
+ $popover-arrow-color: $popover-bg !default;
541
551
 
542
552
  //** Popover outer arrow width
543
553
  $popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
@@ -636,6 +646,8 @@ $alert-danger-border: $state-danger-border !default;
636
646
  $progress-bg: #f5f5f5 !default;
637
647
  //** Progress bar text color
638
648
  $progress-bar-color: #fff !default;
649
+ //** Variable for setting rounded corners on progress bar.
650
+ $progress-border-radius: $border-radius-base !default;
639
651
 
640
652
  //** Default progress bar color
641
653
  $progress-bar-bg: $brand-primary !default;
@@ -850,5 +862,3 @@ $page-header-border-color: $gray-lighter !default;
850
862
  $dl-horizontal-offset: $component-offset-horizontal !default;
851
863
  //** Horizontal line color.
852
864
  $hr-border: $gray-lighter !default;
853
-
854
-
@@ -10,6 +10,7 @@
10
10
 
11
11
  &:hover,
12
12
  &:focus,
13
+ &.focus,
13
14
  &:active,
14
15
  &.active,
15
16
  .open > &.dropdown-toggle {
@@ -28,6 +29,7 @@
28
29
  &,
29
30
  &:hover,
30
31
  &:focus,
32
+ &.focus,
31
33
  &:active,
32
34
  &.active {
33
35
  background-color: $background;
@@ -10,7 +10,11 @@
10
10
  .radio,
11
11
  .checkbox,
12
12
  .radio-inline,
13
- .checkbox-inline {
13
+ .checkbox-inline,
14
+ &.radio label,
15
+ &.checkbox label,
16
+ &.radio-inline label,
17
+ &.checkbox-inline label {
14
18
  color: $text-color;
15
19
  }
16
20
  // Set the border and box shadow on specific inputs to match
@@ -8,14 +8,14 @@
8
8
  margin-left: auto;
9
9
  padding-left: ($gutter / 2);
10
10
  padding-right: ($gutter / 2);
11
- @include clearfix();
11
+ @include clearfix;
12
12
  }
13
13
 
14
14
  // Creates a wrapper for a series of columns
15
15
  @mixin make-row($gutter: $grid-gutter-width) {
16
16
  margin-left: ($gutter / -2);
17
17
  margin-right: ($gutter / -2);
18
- @include clearfix();
18
+ @include clearfix;
19
19
  }
20
20
 
21
21
  // Generate the extra small columns
@@ -17,5 +17,5 @@
17
17
 
18
18
  // New mixin to use as of v3.0.1
19
19
  @mixin text-hide() {
20
- @include hide-text();
20
+ @include hide-text;
21
21
  }
@@ -8,7 +8,6 @@
8
8
  // Keep images from scaling beyond the width of their parents.
9
9
  @mixin img-responsive($display: block) {
10
10
  display: $display;
11
- width: 100% \9; // Force IE10 and below to size SVG images correctly
12
11
  max-width: 100%; // Part 1: Set a maximum relative to the parent
13
12
  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
14
13
  }
@@ -2,7 +2,7 @@
2
2
 
3
3
  @mixin label-variant($color) {
4
4
  background-color: $color;
5
-
5
+
6
6
  &[href] {
7
7
  &:hover,
8
8
  &:focus {
@@ -5,6 +5,6 @@
5
5
 
6
6
  // Deprecated parent class requirement as of v3.2.0
7
7
  .progress-striped & {
8
- @include gradient-striped();
8
+ @include gradient-striped;
9
9
  }
10
10
  }
@@ -99,9 +99,12 @@
99
99
 
100
100
  // Placeholder text
101
101
  @mixin placeholder($color: $input-color-placeholder) {
102
- &::-moz-placeholder { color: $color; // Firefox
103
- opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
104
- &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
102
+ // Firefox
103
+ &::-moz-placeholder {
104
+ color: $color;
105
+ opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
106
+ }
107
+ &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
105
108
  &::-webkit-input-placeholder { color: $color; } // Safari and Chrome
106
109
  }
107
110
 
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.9.2
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - diowa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-19 00:00:00.000000000 Z
11
+ date: 2014-10-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -48,92 +48,86 @@ dependencies:
48
48
  name: appraisal
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - "~>"
51
+ - - ">="
52
52
  - !ruby/object:Gem::Version
53
- version: '1'
53
+ version: '0'
54
54
  type: :development
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
- - - "~>"
58
+ - - ">="
59
59
  - !ruby/object:Gem::Version
60
- version: '1'
60
+ version: '0'
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: capybara
63
63
  requirement: !ruby/object:Gem::Requirement
64
64
  requirements:
65
- - - "~>"
65
+ - - ">="
66
66
  - !ruby/object:Gem::Version
67
- version: '2'
67
+ version: '0'
68
68
  type: :development
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
- - - "~>"
72
+ - - ">="
73
73
  - !ruby/object:Gem::Version
74
- version: '2'
74
+ version: '0'
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: coveralls
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
- - - "~>"
79
+ - - ">="
80
80
  - !ruby/object:Gem::Version
81
- version: '0.7'
81
+ version: '0'
82
82
  type: :development
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - "~>"
86
+ - - ">="
87
87
  - !ruby/object:Gem::Version
88
- version: '0.7'
88
+ version: '0'
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: minitest
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
93
  - - ">="
94
94
  - !ruby/object:Gem::Version
95
- version: '4'
96
- - - "<"
97
- - !ruby/object:Gem::Version
98
- version: '6'
95
+ version: '0'
99
96
  type: :development
100
97
  prerelease: false
101
98
  version_requirements: !ruby/object:Gem::Requirement
102
99
  requirements:
103
100
  - - ">="
104
101
  - !ruby/object:Gem::Version
105
- version: '4'
106
- - - "<"
107
- - !ruby/object:Gem::Version
108
- version: '6'
102
+ version: '0'
109
103
  - !ruby/object:Gem::Dependency
110
104
  name: rake
111
105
  requirement: !ruby/object:Gem::Requirement
112
106
  requirements:
113
- - - "~>"
107
+ - - ">="
114
108
  - !ruby/object:Gem::Version
115
- version: '10'
109
+ version: '0'
116
110
  type: :development
117
111
  prerelease: false
118
112
  version_requirements: !ruby/object:Gem::Requirement
119
113
  requirements:
120
- - - "~>"
114
+ - - ">="
121
115
  - !ruby/object:Gem::Version
122
- version: '10'
116
+ version: '0'
123
117
  - !ruby/object:Gem::Dependency
124
118
  name: simplecov
125
119
  requirement: !ruby/object:Gem::Requirement
126
120
  requirements:
127
- - - "~>"
121
+ - - ">="
128
122
  - !ruby/object:Gem::Version
129
- version: '0.9'
123
+ version: '0'
130
124
  type: :development
131
125
  prerelease: false
132
126
  version_requirements: !ruby/object:Gem::Requirement
133
127
  requirements:
134
- - - "~>"
128
+ - - ">="
135
129
  - !ruby/object:Gem::Version
136
- version: '0.9'
130
+ version: '0'
137
131
  description: Provides assets for Bootstrap and FontAwesome in your Rails application.
138
132
  email:
139
133
  - dev@diowa.com