twitter-bootswatch-rails 3.0.3.0 → 3.1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/twitter/bootstrap/affix.js +34 -23
  3. data/app/assets/javascripts/twitter/bootstrap/alert.js +5 -15
  4. data/app/assets/javascripts/twitter/bootstrap/button.js +21 -29
  5. data/app/assets/javascripts/twitter/bootstrap/carousel.js +16 -28
  6. data/app/assets/javascripts/twitter/bootstrap/collapse.js +7 -16
  7. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +19 -26
  8. data/app/assets/javascripts/twitter/bootstrap/modal.js +25 -28
  9. data/app/assets/javascripts/twitter/bootstrap/popover.js +14 -21
  10. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +16 -21
  11. data/app/assets/javascripts/twitter/bootstrap/tab.js +7 -17
  12. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +52 -39
  13. data/app/assets/javascripts/twitter/bootstrap/transition.js +11 -19
  14. data/lib/generators/bootswatch/install/templates/loader.js.tt +1 -1
  15. data/lib/generators/bootswatch/install/templates/mixins.less.tt +130 -49
  16. data/lib/generators/bootswatch/install/templates/variables.less.tt +346 -161
  17. data/lib/twitter/bootswatch/rails/version.rb +1 -1
  18. data/vendor/toolkit/twitter/bootstrap/badges.less +4 -0
  19. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +4 -1
  20. data/vendor/toolkit/twitter/bootstrap/button-groups.less +10 -11
  21. data/vendor/toolkit/twitter/bootstrap/buttons.less +8 -8
  22. data/vendor/toolkit/twitter/bootstrap/code.less +10 -0
  23. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +28 -2
  24. data/vendor/toolkit/twitter/bootstrap/forms.less +82 -38
  25. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +1 -5
  26. data/vendor/toolkit/twitter/bootstrap/grid.less +26 -5
  27. data/vendor/toolkit/twitter/bootstrap/input-groups.less +39 -18
  28. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +3 -5
  29. data/vendor/toolkit/twitter/bootstrap/list-group.less +25 -3
  30. data/vendor/toolkit/twitter/bootstrap/mixins.less +130 -49
  31. data/vendor/toolkit/twitter/bootstrap/modals.less +16 -7
  32. data/vendor/toolkit/twitter/bootstrap/navbar.less +24 -20
  33. data/vendor/toolkit/twitter/bootstrap/navs.less +2 -2
  34. data/vendor/toolkit/twitter/bootstrap/normalize.less +139 -122
  35. data/vendor/toolkit/twitter/bootstrap/pager.less +5 -5
  36. data/vendor/toolkit/twitter/bootstrap/pagination.less +6 -3
  37. data/vendor/toolkit/twitter/bootstrap/panels.less +64 -16
  38. data/vendor/toolkit/twitter/bootstrap/print.less +0 -4
  39. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +13 -129
  40. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +17 -2
  41. data/vendor/toolkit/twitter/bootstrap/tables.less +3 -1
  42. data/vendor/toolkit/twitter/bootstrap/theme.less +1 -1
  43. data/vendor/toolkit/twitter/bootstrap/tooltip.less +1 -1
  44. data/vendor/toolkit/twitter/bootstrap/type.less +78 -63
  45. data/vendor/toolkit/twitter/bootstrap/variables.less +346 -161
  46. data/vendor/toolkit/twitter/bootstrap/wells.less +1 -1
  47. metadata +2 -3
  48. data/lib/generators/bootswatch/import/import_generator.rb +0 -49
@@ -8,22 +8,22 @@
8
8
  margin: @line-height-computed 0;
9
9
  list-style: none;
10
10
  text-align: center;
11
- .clearfix();
11
+ &:extend(.clearfix all);
12
12
  li {
13
13
  display: inline;
14
14
  > a,
15
15
  > span {
16
16
  display: inline-block;
17
17
  padding: 5px 14px;
18
- background-color: @pagination-bg;
19
- border: 1px solid @pagination-border;
18
+ background-color: @pager-bg;
19
+ border: 1px solid @pager-border;
20
20
  border-radius: @pager-border-radius;
21
21
  }
22
22
 
23
23
  > a:hover,
24
24
  > a:focus {
25
25
  text-decoration: none;
26
- background-color: @pagination-hover-bg;
26
+ background-color: @pager-hover-bg;
27
27
  }
28
28
  }
29
29
 
