twbs_sass_rails 6.0.0 → 7.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/README.md +1 -1
  4. data/lib/twbs_sass_rails/version.rb +1 -1
  5. data/vendor/assets/javascripts/twbs/bootstrap/affix.js +7 -5
  6. data/vendor/assets/javascripts/twbs/bootstrap/alert.js +6 -5
  7. data/vendor/assets/javascripts/twbs/bootstrap/button.js +4 -4
  8. data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +16 -7
  9. data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +6 -6
  10. data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +5 -5
  11. data/vendor/assets/javascripts/twbs/bootstrap/modal.js +43 -24
  12. data/vendor/assets/javascripts/twbs/bootstrap/popover.js +6 -6
  13. data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +4 -4
  14. data/vendor/assets/javascripts/twbs/bootstrap/tab.js +10 -10
  15. data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +6 -6
  16. data/vendor/assets/javascripts/twbs/bootstrap/transition.js +5 -5
  17. data/vendor/assets/javascripts/twbs/bootstrap.js +3 -3
  18. data/vendor/assets/stylesheets/fontawesome/_path.scss +7 -7
  19. data/vendor/assets/stylesheets/twbs/_bootstrap.scss +2 -2
  20. data/vendor/assets/stylesheets/twbs/bootstrap/_alerts.scss +3 -3
  21. data/vendor/assets/stylesheets/twbs/bootstrap/_badges.scss +3 -3
  22. data/vendor/assets/stylesheets/twbs/bootstrap/_breadcrumbs.scss +2 -2
  23. data/vendor/assets/stylesheets/twbs/bootstrap/_button-groups.scss +5 -5
  24. data/vendor/assets/stylesheets/twbs/bootstrap/_buttons.scss +4 -4
  25. data/vendor/assets/stylesheets/twbs/bootstrap/_carousel.scss +26 -25
  26. data/vendor/assets/stylesheets/twbs/bootstrap/_close.scss +1 -0
  27. data/vendor/assets/stylesheets/twbs/bootstrap/_code.scss +3 -3
  28. data/vendor/assets/stylesheets/twbs/bootstrap/_component-animations.scss +1 -0
  29. data/vendor/assets/stylesheets/twbs/bootstrap/_dropdowns.scss +20 -23
  30. data/vendor/assets/stylesheets/twbs/bootstrap/_forms.scss +47 -57
  31. data/vendor/assets/stylesheets/twbs/bootstrap/_glyphicons.scss +9 -9
  32. data/vendor/assets/stylesheets/twbs/bootstrap/_grid.scss +10 -0
  33. data/vendor/assets/stylesheets/twbs/bootstrap/_input-groups.scss +2 -2
  34. data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +5 -5
  35. data/vendor/assets/stylesheets/twbs/bootstrap/_labels.scss +1 -1
  36. data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +30 -32
  37. data/vendor/assets/stylesheets/twbs/bootstrap/_media.scss +1 -1
  38. data/vendor/assets/stylesheets/twbs/bootstrap/_modals.scss +6 -6
  39. data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +75 -81
  40. data/vendor/assets/stylesheets/twbs/bootstrap/_navs.scss +4 -4
  41. data/vendor/assets/stylesheets/twbs/bootstrap/_normalize.scss +5 -2
  42. data/vendor/assets/stylesheets/twbs/bootstrap/_pager.scss +2 -2
  43. data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +12 -15
  44. data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +4 -4
  45. data/vendor/assets/stylesheets/twbs/bootstrap/_popovers.scss +47 -52
  46. data/vendor/assets/stylesheets/twbs/bootstrap/_print.scss +90 -92
  47. data/vendor/assets/stylesheets/twbs/bootstrap/_progress-bars.scss +3 -3
  48. data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-embed.scss +2 -2
  49. data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-utilities.scss +3 -3
  50. data/vendor/assets/stylesheets/twbs/bootstrap/_scaffolding.scss +7 -7
  51. data/vendor/assets/stylesheets/twbs/bootstrap/_tables.scss +23 -23
  52. data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +21 -17
  53. data/vendor/assets/stylesheets/twbs/bootstrap/_thumbnails.scss +1 -1
  54. data/vendor/assets/stylesheets/twbs/bootstrap/_tooltip.scss +38 -27
  55. data/vendor/assets/stylesheets/twbs/bootstrap/_type.scss +10 -10
  56. data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +6 -6
  57. data/vendor/assets/stylesheets/twbs/bootstrap/_wells.scss +2 -2
  58. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_alerts.scss +2 -1
  59. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_border-radius.scss +4 -4
  60. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_buttons.scss +6 -10
  61. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_center-block.scss +1 -1
  62. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_clearfix.scss +1 -1
  63. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_forms.scss +4 -4
  64. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_gradients.scss +6 -8
  65. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_grid-framework.scss +1 -1
  66. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_grid.scss +7 -7
  67. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_image.scss +5 -10
  68. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_opacity.scss +2 -3
  69. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_reset-text.scss +4 -4
  70. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_resize.scss +1 -1
  71. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_responsive-visibility.scss +0 -4
  72. data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_vendor-prefixes.scss +1 -1
  73. metadata +8 -8
