anjlab-bootstrap-rails 2.0.1.1 → 2.0.2.0

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.
Files changed (42) hide show
  1. data/README.md +2 -1
  2. data/lib/bootstrap-rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  4. data/vendor/assets/javascripts/bootstrap-button.js +1 -1
  5. data/vendor/assets/javascripts/bootstrap-carousel.js +7 -3
  6. data/vendor/assets/javascripts/bootstrap-collapse.js +4 -2
  7. data/vendor/assets/javascripts/bootstrap-dropdown.js +1 -1
  8. data/vendor/assets/javascripts/bootstrap-modal.js +1 -1
  9. data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
  10. data/vendor/assets/javascripts/bootstrap-scrollspy.js +1 -1
  11. data/vendor/assets/javascripts/bootstrap-tab.js +1 -1
  12. data/vendor/assets/javascripts/bootstrap-tooltip.js +2 -2
  13. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  14. data/vendor/assets/javascripts/bootstrap-typeahead.js +7 -7
  15. data/vendor/assets/stylesheets/alerts.scss +2 -14
  16. data/vendor/assets/stylesheets/badges.scss +36 -0
  17. data/vendor/assets/stylesheets/bootstrap.scss +2 -1
  18. data/vendor/assets/stylesheets/breadcrumbs.scss +2 -0
  19. data/vendor/assets/stylesheets/button-groups.scss +31 -7
  20. data/vendor/assets/stylesheets/buttons.scss +17 -13
  21. data/vendor/assets/stylesheets/code.scss +2 -2
  22. data/vendor/assets/stylesheets/component-animations.scss +3 -1
  23. data/vendor/assets/stylesheets/dropdowns.scss +45 -27
  24. data/vendor/assets/stylesheets/forms.scss +75 -42
  25. data/vendor/assets/stylesheets/grid.scss +2 -5
  26. data/vendor/assets/stylesheets/hero-unit.scss +3 -1
  27. data/vendor/assets/stylesheets/labels.scss +8 -2
  28. data/vendor/assets/stylesheets/mixins.scss +174 -135
  29. data/vendor/assets/stylesheets/modals.scss +12 -5
  30. data/vendor/assets/stylesheets/navbar.scss +77 -35
  31. data/vendor/assets/stylesheets/navs.scss +19 -9
  32. data/vendor/assets/stylesheets/pager.scss +6 -0
  33. data/vendor/assets/stylesheets/pagination.scss +1 -0
  34. data/vendor/assets/stylesheets/progress-bars.scss +15 -1
  35. data/vendor/assets/stylesheets/reset.scss +1 -1
  36. data/vendor/assets/stylesheets/responsive.scss +72 -28
  37. data/vendor/assets/stylesheets/scaffolding.scss +4 -4
  38. data/vendor/assets/stylesheets/tables.scss +15 -13
  39. data/vendor/assets/stylesheets/type.scss +21 -5
  40. data/vendor/assets/stylesheets/variables.scss +92 -6
  41. data/vendor/assets/stylesheets/wells.scss +10 -0
  42. metadata +12 -11
@@ -42,8 +42,8 @@
42
42
  // --------
43
43
 
44
44
  .nav-list {
45
- padding-left: 14px;
46
- padding-right: 14px;
45
+ padding-left: 15px;
46
+ padding-right: 15px;
47
47
  margin-bottom: 0;
48
48
  }
49
49
  .nav-list > li > a,
@@ -55,8 +55,8 @@
55
55
  .nav-list > li > a {
56
56
  padding: 3px 15px;
57
57
  }