@@ -47,7 +47,7 @@
47
47
  > a:focus,
48
48
  > span {
49
49
  color: @pager-disabled-color;
50
- background-color: @pagination-bg;
50
+ background-color: @pager-bg;
51
51
  cursor: not-allowed;
52
52
  }
53
53
  }
@@ -16,6 +16,7 @@
16
16
  padding: @padding-base-vertical @padding-base-horizontal;
17
17
  line-height: @line-height-base;
18
18
  text-decoration: none;
19
+ color: @pagination-color;
19
20
  background-color: @pagination-bg;
20
21
  border: 1px solid @pagination-border;
21
22
  margin-left: -1px;
@@ -39,7 +40,9 @@
39
40
  > li > span {
40
41
  &:hover,
41
42
  &:focus {
43
+ color: @pagination-hover-color;
42
44
  background-color: @pagination-hover-bg;
45
+ border-color: @pagination-hover-border;
43
46
  }
44
47
  }
45
48
 
@@ -51,7 +54,7 @@
51
54
  z-index: 2;
52
55
  color: @pagination-active-color;
53
56
  background-color: @pagination-active-bg;
54
- border-color: @pagination-active-bg;
57
+ border-color: @pagination-active-border;
55
58
  cursor: default;
56
59
  }
57
60
  }
@@ -64,8 +67,8 @@
64
67
  > a:hover,
65
68
  > a:focus {
66
69
  color: @pagination-disabled-color;
67
- background-color: @pagination-bg;
68
- border-color: @pagination-border;
70
+ background-color: @pagination-disabled-bg;
71
+ border-color: @pagination-disabled-border;
69
72
  cursor: not-allowed;
70
73
  }
71
74
  }
@@ -14,8 +14,8 @@
14
14
 
15
15
  // Panel contents
16
16
  .panel-body {
17
- padding: 15px;
18
- .clearfix();
17
+ padding: @panel-body-padding;
18
+ &:extend(.clearfix all);
19
19
  }
20
20
 
21
21
 
@@ -27,19 +27,28 @@
27
27
  .panel {
28
28
  > .list-group {
29
29
  margin-bottom: 0;
30
-
31
30
  .list-group-item {
32
31
  border-width: 1px 0;
33
-
34
- // Remove border radius for top one
32
+ border-radius: 0;
35
33
  &:first-child {
36
- .border-top-radius(0);
34
+ border-top: 0;
37
35
  }
38
- // But keep it for the last one
39
36
  &:last-child {
40
37
  border-bottom: 0;
41
38
  }
42
39
  }
40
+ // Add border top radius for first one
41
+ &:first-child {
42
+ .list-group-item:first-child {
43
+ .border-top-radius((@panel-border-radius - 1));
44
+ }
45
+ }
46
+ // Add border bottom radius for last one
47
+ &:last-child {
48
+ .list-group-item:last-child {
49
+ .border-bottom-radius((@panel-border-radius - 1));
50
+ }
51
+ }
43
52
  }
44
53
  }
45
54
  // Collapse space between when there's no additional content.
@@ -60,12 +69,46 @@
60
69
  > .table-responsive > .table {
61
70
  margin-bottom: 0;
62
71
  }
72
+ // Add border top radius for first one
73
+ > .table:first-child,
74
+ > .table-responsive:first-child > .table:first-child {
75
+ > thead:first-child,
76
+ > tbody:first-child {
77
+ > tr:first-child {
78
+ td:first-child,
79
+ th:first-child {
80
+ border-top-left-radius: (@panel-border-radius - 1);
81
+ }
82
+ td:last-child,
83
+ th:last-child {
84
+ border-top-right-radius: (@panel-border-radius - 1);
85
+ }
86
+ }
87
+ }
88
+ }
89
+ // Add border bottom radius for last one
90
+ > .table:last-child,
91
+ > .table-responsive:last-child > .table:last-child {
92
+ > tbody:last-child,
93
+ > tfoot:last-child {
94
+ > tr:last-child {
95
+ td:first-child,
96
+ th:first-child {
97
+ border-bottom-left-radius: (@panel-border-radius - 1);
98
+ }
99
+ td:last-child,
100
+ th:last-child {
101
+ border-bottom-right-radius: (@panel-border-radius - 1);
102
+ }
103
+ }
104
+ }
105
+ }
63
106
  > .panel-body + .table,
64
107
  > .panel-body + .table-responsive {
65
108
  border-top: 1px solid @table-border-color;
66
109
  }