@@ -6,7 +6,7 @@
6
6
  display: inline;
7
7
  padding: .2em .6em .3em;
8
8
  font-size: 75%;
9
- font-weight: bold;
9
+ font-weight: 700;
10
10
  line-height: 1;
11
11
  color: $label-color;
12
12
  text-align: center;
@@ -9,8 +9,8 @@
9
9
 
10
10
  .list-group {
11
11
  // No need to set list-style: none; since .list-group-item is block level
12
- margin-bottom: 20px;
13
12
  padding-left: 0; // reset padding because ul and ol
13
+ margin-bottom: 20px;
14
14
  }
15
15
 
16
16
 
@@ -35,44 +35,14 @@
35
35
  margin-bottom: 0;
36
36
  @include border-bottom-radius($list-group-border-radius);
37
37
  }
38
- }
39
-
40
-
41
- // Interactive list items
42
- //
43
- // Use anchor or button elements instead of `li`s or `div`s to create interactive items.
44
- // Includes an extra `.active` modifier class for showing selected items.
45
-
46
- a.list-group-item,
47
- button.list-group-item {
48
- color: $list-group-link-color;
49
-
50
- .list-group-item-heading {
51
- color: $list-group-link-heading-color;
52
- }
53
-
54
- // Hover state
55
- &:hover,
56
- &:focus {
57
- text-decoration: none;
58
- color: $list-group-link-hover-color;
59
- background-color: $list-group-hover-bg;
60
- }
61
- }
62
-
63
- button.list-group-item {
64
- width: 100%;
65
- text-align: left;
66
- }
67
38
 