58
- .nav-list .active > a,
59
- .nav-list .active > a:hover {
58
+ .nav-list > .active > a,
59
+ .nav-list > .active > a:hover {
60
60
  color: $white;
61
61
  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
62
62
  background-color: $linkColor;
@@ -64,6 +64,10 @@
64
64
  .nav-list [class^="icon-"] {
65
65
  margin-right: 2px;
66
66
  }
67
+ // Dividers (basically an hr) within the dropdown
68
+ .nav-list .divider {
69
+ @include nav-divider();
70
+ }
67
71
 
68
72
 
69
73
 
@@ -102,8 +106,9 @@
102
106
 
103
107
  // Actual tabs (as links)
104
108
  .nav-tabs > li > a {
105
- padding-top: 9px;
106
- padding-bottom: 9px;
109
+ padding-top: 8px;
110
+ padding-bottom: 8px;
111
+ line-height: $baseLineHeight;
107
112
  border: 1px solid transparent;
108
113
  @include border-radius(4px 4px 0 0);
109
114
  &:hover {
@@ -133,8 +138,8 @@
133
138
  }
134
139
 
135
140
  // Active state
136
- .nav-pills .active > a,
137
- .nav-pills .active > a:hover {
141
+ .nav-pills > .active > a,
142
+ .nav-pills > .active > a:hover {
138
143
  color: $white;
139
144
  background-color: $linkColor;
140
145
  }
@@ -200,11 +205,13 @@
200
205
  .nav-tabs .dropdown-toggle .caret,
201
206
  .nav-pills .dropdown-toggle .caret {
202
207
  border-top-color: $linkColor;
208
+ border-bottom-color: $linkColor;
203
209
  margin-top: 6px;
204
210
  }
205
211
  .nav-tabs .dropdown-toggle:hover .caret,
206
212
  .nav-pills .dropdown-toggle:hover .caret {
207
213
  border-top-color: $linkColorHover;
214
+ border-bottom-color: $linkColorHover;
208
215
  }
209
216
 
210
217
  // Active dropdown links
@@ -212,6 +219,7 @@
212
219
  .nav-tabs .active .dropdown-toggle .caret,
213
220
  .nav-pills .active .dropdown-toggle .caret {
214
221
  border-top-color: $grayDark;
222
+ border-bottom-color: $grayDark;
215
223
  }
216
224
 
217
225
  // Active:hover dropdown links
@@ -234,6 +242,7 @@
234
242
  .nav .open.active .caret,
235
243
  .nav .open a:hover .caret {
236
244
  border-top-color: $white;
245
+ border-bottom-color: $white;
237
246
  @include opacity(100);
238
247
  }
239
248
 
@@ -256,7 +265,8 @@
256
265
  @include clearfix();
257
266
  }
258
267
  .tab-content {
259
- overflow: hidden; // prevent content from running below tabs
268
+ display: table; // prevent content from running below tabs
269
+ width: 100%;
260
270
  }
261
271
 
262
272
  // Remove border on bottom, left, right
@@ -28,3 +28,9 @@
28
28
  .pager .previous a {
29
29
  float: left;
30
30
  }
31
+ .pager .disabled a,
32
+ .pager .disabled a:hover {
33
+ color: $grayLight;
34
+ background-color: #fff;
35
+ cursor: default;
36
+ }
@@ -32,6 +32,7 @@
32
32
  color: $grayLight;
33
33
  cursor: default;
34
34
  }
35
+ .pagination .disabled span,
35
36
  .pagination .disabled a,
36
37
  .pagination .disabled a:hover {
37
38
  color: $grayLight;
@@ -17,6 +17,12 @@
17
17
  to { background-position: 40px 0; }
18
18
  }
19
19
 
20
+ // IE9
21
+ @-ms-keyframes progress-bar-stripes {
22
+ from { background-position: 0 0; }
23
+ to { background-position: 40px 0; }
24
+ }
25
+
20
26
  // Spec
21
27
  @keyframes progress-bar-stripes {
22
28
  from { background-position: 0 0; }
@@ -54,7 +60,7 @@
54
60
 
55
61
  // Striped bars
56
62
  .progress-striped .bar {
57
- @include gradient-striped(#62c462);
63
+ @include gradient-striped(#149bdf);
58
64
  @include background-size(40px 40px);
59
65
  }
60
66
 
@@ -93,3 +99,11 @@
93
99
  .progress-info.progress-striped .bar {
94
100
  @include gradient-striped(#5bc0de);
95
101
  }
102
+
103
+ // Warning (orange)
104
+ .progress-warning .bar {
105
+ @include gradient-vertical(lighten($orange, 15%), $orange);
106
+ }
107
+ .progress-warning.progress-striped .bar {
108
+ @include gradient-striped(lighten($orange, 15%));
109
+ }
@@ -75,10 +75,10 @@ sub {
75
75
  // -------------------------
76
76
 
77
77
  img {
78
- max-width: 100%;
79
78
  height: auto;
80
79
  border: 0;
81
80
  -ms-interpolation-mode: bicubic;
81
+ vertical-align: middle;
82
82
  }
83
83
 
84
84
  // Forms
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.0.1
2
+ * Bootstrap Responsive v2.0.2
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -31,6 +31,37 @@
31
31
  visibility: hidden;
32
32
  }
33
33
 
34
+ // Visibility utilities
35
+
36
+ // For desktops
37
+ .visible-phone { display: none; }
38
+ .visible-tablet { display: none; }
39
+ .visible-desktop { display: block; }
40
+ .hidden-phone { display: block; }
41
+ .hidden-tablet { display: block; }
42
+ .hidden-desktop { display: none; }
43
+
44
+ // Phones only
45
+ @media (max-width: 767px) {
46
+ // Show
47
+ .visible-phone { display: block; }
48
+ // Hide
49
+ .hidden-phone { display: none; }
50
+ // Hide everything else
51
+ .hidden-desktop { display: block; }
52
+ .visible-desktop { display: none; }
53
+ }
54
+
55
+ // Tablets & small desktops only
56
+ @media (min-width: 768px) and (max-width: 979px) {
57
+ // Show
58
+ .visible-tablet { display: block; }
59
+ // Hide
60
+ .hidden-tablet { display: none; }
61
+ // Hide everything else
62
+ .hidden-desktop { display: block; }
63
+ .visible-desktop { display: none; }
64
+ }
34
65
 
35
66
 
36
67
  // UP TO LANDSCAPE PHONE
@@ -49,26 +80,6 @@
49
80
  line-height: $baseLineHeight;
50
81
  }
51
82
 
52
- // Make span* classes full width
53
- input[class*="span"],
54
- select[class*="span"],
55
- textarea[class*="span"],
56
- .uneditable-input {
57
- display: block;
58
- width: 100%;
59
- min-height: 28px; /* Make inputs at least the height of their button counterpart */
60
- /* Makes inputs behave like true block-level elements */
61
- -webkit-box-sizing: border-box; /* Older Webkit */
62
- -moz-box-sizing: border-box; /* Older FF */
63
- -ms-box-sizing: border-box; /* IE8 */
64
- box-sizing: border-box; /* CSS3 spec*/
65
- }
66
- // But don't let it screw up prepend/append inputs
67
- .input-prepend input[class*="span"],
68
- .input-append input[class*="span"] {
69
- width: auto;
70
- }
71
-
72
83
  // Update checkboxes for iOS
73
84
  input[type="checkbox"],
74
85
  input[type="radio"] {
@@ -124,12 +135,22 @@
124
135
  // --------------------------------------------------
125
136
 
126
137
  @media (max-width: 767px) {
138
+
139
+ // Padding to set content in a bit
140
+ body {
141
+ padding-left: 20px;
142
+ padding-right: 20px;
143
+ }
144
+ .navbar-fixed-top {
145
+ margin-left: -20px;
146
+ margin-right: -20px;
147
+ }
148
+
127
149
  // GRID & CONTAINERS
128
150
  // -----------------
129
151
  // Remove width from containers
130
152
  .container {
131
153
  width: auto;
132
- padding: 0 20px;
133
154
  }
134
155
  // Fluid rows
135
156
  .row-fluid {
@@ -147,6 +168,28 @@
147
168
  width: auto;
148
169
  margin: 0;
149
170
  }
171
+
172
+ // THUMBNAILS
173
+ // ----------
174
+ .thumbnails [class*="span"] {
175
+ width: auto;
176
+ }
177
+
178
+ // FORM FIELDS
179
+ // -----------
180
+ // Make span* classes full width
181
+ input[class*="span"],
182
+ select[class*="span"],
183
+ textarea[class*="span"],
184
+ .uneditable-input {
185
+ @include input-block-level();
186
+ }
187
+ // But don't let it screw up prepend/append inputs
188
+ .input-prepend input[class*="span"],
189
+ .input-append input[class*="span"] {
190
+ width: auto;
191
+ }
192
+
150
193
  }
151
194
 
152
195
 
@@ -157,13 +200,13 @@
157
200
  @media (min-width: 768px) and (max-width: 979px) {
158
201
 
159
202
  // Fixed grid
160
- @include grid-system-generate(12, 42px, 20px);
203
+ @include grid-core(42px, 20px);
161
204
 
162
205
  // Fluid grid
163
- @include fluid-grid-system-generate(12, 5.801104972%, 2.762430939%);
206
+ @include grid-fluid(5.801104972%, 2.762430939%);
164
207
 
165
208
  // Input grid
166
- @include input-grid-system-generate(12, 42px, 20px);
209
+ @include grid-input(42px, 20px);
167
210
 
168
211
  }
169
212
 
@@ -297,6 +340,7 @@
297
340
  @media (min-width: 980px) {
298
341
  .nav-collapse.collapse {
299
342
  height: auto !important;
343
+ overflow: visible !important;
300
344
  }
301
345
  }
302
346
 
@@ -308,13 +352,13 @@
308
352
  @media (min-width: 1200px) {
309
353
 
310
354
  // Fixed grid
311
- @include grid-system-generate(12, 70px, 30px);
355
+ @include grid-core(70px, 30px);
312
356
 
313
357
  // Fluid grid
314
- @include fluid-grid-system-generate(12, 5.982905983%, 2.564102564%);
358
+ @include grid-fluid(5.982905983%, 2.564102564%);
315
359
 
316
360
  // Input grid
317
- @include input-grid-system-generate(12, 70px, 30px);
361
+ @include grid-input(70px, 30px);
318
362
 
319
363
  // Thumbnails
320
364
  .thumbnails {
@@ -3,8 +3,8 @@
3
3
  // -------------------------------------------------------------------------------------------
4
4
 
5
5
 
6
- // STRUCTURAL LAYOUT
7
- // -----------------
6
+ // Body reset
7
+ // ----------
8
8
 
9
9
  body {
10
10
  margin: 0;
@@ -12,11 +12,11 @@ body {
12
12
  font-size: $baseFontSize;
13
13
  line-height: $baseLineHeight;
14
14
  color: $textColor;
15
- background-color: $white;
15
+ background-color: $bodyBackground;
16
16
  }
17
17
 
18
18
 
19
- // LINKS
19
+ // Links
20
20
  // -----
21
21
 
22
22
  a {
@@ -11,6 +11,7 @@ table {
11
11
  max-width: 100%;
12
12
  border-collapse: collapse;
13
13
  border-spacing: 0;
14
+ background-color: $tableBackground;
14
15
  }
15
16
 
16
17
  // BASELINE STYLES
@@ -26,7 +27,7 @@ table {
26
27
  line-height: $baseLineHeight;
27
28
  text-align: left;
28
29
  vertical-align: top;
29
- border-top: 1px solid #ddd;
30
+ border-top: 1px solid $tableBorder;
30
31
  }
31
32
  th {
32
33
  font-weight: bold;
@@ -36,13 +37,15 @@ table {
36
37
  vertical-align: bottom;
37
38
  }
38
39
  // Remove top border from thead by default
39
- thead:first-child tr th,
40
- thead:first-child tr td {
40
+ colgroup + thead tr:first-child th,
41
+ colgroup + thead tr:first-child td,
42
+ thead:first-child tr:first-child th,
43
+ thead:first-child tr:first-child td {
41
44
  border-top: 0;
42
45
  }
43
46
  // Account for multiple tbody instances
44
47
  tbody + tbody {
45
- border-top: 2px solid #ddd;
48
+ border-top: 2px solid $tableBorder;
46
49
  }
47
50
  }
48
51
 
@@ -63,15 +66,14 @@ table {
63
66
  // ----------------
64
67
 
65
68
  .table-bordered {
66
- border: 1px solid #ddd;
69
+ border: 1px solid $tableBorder;
70
+ border-left: 0;
67
71
  border-collapse: separate; // Done so we can round those corners!
68
72
  *border-collapse: collapsed; // IE7 can't round corners anyway
69
73
  @include border-radius(4px);
70
- th + th,
71
- td + td,
72
- th + td,
73
- td + th {
74
- border-left: 1px solid #ddd;
74
+ th,
75
+ td {
76
+ border-left: 1px solid $tableBorder;
75
77
  }
76
78
  // Prevent a double border
77
79
  thead:first-child tr:first-child th,
@@ -108,7 +110,7 @@ table {
108
110
  tbody {
109
111
  tr:nth-child(odd) td,
110
112
  tr:nth-child(odd) th {
111
- background-color: #f9f9f9;
113
+ background-color: $tableBackgroundAccent;
112
114
  }
113
115
  }
114
116
  }
@@ -120,7 +122,7 @@ table {
120
122
  .table {
121
123
  tbody tr:hover td,
122
124
  tbody tr:hover th {
123
- background-color: #f5f5f5;
125
+ background-color: $tableBackgroundHover;
124
126
  }
125
127
  }
126
128
 
@@ -135,7 +137,7 @@ table {
135
137
  margin-left: 0;
136
138
  }
137
139
  table {
138
- @for $i from 1 through 12 {
140
+ @for $i from 1 through 24 {
139
141
  .span#{$i} { @include table-columns($i); }
140
142
  }
141
143
  }
@@ -28,8 +28,9 @@ p {
28
28
 
29
29
  h1, h2, h3, h4, h5, h6 {
30
30
  margin: 0;
31
- font-weight: bold;
32
- color: $grayDark;
31
+ font-family: $headingsFontFamily;
32
+ font-weight: $headingsFontWeight;
33
+ color: $headingsColor;
33
34
  text-rendering: optimizelegibility; // Fix the character spacing for headings
34
35
  small {
35
36
  font-weight: normal;
@@ -126,10 +127,23 @@ dd {
126
127
  }
127
128
  dt {
128
129
  font-weight: bold;
130
+ line-height: $baseLineHeight - 1; // fix jank Helvetica Neue font bug
129
131
  }
130
132
  dd {
131
133
  margin-left: $baseLineHeight / 2;
132
134
  }
135
+ // Horizontal layout (like forms)
136
+ .dl-horizontal {
137
+ dt {
138
+ float: left;
139
+ clear: left;
140
+ width: 120px;
141
+ text-align: right;
142
+ }
143
+ dd {
144
+ margin-left: 130px;
145
+ }
146
+ }
133
147
 
134
148
  // MISC
135
149
  // ----
@@ -154,12 +168,14 @@ em {
154
168
  }
155
169
 
156
170
  // Abbreviations and acronyms
157
- abbr {
158
- font-size: 90%;
159
- text-transform: uppercase;
171
+ abbr[title] {
160
172
  border-bottom: 1px dotted #ddd;
161
173
  cursor: help;
162
174
  }
175
+ abbr.initialism {
176
+ font-size: 90%;
177
+ text-transform: uppercase;
178
+ }
163
179
 
164
180
  // Blockquotes
165
181
  blockquote {