67
- > .table > tbody:first-child th,
68
- > .table > tbody:first-child td {
110
+ > .table > tbody:first-child > tr:first-child th,
111
+ > .table > tbody:first-child > tr:first-child td {
69
112
  border-top: 0;
70
113
  }
71
114
  > .table-bordered,
@@ -83,7 +126,10 @@
83
126
  > td:last-child {
84
127
  border-right: 0;
85
128
  }
86
-
129
+ &:first-child > th,
130
+ &:first-child > td {
131
+ border-top: 0;
132
+ }
87
133
  &:last-child > th,
88
134
  &:last-child > td {
89
135
  border-bottom: 0;
@@ -102,14 +148,14 @@
102
148
  .panel-heading {
103
149
  padding: 10px 15px;
104
150
  border-bottom: 1px solid transparent;
105
- .border-top-radius(@panel-border-radius - 1);
151
+ .border-top-radius((@panel-border-radius - 1));
106
152
 
107
153
  > .dropdown .dropdown-toggle {
108
154
  color: inherit;
109
155
  }
110
156
  }
111
157
 
112
- // Within heading, strip any `h*` tag of it's default margins for spacing.
158
+ // Within heading, strip any `h*` tag of its default margins for spacing.
113
159
  .panel-title {
114
160
  margin-top: 0;
115
161
  margin-bottom: 0;
@@ -126,7 +172,7 @@
126
172
  padding: 10px 15px;
127
173
  background-color: @panel-footer-bg;
128
174
  border-top: 1px solid @panel-inner-border;
129
- .border-bottom-radius(@panel-border-radius - 1);
175
+ .border-bottom-radius((@panel-border-radius - 1));
130
176
  }
131
177
 
132
178
 
@@ -136,6 +182,8 @@
136
182
  // the help of our collapse JavaScript plugin.
137
183
 
138
184
  .panel-group {
185
+ margin-bottom: @line-height-computed;
186
+
139
187
  // Tighten up margin so it's only between panels
140
188
  .panel {
141
189
  margin-bottom: 0;
@@ -171,12 +219,12 @@
171
219
  .panel-success {
172
220
  .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);
173
221
  }
222
+ .panel-info {
223
+ .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
224
+ }
174
225
  .panel-warning {
175
226
  .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);
176
227
  }
177
228
  .panel-danger {
178
229
  .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);
179
230
  }
180
- .panel-info {
181
- .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
182
- }
@@ -50,10 +50,6 @@
50
50
  max-width: 100% !important;
51
51
  }
52
52
 
53
- @page {
54
- margin: 2cm .5cm;
55
- }
56
-
57
53
  p,
58
54
  h2,
59
55
  h3 {
@@ -23,187 +23,71 @@
23
23
 
24
24
 
25
25
  // Visibility utilities
26
-
27
26
  .visible-xs {
28
27
  .responsive-invisibility();
28
+
29
29
  @media (max-width: @screen-xs-max) {
30
30
  .responsive-visibility();
31
31
  }
32
- &.visible-sm {
33
- @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
34
- .responsive-visibility();
35
- }
36
- }
37
- &.visible-md {
38
- @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
39
- .responsive-visibility();
40
- }
41
- }
42
- &.visible-lg {
43
- @media (min-width: @screen-lg-min) {
44
- .responsive-visibility();
45
- }
46
- }
47
32
  }
48
33
  .visible-sm {
49
34
  .responsive-invisibility();
50
- &.visible-xs {
51
- @media (max-width: @screen-xs-max) {
52
- .responsive-visibility();
53
- }
54
- }
35
+
55
36
  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
56
37
  .responsive-visibility();
57
38
  }
58
- &.visible-md {
59
- @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
60
- .responsive-visibility();
61
- }
62
- }
63
- &.visible-lg {
64
- @media (min-width: @screen-lg-min) {
65
- .responsive-visibility();
66
- }
67
- }
68
39
  }
69
40
  .visible-md {
70
41
  .responsive-invisibility();
71
- &.visible-xs {
72
- @media (max-width: @screen-xs-max) {
73
- .responsive-visibility();
74
- }
75
- }
76
- &.visible-sm {
77
- @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
78
- .responsive-visibility();
79
- }
80
- }
42
+
81
43
  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
82
44
  .responsive-visibility();
83
45
  }