68
- .list-group-item {
69
39
  // Disabled state
70
40
  &.disabled,
71
41
  &.disabled:hover,
72
42
  &.disabled:focus {
73
- background-color: $list-group-disabled-bg;
74
43
  color: $list-group-disabled-color;
75
44
  cursor: $cursor-disabled;
45
+ background-color: $list-group-disabled-bg;
76
46
 
77
47
  // Force color to inherit for custom content
78
48
  .list-group-item-heading {
@@ -105,6 +75,34 @@ button.list-group-item {
105
75
  }
106
76
 
107
77
 
78
+ // Interactive list items
79
+ //
80
+ // Use anchor or button elements instead of `li`s or `div`s to create interactive items.
81
+ // Includes an extra `.active` modifier class for showing selected items.
82
+
83
+ a.list-group-item,
84
+ button.list-group-item {
85
+ color: $list-group-link-color;
86
+
87
+ .list-group-item-heading {
88
+ color: $list-group-link-heading-color;
89
+ }
90
+
91
+ // Hover state
92
+ &:hover,
93
+ &:focus {
94
+ color: $list-group-link-hover-color;
95
+ text-decoration: none;
96
+ background-color: $list-group-hover-bg;
97
+ }
98
+ }
99
+
100
+ button.list-group-item {
101
+ width: 100%;
102
+ text-align: left;
103
+ }
104
+
105
+
108
106
  // Contextual variants
109
107
  //
110
108
  // Add modifier classes to change text and background color on individual items.
@@ -9,8 +9,8 @@
9
9
 
10
10
  .media,
11
11
  .media-body {
12
- zoom: 1;
13
12
  overflow: hidden;
13
+ zoom: 1;
14
14
  }
15
15
 
16
16
  .media-body {
@@ -14,14 +14,14 @@
14
14
 
15
15
  // Container that the modal scrolls within
16
16
  .modal {
17
- display: none;
18
- overflow: hidden;
19
17
  position: fixed;
20
18
  top: 0;
21
19
  right: 0;
22
20
  bottom: 0;
23
21
  left: 0;
24
22
  z-index: $zindex-modal;
23
+ display: none;
24
+ overflow: hidden;
25
25
  -webkit-overflow-scrolling: touch;
26
26
 
27
27
  // Prevent Chrome on Windows from adding a focus outline. For details, see
@@ -51,11 +51,11 @@
51
51
  .modal-content {
52
52
  position: relative;
53
53
  background-color: $modal-content-bg;
54
+ background-clip: padding-box;
54
55
  border: 1px solid $modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
55
56
  border: 1px solid $modal-content-border-color;
56
57
  border-radius: $border-radius-large;
57
- @include box-shadow(0 3px 9px rgba(0,0,0,.5));
58
- background-clip: padding-box;
58
+ @include box-shadow(0 3px 9px rgba(0, 0, 0, .5));
59
59
  // Remove focus outline from opened modal
60
60
  outline: 0;
61
61
  }
@@ -108,8 +108,8 @@
108
108
 
109
109
  // Properly space out buttons
110
110
  .btn + .btn {
111
- margin-left: 5px;
112
111
  margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
112
+ margin-left: 5px;
113
113
  }
114
114
  // but override that for button groups
115
115
  .btn-group .btn + .btn {
@@ -138,7 +138,7 @@
138
138
  margin: 30px auto;
139
139
  }
140
140
  .modal-content {
141
- @include box-shadow(0 5px 15px rgba(0,0,0,.5));
141
+ @include box-shadow(0 5px 15px rgba(0, 0, 0, .5));
142
142
  }
143
143
 
144
144
  // Modal sizes
@@ -48,11 +48,11 @@
48
48
  // content for the user's viewport.
49
49
 
50
50
  .navbar-collapse {
51
- overflow-x: visible;
52
51
  padding-right: $navbar-padding-horizontal;
53
- padding-left: $navbar-padding-horizontal;
52
+ padding-left: $navbar-padding-horizontal;
53
+ overflow-x: visible;
54
54
  border-top: 1px solid transparent;
55
- box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
55
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
56
56
  @include clearfix;
57
57
  -webkit-overflow-scrolling: touch;
58
58
 
@@ -81,8 +81,8 @@
81
81
  .navbar-fixed-top &,
82
82
  .navbar-static-top &,
83
83
  .navbar-fixed-bottom & {
84
- padding-left: 0;
85
84
  padding-right: 0;
85
+ padding-left: 0;
86
86
  }
87
87
  }
88
88
  }
@@ -96,6 +96,27 @@
96
96
  max-height: 200px;
97
97
  }
98
98
  }
99
+
100
+ // Fix the top/bottom navbars when screen real estate supports it
101
+ position: fixed;
102
+ right: 0;
103
+ left: 0;
104
+ z-index: $zindex-navbar-fixed;
105
+
106
+ // Undo the rounded corners
107
+ @media (min-width: $grid-float-breakpoint) {
108
+ border-radius: 0;
109
+ }
110
+ }
111
+
112
+ .navbar-fixed-top {
113
+ top: 0;
114
+ border-width: 0 0 1px;
115
+ }
116
+ .navbar-fixed-bottom {
117
+ bottom: 0;
118
+ margin-bottom: 0; // override .navbar defaults
119
+ border-width: 1px 0 0;
99
120
  }
100
121
 
101
122
 
@@ -108,11 +129,11 @@
108
129
  > .navbar-header,
109
130
  > .navbar-collapse {
110
131
  margin-right: -$navbar-padding-horizontal;
111
- margin-left: -$navbar-padding-horizontal;
132
+ margin-left: -$navbar-padding-horizontal;
112
133
 
113
134
  @media (min-width: $grid-float-breakpoint) {
114
135
  margin-right: 0;
115
- margin-left: 0;
136
+ margin-left: 0;
116
137
  }
117
138
  }
118
139
  }
@@ -134,38 +155,15 @@
134
155
  }
135
156
  }
136
157
 
137
- // Fix the top/bottom navbars when screen real estate supports it
138
- .navbar-fixed-top,
139
- .navbar-fixed-bottom {
140
- position: fixed;
141
- right: 0;
142
- left: 0;
143
- z-index: $zindex-navbar-fixed;
144
-
145
- // Undo the rounded corners
146
- @media (min-width: $grid-float-breakpoint) {
147
- border-radius: 0;
148
- }
149
- }
150
- .navbar-fixed-top {
151
- top: 0;
152
- border-width: 0 0 1px;
153
- }
154
- .navbar-fixed-bottom {
155
- bottom: 0;
156
- margin-bottom: 0; // override .navbar defaults
157
- border-width: 1px 0 0;
158
- }
159
-
160
158
 
161
159
  // Brand/project name
162
160
 
163
161
  .navbar-brand {
164
162
  float: left;
163
+ height: $navbar-height;
165
164
  padding: $navbar-padding-vertical $navbar-padding-horizontal;
166
165
  font-size: $font-size-large;
167
166
  line-height: $line-height-computed;
168
- height: $navbar-height;
169
167
 
170
168
  &:hover,
171
169
  &:focus {
@@ -193,8 +191,8 @@
193
191
  .navbar-toggle {
194
192
  position: relative;
195
193
  float: right;
196
- margin-right: $navbar-padding-horizontal;
197
194
  padding: 9px 10px;
195
+ margin-right: $navbar-padding-horizontal;
198
196
  @include navbar-vertical-align(34px);
199
197
  background-color: transparent;
200
198
  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
@@ -233,7 +231,7 @@
233
231
  margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
234
232
 
235
233
  > li > a {
236
- padding-top: 10px;
234
+ padding-top: 10px;
237
235
  padding-bottom: 10px;
238
236
  line-height: $line-height-computed;
239
237
  }
@@ -270,7 +268,7 @@
270
268
  > li {
271
269
  float: left;
272
270
  > a {
273
- padding-top: $navbar-padding-vertical;
271
+ padding-top: $navbar-padding-vertical;
274
272
  padding-bottom: $navbar-padding-vertical;
275
273
  }
276
274
  }
@@ -284,12 +282,12 @@
284
282
  // our navbars.
285
283
 
286
284
  .navbar-form {
287
- margin-left: -$navbar-padding-horizontal;
288
- margin-right: -$navbar-padding-horizontal;
289
285
  padding: 10px $navbar-padding-horizontal;
286
+ margin-right: -$navbar-padding-horizontal;
287
+ margin-left: -$navbar-padding-horizontal;
290
288
  border-top: 1px solid transparent;
291
289
  border-bottom: 1px solid transparent;
292
- $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
290
+ $shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
293
291
  @include box-shadow($shadow);
294
292
 
295
293
  // Mixin behavior for optimum display
@@ -311,11 +309,11 @@
311
309
  // Undo 100% width for pull classes
312
310
  @media (min-width: $grid-float-breakpoint) {
313
311
  width: auto;
314
- border: 0;
315
- margin-left: 0;
316
- margin-right: 0;
317
312
  padding-top: 0;
318
313
  padding-bottom: 0;
314
+ margin-right: 0;
315
+ margin-left: 0;
316
+ border: 0;
319
317
  @include box-shadow(none);
320
318
  }
321
319
  }
@@ -361,8 +359,8 @@
361
359
 
362
360
  @media (min-width: $grid-float-breakpoint) {
363
361
  float: left;
364
- margin-left: $navbar-padding-horizontal;
365
362
  margin-right: $navbar-padding-horizontal;
363
+ margin-left: $navbar-padding-horizontal;
366
364
  }
367
365
  }
368
366
 
@@ -437,33 +435,15 @@
437
435
  background-color: $navbar-default-link-disabled-bg;
438
436
  }
439
437
  }
440
- }
441
-
442
- .navbar-toggle {
443
- border-color: $navbar-default-toggle-border-color;
444
- &:hover,
445
- &:focus {
446
- background-color: $navbar-default-toggle-hover-bg;
447
- }
448
- .icon-bar {
449
- background-color: $navbar-default-toggle-icon-bar-bg;
450
- }
451
- }
452
438
 