84
- &.visible-lg {
85
- @media (min-width: @screen-lg-min) {
86
- .responsive-visibility();
87
- }
88
- }
89
46
  }
90
47
  .visible-lg {
91
48
  .responsive-invisibility();
92
- &.visible-xs {
93
- @media (max-width: @screen-xs-max) {
94
- .responsive-visibility();
95
- }
96
- }
97
- &.visible-sm {
98
- @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
99
- .responsive-visibility();
100
- }
101
- }
102
- &.visible-md {
103
- @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
104
- .responsive-visibility();
105
- }
106
- }
49
+
107
50
  @media (min-width: @screen-lg-min) {
108
51
  .responsive-visibility();
109
52
  }
110
53
  }
111
54
 
112
55
  .hidden-xs {
113
- .responsive-visibility();
114
56
  @media (max-width: @screen-xs-max) {
115
57
  .responsive-invisibility();
116
58
  }
117
- &.hidden-sm {
118
- @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
119
- .responsive-invisibility();
120
- }
121
- }
122
- &.hidden-md {
123
- @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
124
- .responsive-invisibility();
125
- }
126
- }
127
- &.hidden-lg {
128
- @media (min-width: @screen-lg-min) {
129
- .responsive-invisibility();
130
- }
131
- }
132
59
  }
133
60
  .hidden-sm {
134
- .responsive-visibility();
135
- &.hidden-xs {
136
- @media (max-width: @screen-xs-max) {
137
- .responsive-invisibility();
138
- }
139
- }
140
61
  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
141
62
  .responsive-invisibility();
142
63
  }
143
- &.hidden-md {
144
- @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
145
- .responsive-invisibility();
146
- }
147
- }
148
- &.hidden-lg {
149
- @media (min-width: @screen-lg-min) {
150
- .responsive-invisibility();
151
- }
152
- }
153
64
  }
154
65
  .hidden-md {
155
- .responsive-visibility();
156
- &.hidden-xs {
157
- @media (max-width: @screen-xs-max) {
158
- .responsive-invisibility();
159
- }
160
- }
161
- &.hidden-sm {
162
- @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
163
- .responsive-invisibility();
164
- }
165
- }
166
66
  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
167
67
  .responsive-invisibility();
168
68
  }
169
- &.hidden-lg {
170
- @media (min-width: @screen-lg-min) {
171
- .responsive-invisibility();
172
- }
173
- }
174
69
  }
175
70
  .hidden-lg {
176
- .responsive-visibility();
177
- &.hidden-xs {
178
- @media (max-width: @screen-xs-max) {
179
- .responsive-invisibility();
180
- }
181
- }
182
- &.hidden-sm {
183
- @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
184
- .responsive-invisibility();
185
- }
186
- }
187
- &.hidden-md {
188
- @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
189
- .responsive-invisibility();
190
- }
191
- }
192
71
  @media (min-width: @screen-lg-min) {
193
72
  .responsive-invisibility();
194
73
  }
195
74
  }
196
75
 
76
+
197
77
  // Print utilities
78
+ //
79
+ // Media queries are placed on the inside to be mixin-friendly.
80
+
198
81
  .visible-print {
199
82
  .responsive-invisibility();
200
- }
201
83
 
202
- @media print {
203
- .visible-print {
84
+ @media print {
204
85
  .responsive-visibility();
205
86
  }
206
- .hidden-print {
87
+ }
88
+
89
+ .hidden-print {
90
+ @media print {
207
91
  .responsive-invisibility();
208
92
  }
209
93
  }
@@ -4,8 +4,13 @@
4
4
 
5
5
 
6
6
  // Reset the box-sizing
7
-
8
- *,
7
+ //
8
+ // Heads up! This reset may cause conflicts with some third-party widgets.
9
+ // For recommendations on resolving such conflicts, see
10
+ // http://getbootstrap.com/getting-started/#third-box-sizing
11
+ * {
12
+ .box-sizing(border-box);
13
+ }
9
14
  *:before,
10
15
  *:after {
11
16
  .box-sizing(border-box);
@@ -56,6 +61,16 @@ a {
56
61
  }
57
62
 
58
63
 
64
+ // Figures
65
+ //
66
+ // We reset this here because previously Normalize had no `figure` margins. This
67
+ // ensures we don't break anyone's use of the element.
68
+
69
+ figure {
70
+ margin: 0;
71
+ }
72
+
73
+
59
74
  // Images
60
75
 
61
76
  img {