453
- .navbar-collapse,
454
- .navbar-form {
455
- border-color: $navbar-default-border;
456
- }
457
-
458
- // Dropdown menu items
459
- .navbar-nav {
439
+ // Dropdown menu items
460
440
  // Remove background color from open dropdown
461
441
  > .open > a {
462
442
  &,
463
443
  &:hover,
464
444
  &:focus {
465
- background-color: $navbar-default-link-active-bg;
466
445
  color: $navbar-default-link-active-color;
446
+ background-color: $navbar-default-link-active-bg;
467
447
  }
468
448
  }
469
449
 
@@ -498,6 +478,22 @@
498
478
  }
499
479
  }
500
480
 
481
+ .navbar-toggle {
482
+ border-color: $navbar-default-toggle-border-color;
483
+ &:hover,
484
+ &:focus {
485
+ background-color: $navbar-default-toggle-hover-bg;
486
+ }
487
+ .icon-bar {
488
+ background-color: $navbar-default-toggle-icon-bar-bg;
489
+ }
490
+ }
491
+
492
+ .navbar-collapse,
493
+ .navbar-form {
494
+ border-color: $navbar-default-border;
495
+ }
496
+
501
497
 
502
498
  // Links in navbars
503
499
  //
@@ -571,33 +567,14 @@
571
567
  background-color: $navbar-inverse-link-disabled-bg;
572
568
  }
573
569
  }
574
- }
575
-
576
- // Darken the responsive nav toggle
577
- .navbar-toggle {
578
- border-color: $navbar-inverse-toggle-border-color;
579
- &:hover,
580
- &:focus {
581
- background-color: $navbar-inverse-toggle-hover-bg;
582
- }
583
- .icon-bar {
584
- background-color: $navbar-inverse-toggle-icon-bar-bg;
585
- }
586
- }
587
570
 
588
- .navbar-collapse,
589
- .navbar-form {
590
- border-color: darken($navbar-inverse-bg, 7%);
591
- }
592
-
593
- // Dropdowns
594
- .navbar-nav {
571
+ // Dropdowns
595
572
  > .open > a {
596
573
  &,
597
574
  &:hover,
598
575
  &:focus {
599
- background-color: $navbar-inverse-link-active-bg;
600
576
  color: $navbar-inverse-link-active-color;
577
+ background-color: $navbar-inverse-link-active-bg;
601
578
  }
602
579
  }
603
580
 
@@ -638,6 +615,23 @@
638
615
  }
639
616
  }
640
617
 
618
+ // Darken the responsive nav toggle
619
+ .navbar-toggle {
620
+ border-color: $navbar-inverse-toggle-border-color;
621
+ &:hover,
622
+ &:focus {
623
+ background-color: $navbar-inverse-toggle-hover-bg;
624
+ }
625
+ .icon-bar {
626
+ background-color: $navbar-inverse-toggle-icon-bar-bg;
627
+ }
628
+ }
629
+
630
+ .navbar-collapse,
631
+ .navbar-form {
632
+ border-color: darken($navbar-inverse-bg, 7%);
633
+ }
634
+
641
635
  .navbar-link {
642
636
  color: $navbar-inverse-link-color;
643
637
  &:hover {
@@ -7,8 +7,8 @@
7
7
  // --------------------------------------------------
8
8
 
9
9
  .nav {
10
- margin-bottom: 0;
11
10
  padding-left: 0; // Override default ul/ol
11
+ margin-bottom: 0;
12
12
  list-style: none;
13
13
  @include clearfix;
14
14
 
@@ -35,8 +35,8 @@
35
35
  &:focus {
36
36
  color: $nav-disabled-link-hover-color;
37
37
  text-decoration: none;
38
- background-color: transparent;
39
38
  cursor: $cursor-disabled;
39
+ background-color: transparent;
40
40
  }
41
41
  }
42
42
  }
@@ -97,10 +97,10 @@
97
97
  &:hover,
98
98
  &:focus {
99
99
  color: $nav-tabs-active-link-hover-color;
100
+ cursor: default;
100
101
  background-color: $nav-tabs-active-link-hover-bg;
101
102
  border: 1px solid $nav-tabs-active-link-hover-border-color;
102
103
  border-bottom-color: transparent;
103
- cursor: default;
104
104
  }
105
105
  }
106
106
  }
@@ -163,8 +163,8 @@
163
163
  > li {
164
164
  float: none;
165
165
  > a {
166
- text-align: center;
167
166
  margin-bottom: 5px;
167
+ text-align: center;
168
168
  }
169
169
  }
170
170