padrino-admin 0.12.2 → 0.12.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (135) hide show
  1. checksums.yaml +4 -4
  2. data/lib/padrino-admin.rb +9 -17
  3. data/lib/padrino-admin/access_control.rb +1 -0
  4. data/lib/padrino-admin/bootstrap-less/alerts.less +1 -1
  5. data/lib/padrino-admin/bootstrap-less/badges.less +10 -6
  6. data/lib/padrino-admin/bootstrap-less/bootstrap.less +0 -10
  7. data/lib/padrino-admin/bootstrap-less/breadcrumbs.less +6 -3
  8. data/lib/padrino-admin/bootstrap-less/button-groups.less +22 -44
  9. data/lib/padrino-admin/bootstrap-less/buttons.less +12 -17
  10. data/lib/padrino-admin/bootstrap-less/carousel.less +33 -10
  11. data/lib/padrino-admin/bootstrap-less/code.less +15 -8
  12. data/lib/padrino-admin/bootstrap-less/dropdowns.less +31 -11
  13. data/lib/padrino-admin/bootstrap-less/font-awesome/bordered-pulled.less +16 -0
  14. data/lib/padrino-admin/bootstrap-less/font-awesome/core.less +9 -126
  15. data/lib/padrino-admin/bootstrap-less/font-awesome/fixed-width.less +6 -0
  16. data/lib/padrino-admin/bootstrap-less/font-awesome/font-awesome.less +14 -30
  17. data/lib/padrino-admin/bootstrap-less/font-awesome/icons.less +409 -378
  18. data/lib/padrino-admin/bootstrap-less/font-awesome/larger.less +13 -0
  19. data/lib/padrino-admin/bootstrap-less/font-awesome/list.less +19 -0
  20. data/lib/padrino-admin/bootstrap-less/font-awesome/mixins.less +14 -42
  21. data/lib/padrino-admin/bootstrap-less/font-awesome/path.less +6 -6
  22. data/lib/padrino-admin/bootstrap-less/font-awesome/rotated-flipped.less +9 -0
  23. data/lib/padrino-admin/bootstrap-less/font-awesome/spinning.less +30 -0
  24. data/lib/padrino-admin/bootstrap-less/font-awesome/stacked.less +20 -0
  25. data/lib/padrino-admin/bootstrap-less/font-awesome/variables.less +377 -731
  26. data/lib/padrino-admin/bootstrap-less/forms.less +105 -39
  27. data/lib/padrino-admin/bootstrap-less/glyphicons.less +16 -15
  28. data/lib/padrino-admin/bootstrap-less/grid.less +59 -305
  29. data/lib/padrino-admin/bootstrap-less/input-groups.less +43 -13
  30. data/lib/padrino-admin/bootstrap-less/jumbotron.less +12 -8
  31. data/lib/padrino-admin/bootstrap-less/labels.less +6 -0
  32. data/lib/padrino-admin/bootstrap-less/list-group.less +37 -15
  33. data/lib/padrino-admin/bootstrap-less/mixins.less +283 -80
  34. data/lib/padrino-admin/bootstrap-less/modals.less +19 -22
  35. data/lib/padrino-admin/bootstrap-less/navbar.less +73 -78
  36. data/lib/padrino-admin/bootstrap-less/navs.less +45 -32
  37. data/lib/padrino-admin/bootstrap-less/normalize.less +148 -121
  38. data/lib/padrino-admin/bootstrap-less/padrino-admin.less +3 -1
  39. data/lib/padrino-admin/bootstrap-less/pager.less +5 -5
  40. data/lib/padrino-admin/bootstrap-less/pagination.less +8 -3
  41. data/lib/padrino-admin/bootstrap-less/panels.less +102 -20
  42. data/lib/padrino-admin/bootstrap-less/print.less +6 -5
  43. data/lib/padrino-admin/bootstrap-less/progress-bars.less +4 -19
  44. data/lib/padrino-admin/bootstrap-less/responsive-utilities.less +32 -159
  45. data/lib/padrino-admin/bootstrap-less/scaffolding.less +18 -14
  46. data/lib/padrino-admin/bootstrap-less/tables.less +47 -50
  47. data/lib/padrino-admin/bootstrap-less/theme.less +33 -18
  48. data/lib/padrino-admin/bootstrap-less/thumbnails.less +23 -18
  49. data/lib/padrino-admin/bootstrap-less/tooltip.less +9 -9
  50. data/lib/padrino-admin/bootstrap-less/type.less +139 -81
  51. data/lib/padrino-admin/bootstrap-less/utilities.less +15 -1
  52. data/lib/padrino-admin/bootstrap-less/variables.less +398 -191
  53. data/lib/padrino-admin/bootstrap-less/wells.less +1 -1
  54. data/lib/padrino-admin/generators/admin_app.rb +1 -1
  55. data/lib/padrino-admin/generators/templates/account/minirecord.rb.tt +1 -1
  56. data/lib/padrino-admin/generators/templates/assets/images/font/FontAwesome.otf +0 -0
  57. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.eot +0 -0
  58. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.svg +23 -8
  59. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.ttf +0 -0
  60. data/lib/padrino-admin/generators/templates/assets/images/font/fontawesome-webfont.woff +0 -0
  61. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/affix.js +36 -25
  62. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/alert.js +7 -17
  63. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/bootstrap.min.js +6 -6
  64. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/button.js +26 -28
  65. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/carousel.js +22 -34
  66. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/collapse.js +9 -18
  67. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/dropdown.js +25 -32
  68. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/modal.js +27 -30
  69. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/popover.js +16 -23
  70. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/scrollspy.js +19 -24
  71. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/tab.js +10 -20
  72. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/tooltip.js +54 -41
  73. data/lib/padrino-admin/generators/templates/assets/javascripts/bootstrap/transition.js +13 -21
  74. data/lib/padrino-admin/generators/templates/assets/javascripts/jquery-1.11.0.min.js +4 -0
  75. data/lib/padrino-admin/generators/templates/assets/stylesheets/bootstrap.css +4 -1238
  76. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/FontAwesome.otf +0 -0
  77. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.eot +0 -0
  78. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.svg +414 -0
  79. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.ttf +0 -0
  80. data/lib/padrino-admin/generators/templates/assets/stylesheets/fonts/fontawesome-webfont.woff +0 -0
  81. data/lib/padrino-admin/generators/templates/erb/app/base/index.erb.tt +5 -5
  82. data/lib/padrino-admin/generators/templates/erb/app/errors/403.erb.tt +1 -1
  83. data/lib/padrino-admin/generators/templates/erb/app/errors/404.erb.tt +1 -1
  84. data/lib/padrino-admin/generators/templates/erb/app/errors/500.erb.tt +1 -1
  85. data/lib/padrino-admin/generators/templates/erb/app/layouts/application.erb.tt +2 -2
  86. data/lib/padrino-admin/generators/templates/erb/app/sessions/new.erb.tt +1 -1
  87. data/lib/padrino-admin/generators/templates/erb/page/index.erb.tt +5 -5
  88. data/lib/padrino-admin/generators/templates/haml/app/base/index.haml.tt +5 -5
  89. data/lib/padrino-admin/generators/templates/haml/app/errors/403.haml.tt +1 -1
  90. data/lib/padrino-admin/generators/templates/haml/app/errors/404.haml.tt +1 -1
  91. data/lib/padrino-admin/generators/templates/haml/app/errors/500.haml.tt +1 -1
  92. data/lib/padrino-admin/generators/templates/haml/app/layouts/application.haml.tt +2 -2
  93. data/lib/padrino-admin/generators/templates/haml/app/sessions/new.haml.tt +2 -1
  94. data/lib/padrino-admin/generators/templates/haml/page/index.haml.tt +4 -4
  95. data/lib/padrino-admin/generators/templates/slim/app/base/index.slim.tt +5 -5
  96. data/lib/padrino-admin/generators/templates/slim/app/errors/403.slim.tt +1 -1
  97. data/lib/padrino-admin/generators/templates/slim/app/errors/404.slim.tt +1 -1
  98. data/lib/padrino-admin/generators/templates/slim/app/errors/500.slim.tt +1 -1
  99. data/lib/padrino-admin/generators/templates/slim/app/layouts/application.slim.tt +2 -2
  100. data/lib/padrino-admin/generators/templates/slim/app/sessions/new.slim.tt +1 -1
  101. data/lib/padrino-admin/generators/templates/slim/page/index.slim.tt +4 -4
  102. data/lib/padrino-admin/helpers/view_helpers.rb +1 -1
  103. data/lib/padrino-admin/locale/admin/zh_tw.yml +22 -22
  104. data/lib/padrino-admin/locale/orm/cs.yml +0 -25
  105. data/lib/padrino-admin/locale/orm/da.yml +0 -25
  106. data/lib/padrino-admin/locale/orm/de.yml +0 -25
  107. data/lib/padrino-admin/locale/orm/en.yml +0 -25
  108. data/lib/padrino-admin/locale/orm/es.yml +0 -25
  109. data/lib/padrino-admin/locale/orm/fr.yml +0 -25
  110. data/lib/padrino-admin/locale/orm/hu.yml +0 -25
  111. data/lib/padrino-admin/locale/orm/it.yml +0 -25
  112. data/lib/padrino-admin/locale/orm/ja.yml +0 -25
  113. data/lib/padrino-admin/locale/orm/lv.yml +0 -25
  114. data/lib/padrino-admin/locale/orm/nl.yml +0 -25
  115. data/lib/padrino-admin/locale/orm/no.yml +1 -26
  116. data/lib/padrino-admin/locale/orm/pt_br.yml +0 -25
  117. data/lib/padrino-admin/locale/orm/ro.yml +0 -25
  118. data/lib/padrino-admin/locale/orm/ru.yml +0 -25
  119. data/lib/padrino-admin/locale/orm/sv.yml +0 -25
  120. data/lib/padrino-admin/locale/orm/tr.yml +0 -25
  121. data/lib/padrino-admin/locale/orm/uk.yml +0 -25
  122. data/lib/padrino-admin/locale/orm/zh_cn.yml +0 -25
  123. data/lib/padrino-admin/locale/orm/zh_tw.yml +0 -25
  124. data/test/fixtures/data_mapper.rb +0 -41
  125. data/test/generators/test_admin_app_generator.rb +3 -6
  126. data/test/test_locale.rb +0 -33
  127. metadata +19 -14
  128. data/lib/padrino-admin/bootstrap-less/accordion.less +0 -31
  129. data/lib/padrino-admin/bootstrap-less/font-awesome-ie7.less +0 -1953
  130. data/lib/padrino-admin/bootstrap-less/font-awesome.less +0 -33
  131. data/lib/padrino-admin/bootstrap-less/font-awesome/bootstrap.less +0 -84
  132. data/lib/padrino-admin/bootstrap-less/font-awesome/extras.less +0 -93
  133. data/lib/padrino-admin/bootstrap-less/font-awesome/font-awesome-ie7.less +0 -1953
  134. data/lib/padrino-admin/generators/templates/assets/javascripts/jquery-1.9.0.min.js +0 -4
  135. data/lib/padrino-admin/utils/crypt.rb +0 -41
@@ -3,19 +3,69 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
+ // Headings
7
+ // -------------------------
8
+
9
+ h1, h2, h3, h4, h5, h6,
10
+ .h1, .h2, .h3, .h4, .h5, .h6 {
11
+ font-family: @headings-font-family;
12
+ font-weight: @headings-font-weight;
13
+ line-height: @headings-line-height;
14
+ color: @headings-color;
15
+
16
+ small,
17
+ .small {
18
+ font-weight: normal;
19
+ line-height: 1;
20
+ color: @headings-small-color;
21
+ }
22
+ }
23
+
24
+ h1, .h1,
25
+ h2, .h2,
26
+ h3, .h3 {
27
+ margin-top: @line-height-computed;
28
+ margin-bottom: (@line-height-computed / 2);
29
+
30
+ small,
31
+ .small {
32
+ font-size: 65%;
33
+ }
34
+ }
35
+ h4, .h4,
36
+ h5, .h5,
37
+ h6, .h6 {
38
+ margin-top: (@line-height-computed / 2);
39
+ margin-bottom: (@line-height-computed / 2);
40
+
41
+ small,
42
+ .small {
43
+ font-size: 75%;
44
+ }
45
+ }
46
+
47
+ h1, .h1 { font-size: @font-size-h1; }
48
+ h2, .h2 { font-size: @font-size-h2; }
49
+ h3, .h3 { font-size: @font-size-h3; }
50
+ h4, .h4 { font-size: @font-size-h4; }
51
+ h5, .h5 { font-size: @font-size-h5; }
52
+ h6, .h6 { font-size: @font-size-h6; }
53
+
54
+
6
55
  // Body text
7
56
  // -------------------------
8
57
 
9
58
  p {
10
59
  margin: 0 0 (@line-height-computed / 2);
11
60
  }
61
+
12
62
  .lead {
13
63
  margin-bottom: @line-height-computed;
14
- font-size: (@font-size-base * 1.15);
64
+ font-size: floor((@font-size-base * 1.15));
15
65
  font-weight: 200;
16
66
  line-height: 1.4;
17
67
 
18
- @media (min-width: 768px) {
68
+ @media (min-width: @screen-sm-min) {
19
69
  font-size: (@font-size-base * 1.5);
20
70
  }
21
71
  }
@@ -25,64 +75,59 @@ p {
25
75
  // -------------------------
26
76
 
27
77
  // Ex: 14px base font * 85% = about 12px
28
- small { font-size: 85%; }
78
+ small,
79
+ .small { font-size: 85%; }
29
80
 
30
81
  // Undo browser default styling
31
82
  cite { font-style: normal; }
32
83
 
33
- // 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; }
40
-
41
84
  // Alignment
42
85
  .text-left { text-align: left; }
43
86
  .text-right { text-align: right; }
44
87
  .text-center { text-align: center; }
88
+ .text-justify { text-align: justify; }
45
89
 
46
-
47
- // Headings
48
- // -------------------------
49
-
50
- h1, h2, h3, h4, h5, h6,
51
- .h1, .h2, .h3, .h4, .h5, .h6 {
52
- font-family: @headings-font-family;
53
- font-weight: @headings-font-weight;
54
- line-height: @headings-line-height;
55
- small {
56
- font-weight: normal;
57
- line-height: 1;
58
- color: @headings-small-color;
59
- }
90
+ // Contextual colors
91
+ .text-muted {
92
+ color: @text-muted;
60
93
  }
61
-
62
- h1,
63
- h2,
64
- h3 {
65
- margin-top: @line-height-computed;
66
- margin-bottom: (@line-height-computed / 2);
94
+ .text-primary {
95
+ .text-emphasis-variant(@brand-primary);
67
96
  }
68
- h4,
69
- h5,
70
- h6 {
71
- margin-top: (@line-height-computed / 2);
72
- margin-bottom: (@line-height-computed / 2);
97
+ .text-success {
98
+ .text-emphasis-variant(@state-success-text);
99
+ }
100
+ .text-info {
101
+ .text-emphasis-variant(@state-info-text);
102
+ }
103
+ .text-warning {
104
+ .text-emphasis-variant(@state-warning-text);
105
+ }
106
+ .text-danger {
107
+ .text-emphasis-variant(@state-danger-text);
73
108
  }
74
109
 
75
- h1, .h1 { font-size: floor(@font-size-base * 2.60); } // ~36px
76
- h2, .h2 { font-size: floor(@font-size-base * 2.15); } // ~30px
77
- h3, .h3 { font-size: ceil(@font-size-base * 1.70); } // ~24px
78
- h4, .h4 { font-size: ceil(@font-size-base * 1.25); } // ~18px
79
- h5, .h5 { font-size: @font-size-base; }
80
- h6, .h6 { font-size: ceil(@font-size-base * 0.85); } // ~12px
81
-
82
- h1 small, .h1 small { font-size: ceil(@font-size-base * 1.70); } // ~24px
83
- h2 small, .h2 small { font-size: ceil(@font-size-base * 1.25); } // ~18px
84
- h3 small, .h3 small,
85
- h4 small, .h4 small { font-size: @font-size-base; }
110
+ // Contextual backgrounds
111
+ // For now we'll leave these alongside the text classes until v4 when we can
112
+ // safely shift things around (per SemVer rules).
113
+ .bg-primary {
114
+ // Given the contrast here, this is the only class to have its color inverted
115
+ // automatically.
116
+ color: #fff;
117
+ .bg-variant(@brand-primary);
118
+ }
119
+ .bg-success {
120
+ .bg-variant(@state-success-bg);
121
+ }
122
+ .bg-info {
123
+ .bg-variant(@state-info-bg);
124
+ }
125
+ .bg-warning {
126
+ .bg-variant(@state-warning-bg);
127
+ }
128
+ .bg-danger {
129
+ .bg-variant(@state-danger-bg);
130
+ }
86
131
 
87
132
 
88
133
  // Page header
@@ -95,7 +140,6 @@ h4 small, .h4 small { font-size: @font-size-base; }
95
140
  }
96
141
 
97
142
 
98
-
99
143
  // Lists
100
144
  // --------------------------------------------------
101
145
 
@@ -105,7 +149,7 @@ ol {
105
149
  margin-top: 0;
106
150
  margin-bottom: (@line-height-computed / 2);
107
151
  ul,
108
- ol{
152
+ ol {
109
153
  margin-bottom: 0;
110
154
  }
111
155
  }
@@ -117,18 +161,25 @@ ol {
117
161
  padding-left: 0;
118
162
  list-style: none;
119
163
  }
164
+
120
165
  // Inline turns list items into inline-block
121
166
  .list-inline {
122
167
  .list-unstyled();
168
+
123
169
  > li {
124
170
  display: inline-block;
125
171
  padding-left: 5px;
126
172
  padding-right: 5px;
173
+
174
+ &:first-child {
175
+ padding-left: 0;
176
+ }
127
177
  }
128
178
  }
129
179
 
130
180
  // Description Lists
131
181
  dl {
182
+ margin-top: 0; // Remove browser default
132
183
  margin-bottom: @line-height-computed;
133
184
  }
134
185
  dt,
@@ -158,7 +209,7 @@ dd {
158
209
  }
159
210
  dd {
160
211
  margin-left: @component-offset-horizontal;
161
- .clearfix(); // Clear the floated `dt` if an empty `dd` is present
212
+ &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
162
213
  }
163
214
  }
164
215
  }
@@ -168,12 +219,12 @@ dd {
168
219
 
169
220
  // Abbreviations and acronyms
170
221
  abbr[title],
171
- // Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
222
+ // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
172
223
  abbr[data-original-title] {
173
224
  cursor: help;
174
225
  border-bottom: 1px dotted @abbr-border-color;
175
226
  }
176
- abbr.initialism {
227
+ .initialism {
177
228
  font-size: 90%;
178
229
  text-transform: uppercase;
179
230
  }
@@ -182,48 +233,56 @@ abbr.initialism {
182
233
  blockquote {
183
234
  padding: (@line-height-computed / 2) @line-height-computed;
184
235
  margin: 0 0 @line-height-computed;
236
+ font-size: (@font-size-base * 1.25);
185
237
  border-left: 5px solid @blockquote-border-color;
186
- p {
187
- font-size: (@font-size-base * 1.25);
188
- font-weight: 300;
189
- line-height: 1.25;
190
- }
191
- p:last-child {
192
- margin-bottom: 0;
238
+
239
+ p,
240
+ ul,
241
+ ol {
242
+ &:last-child {
243
+ margin-bottom: 0;
244
+ }
193
245
  }
194
- small {
246
+
247
+ // Note: Deprecated small and .small as of v3.1.0
248
+ // Context: https://github.com/twbs/bootstrap/issues/11660
249
+ footer,
250
+ small,
251
+ .small {
195
252
  display: block;
253
+ font-size: 80%; // back to default font-size
196
254
  line-height: @line-height-base;
197
255
  color: @blockquote-small-color;
256
+
198
257
  &:before {
199
- content: '\2014 \00A0';// EM DASH, NBSP
258
+ content: '\2014 \00A0'; // em dash, nbsp
200
259
  }
201
260
  }
261
+ }
202
262
 
203
- // Float right with text-align: right
204
- &.pull-right {
205
- padding-right: 15px;
206
- padding-left: 0;
207
- border-right: 5px solid @blockquote-border-color;
208
- border-left: 0;
209
- p,
210
- small {
211
- text-align: right;
212
- }
213
- small {
214
- &:before {
215
- content: '';
216
- }
217
- &:after {
218
- content: '\00A0 \2014';// NBSP, EM DASH
219
- }
263
+ // Opposite alignment of blockquote
264
+ //
265
+ // Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.
266
+ .blockquote-reverse,
267
+ blockquote.pull-right {
268
+ padding-right: 15px;
269
+ padding-left: 0;
270
+ border-right: 5px solid @blockquote-border-color;
271
+ border-left: 0;
272
+ text-align: right;
273
+
274
+ // Account for citation
275
+ footer,
276
+ small,
277
+ .small {
278
+ &:before { content: ''; }
279
+ &:after {
280
+ content: '\00A0 \2014'; // nbsp, em dash
220
281
  }
221
282
  }
222
283
  }
223
284
 
224
285
  // Quotes
225
- q:before,
226
- q:after,
227
286
  blockquote:before,
228
287
  blockquote:after {
229
288
  content: "";
@@ -231,7 +290,6 @@ blockquote:after {
231
290
 
232
291
  // Addresses
233
292
  address {
234
- display: block;
235
293
  margin-bottom: @line-height-computed;
236
294
  font-style: normal;
237
295
  line-height: @line-height-base;
@@ -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
  }
@@ -20,6 +23,7 @@
20
23
  // Toggling content
21
24
  // -------------------------
22
25
 
26
+ // Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1
23
27
  .hide {
24
28
  display: none !important;
25
29
  }
@@ -30,7 +34,17 @@
30
34
  visibility: hidden;
31
35
  }
32
36
  .text-hide {
33
- .hide-text();
37
+ .text-hide();
38
+ }
39
+
40
+
41
+ // Hide from screenreaders and browsers
42
+ //
43
+ // Credit: HTML5 Boilerplate
44
+
45
+ .hidden {
46
+ display: none !important;
47
+ visibility: hidden !important;
34
48
  }
35
49
 
36
50
 
@@ -3,11 +3,9 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // Global values
7
- // --------------------------------------------------
8
-
9
- // Grays
10
- // -------------------------
6
+ //== Colors
7
+ //
8
+ //## Gray and brand colors for use across Bootstrap.
11
9
 
12
10
  @gray-darker: lighten(#000, 13.5%); // #222
13
11
  @gray-dark: lighten(#000, 20%); // #333
@@ -15,94 +13,127 @@
15
13
  @gray-light: lighten(#000, 60%); // #999
16
14
  @gray-lighter: lighten(#000, 93.5%); // #eee
17
15
 
18
- // Brand colors
19
- // -------------------------
20
-
21
16
  @brand-primary: #428bca;
22
17
  @brand-success: #5cb85c;
18
+ @brand-info: #5bc0de;
23
19
  @brand-warning: #f0ad4e;
24
20
  @brand-danger: #d9534f;
25
- @brand-info: #5bc0de;
26
21
 
27
- // Scaffolding
28
- // -------------------------
29
22
 
23
+ //== Scaffolding
24
+ //
25
+ // ## Settings for some of the most global styles.
26
+
27
+ //** Background color for `<body>`.
30
28
  @body-bg: #fff;
29
+ //** Global text color on `<body>`.
31
30
  @text-color: @gray-dark;
32
31
 
33
- // Links
34
- // -------------------------
35
-
32
+ //** Global textual link color.
36
33
  @link-color: @brand-primary;
34
+ //** Link hover color set via `darken()` function.
37
35
  @link-hover-color: darken(@link-color, 15%);
38
36
 
39
- // Typography
40
- // -------------------------
37
+
38
+ //== Typography
39
+ //
40
+ //## Font, line-height, and color for body text, headings, and more.
41
41
 
42
42
  @font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
43
43
  @font-family-serif: Georgia, "Times New Roman", Times, serif;
44
- @font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
44
+ //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
45
+ @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
45
46
  @font-family-base: @font-family-sans-serif;
46
47
 
47
48
  @font-size-base: 14px;
48
- @font-size-large: ceil(@font-size-base * 1.25); // ~18px
49
- @font-size-small: ceil(@font-size-base * 0.85); // ~12px
49
+ @font-size-large: ceil((@font-size-base * 1.25)); // ~18px
50
+ @font-size-small: ceil((@font-size-base * 0.85)); // ~12px
51
+
52
+ @font-size-h1: floor((@font-size-base * 2.6)); // ~36px
53
+ @font-size-h2: floor((@font-size-base * 2.15)); // ~30px
54
+ @font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
55
+ @font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
56
+ @font-size-h5: @font-size-base;
57
+ @font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
50
58
 
59
+ //** Unit-less `line-height` for use in components like buttons.
51
60
  @line-height-base: 1.428571429; // 20/14
52
- @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
61
+ //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
62
+ @line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
53
63
 
54
- @headings-font-family: @font-family-base;
64
+ //** By default, this inherits from the `<body>`.
65
+ @headings-font-family: inherit;
55
66
  @headings-font-weight: 500;
56
67
  @headings-line-height: 1.1;
68
+ @headings-color: inherit;
57
69
 
58
- // Iconography
59
- // -------------------------
70
+
71
+ //-- Iconography
72
+ //
73
+ //## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
60
74
 
61
75
  @icon-font-path: "../fonts/";
62
76
  @icon-font-name: "glyphicons-halflings-regular";
77
+ @icon-font-svg-id: "glyphicons_halflingsregular";
78
+
79
+ //== Components
80
+ //
81
+ //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
63
82
 
83
+ @padding-base-vertical: 6px;
84
+ @padding-base-horizontal: 12px;
64
85
 
65
- // Components
66
- // -------------------------
67
- // Based on 14px font-size and 1.428 line-height (~20px to start)
86
+ @padding-large-vertical: 10px;
87
+ @padding-large-horizontal: 16px;
68
88
 
69
- @padding-base-vertical: 6px;
70
- @padding-base-horizontal: 12px;
89
+ @padding-small-vertical: 5px;
90
+ @padding-small-horizontal: 10px;
71
91
 
72
- @padding-large-vertical: 10px;
73
- @padding-large-horizontal: 16px;
92
+ @padding-xs-vertical: 1px;
93
+ @padding-xs-horizontal: 5px;
74
94
 
75
- @padding-small-vertical: 5px;
76
- @padding-small-horizontal: 10px;
95
+ @line-height-large: 1.33;
96
+ @line-height-small: 1.5;
77
97
 
78
- @line-height-large: 1.33;
79
- @line-height-small: 1.5;
98
+ @border-radius-base: 4px;
99
+ @border-radius-large: 6px;
100
+ @border-radius-small: 3px;
80
101
 
81
- @border-radius-base: 4px;
82
- @border-radius-large: 6px;
83
- @border-radius-small: 3px;
102
+ //** Global color for active items (e.g., navs or dropdowns).
103
+ @component-active-color: #fff;
104
+ //** Global background color for active items (e.g., navs or dropdowns).
105
+ @component-active-bg: @brand-primary;
84
106
 
85
- @component-active-bg: @brand-primary;
107
+ //** Width of the `border` for generating carets that indicator dropdowns.
108
+ @caret-width-base: 4px;
109
+ //** Carets increase slightly in size for larger components.
110
+ @caret-width-large: 5px;
86
111
 
87
- @caret-width-base: 4px;
88
- @caret-width-large: 5px;
89
112
 
90
- // Tables
91
- // -------------------------
113
+ //== Tables
114
+ //
115
+ //## Customizes the `.table` component with basic values, each used across all table variations.
92
116
 
93
- @table-cell-padding: 8px;
94
- @table-condensed-cell-padding: 5px;
117
+ //** Padding for `<th>`s and `<td>`s.
118
+ @table-cell-padding: 8px;
119
+ //** Padding for cells in `.table-condensed`.
120
+ @table-condensed-cell-padding: 5px;
95
121
 
96
- @table-bg: transparent; // overall background-color
97
- @table-bg-accent: #f9f9f9; // for striping
98
- @table-bg-hover: #f5f5f5;
99
- @table-bg-active: @table-bg-hover;
122
+ //** Default background color used for all tables.
123
+ @table-bg: transparent;
124
+ //** Background color used for `.table-striped`.
125
+ @table-bg-accent: #f9f9f9;
126
+ //** Background color used for `.table-hover`.
127
+ @table-bg-hover: #f5f5f5;
128
+ @table-bg-active: @table-bg-hover;
100
129
 
101
- @table-border-color: #ddd; // table and cell border
130
+ //** Border color for table and cell borders.
131
+ @table-border-color: #ddd;
102
132
 
103
133
 
104
- // Buttons
105
- // -------------------------
134
+ //== Buttons
135
+ //
136
+ //## For each of Bootstrap's buttons, define text, background and border color.
106
137
 
107
138
  @btn-font-weight: normal;
108
139
 
@@ -118,6 +149,10 @@
118
149
  @btn-success-bg: @brand-success;
119
150
  @btn-success-border: darken(@btn-success-bg, 5%);
120
151
 
152
+ @btn-info-color: #fff;
153
+ @btn-info-bg: @brand-info;
154
+ @btn-info-border: darken(@btn-info-bg, 5%);
155
+
121
156
  @btn-warning-color: #fff;
122
157
  @btn-warning-bg: @brand-warning;
123
158
  @btn-warning-border: darken(@btn-warning-bg, 5%);
@@ -126,67 +161,87 @@
126
161
  @btn-danger-bg: @brand-danger;
127
162
  @btn-danger-border: darken(@btn-danger-bg, 5%);
128
163
 
129
- @btn-info-color: #fff;
130
- @btn-info-bg: @brand-info;
131
- @btn-info-border: darken(@btn-info-bg, 5%);
132
-
133
164
  @btn-link-disabled-color: @gray-light;
134
165
 
135
166
 
136
- // Forms
137
- // -------------------------
167
+ //== Forms
168
+ //
169
+ //##
138
170
 
171
+ //** `<input>` background color
139
172
  @input-bg: #fff;
173
+ //** `<input disabled>` background color
140
174
  @input-bg-disabled: @gray-lighter;
141
175
 
176
+ //** Text color for `<input>`s
142
177
  @input-color: @gray;
178
+ //** `<input>` border color
143
179
  @input-border: #ccc;
180
+ //** `<input>` border radius
144
181
  @input-border-radius: @border-radius-base;
182
+ //** Border color for inputs on focus
145
183
  @input-border-focus: #66afe9;
146
184
 
185
+ //** Placeholder text color
147
186
  @input-color-placeholder: @gray-light;
148
187
 
188
+ //** Default `.form-control` height
149
189
  @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
150
- @input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
190
+ //** Large `.form-control` height
191
+ @input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
192
+ //** Small `.form-control` height
151
193
  @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
152
194
 
153
195
  @legend-color: @gray-dark;
154
196
  @legend-border-color: #e5e5e5;
155
197
 
198
+ //** Background color for textual input addons
156
199
  @input-group-addon-bg: @gray-lighter;
200
+ //** Border color for textual input addons
157
201
  @input-group-addon-border-color: @input-border;
158
202
 
159
203
 
160
- // Dropdowns
161
- // -------------------------
204
+ //== Dropdowns
205
+ //
206
+ //## Dropdown menu container and contents.
162
207
 
208
+ //** Background for the dropdown menu.
163
209
  @dropdown-bg: #fff;
210
+ //** Dropdown menu `border-color`.
164
211
  @dropdown-border: rgba(0,0,0,.15);
212
+ //** Dropdown menu `border-color` **for IE8**.
165
213
  @dropdown-fallback-border: #ccc;
214
+ //** Divider color for between dropdown items.
166
215
  @dropdown-divider-bg: #e5e5e5;
167
216
 
168
- @dropdown-link-active-color: #fff;
169
- @dropdown-link-active-bg: @component-active-bg;
170
-
217
+ //** Dropdown link text color.
171
218
  @dropdown-link-color: @gray-dark;
172
- @dropdown-link-hover-color: #fff;
173
- @dropdown-link-hover-bg: @dropdown-link-active-bg;
219
+ //** Hover color for dropdown links.
220
+ @dropdown-link-hover-color: darken(@gray-dark, 5%);
221
+ //** Hover background for dropdown links.
222
+ @dropdown-link-hover-bg: #f5f5f5;
223
+
224
+ //** Active dropdown menu item text color.
225
+ @dropdown-link-active-color: @component-active-color;
226
+ //** Active dropdown menu item background color.
227
+ @dropdown-link-active-bg: @component-active-bg;
174
228
 
229
+ //** Disabled dropdown menu item background color.
175
230
  @dropdown-link-disabled-color: @gray-light;
176
231
 
232
+ //** Text color for headers within dropdown menus.
177
233
  @dropdown-header-color: @gray-light;
178
234
 
235
+ // Note: Deprecated @dropdown-caret-color as of v3.1.0
179
236
  @dropdown-caret-color: #000;
180
237
 
181
238
 
182
- // COMPONENT VARIABLES
183
- // --------------------------------------------------
184
-
185
-
186
- // Z-index master list
187
- // -------------------------
188
- // Used for a bird's eye view of components dependent on the z-axis
189
- // Try to avoid customizing these :)
239
+ //-- Z-index master list
240
+ //
241
+ // Warning: Avoid customizing these values. They're used for a bird's eye view
242
+ // of components dependent on the z-axis and are designed to all work together.
243
+ //
244
+ // Note: These variables are not generated into the Customizer.
190
245
 
191
246
  @zindex-navbar: 1000;
192
247
  @zindex-dropdown: 1000;
@@ -196,54 +251,71 @@
196
251
  @zindex-modal-background: 1040;
197
252
  @zindex-modal: 1050;
198
253
 
199
- // Media queries breakpoints
200
- // --------------------------------------------------
254
+
255
+ //== Media queries breakpoints
256
+ //
257
+ //## Define the breakpoints at which your layout will change, adapting to different screen sizes.
201
258
 
202
259
  // Extra small screen / phone
260
+ // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
203
261
  @screen-xs: 480px;
204
- @screen-phone: @screen-xs;
262
+ @screen-xs-min: @screen-xs;
263
+ @screen-phone: @screen-xs-min;
205
264
 
206
265
  // Small screen / tablet
266
+ // Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
207
267
  @screen-sm: 768px;
208
- @screen-tablet: @screen-sm;
268
+ @screen-sm-min: @screen-sm;
269
+ @screen-tablet: @screen-sm-min;
209
270
 
210
271
  // Medium screen / desktop
272
+ // Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
211
273
  @screen-md: 992px;
212
- @screen-desktop: @screen-md;
274
+ @screen-md-min: @screen-md;
275
+ @screen-desktop: @screen-md-min;
213
276
 
214
277
  // Large screen / wide desktop
278
+ // Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
215
279
  @screen-lg: 1200px;
216
- @screen-lg-desktop: @screen-lg;
280
+ @screen-lg-min: @screen-lg;
281
+ @screen-lg-desktop: @screen-lg-min;
217
282
 
218
283
  // So media queries don't overlap when required, provide a maximum
219
- @screen-xs-max: (@screen-sm - 1);
220
- @screen-sm-max: (@screen-md - 1);
221
- @screen-md-max: (@screen-lg - 1);
284
+ @screen-xs-max: (@screen-sm-min - 1);
285
+ @screen-sm-max: (@screen-md-min - 1);
286
+ @screen-md-max: (@screen-lg-min - 1);
222
287
 
223
288
 
224
- // Grid system
225
- // --------------------------------------------------
289
+ //== Grid system
290
+ //
291
+ //## Define your custom responsive grid.
226
292
 
227
- // Number of columns in the grid system
293
+ //** Number of columns in the grid.
228
294
  @grid-columns: 12;
229
- // Padding, to be divided by two and applied to the left and right of all columns
295
+ //** Padding between columns. Gets divided in half for the left and right.
230
296
  @grid-gutter-width: 30px;
231
- // Point at which the navbar stops collapsing
232
- @grid-float-breakpoint: @screen-tablet;
297
+ // Navbar collapse
298
+ //** Point at which the navbar becomes uncollapsed.
299
+ @grid-float-breakpoint: @screen-sm-min;
300
+ //** Point at which the navbar begins collapsing.
301
+ @grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
233
302
 
234
303
 
235
- // Navbar
236
- // -------------------------
304
+ //== Navbar
305
+ //
306
+ //##
237
307
 
238
308
  // Basics of a navbar
239
309
  @navbar-height: 50px;
240
310
  @navbar-margin-bottom: @line-height-computed;
311
+ @navbar-border-radius: @border-radius-base;
312
+ @navbar-padding-horizontal: floor((@grid-gutter-width / 2));
313
+ @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
314
+ @navbar-collapse-max-height: 340px;
315
+
241
316
  @navbar-default-color: #777;
242
317
  @navbar-default-bg: #f8f8f8;
243
318
  @navbar-default-border: darken(@navbar-default-bg, 6.5%);
244
- @navbar-border-radius: @border-radius-base;
245
- @navbar-padding-horizontal: floor(@grid-gutter-width / 2);
246
- @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
247
319
 
248
320
  // Navbar links
249
321
  @navbar-default-link-color: #777;
@@ -256,17 +328,16 @@
256
328
 
257
329
  // Navbar brand label
258
330
  @navbar-default-brand-color: @navbar-default-link-color;
259
- @navbar-default-brand-hover-color: darken(@navbar-default-link-color, 10%);
331
+ @navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);
260
332
  @navbar-default-brand-hover-bg: transparent;
261
333
 
262
334
  // Navbar toggle
263
335
  @navbar-default-toggle-hover-bg: #ddd;
264
- @navbar-default-toggle-icon-bar-bg: #ccc;
336
+ @navbar-default-toggle-icon-bar-bg: #888;
265
337
  @navbar-default-toggle-border-color: #ddd;
266
338
 
267
339
 
268
340
  // Inverted navbar
269
- //
270
341
  // Reset inverted navbar basics
271
342
  @navbar-inverse-color: @gray-light;
272
343
  @navbar-inverse-bg: #222;
@@ -286,22 +357,17 @@
286
357
  @navbar-inverse-brand-hover-color: #fff;
287
358
  @navbar-inverse-brand-hover-bg: transparent;
288
359
 
289
- // Inverted navbar search
290
- // Normal navbar needs no special styles or vars
291
- @navbar-inverse-search-bg: lighten(@navbar-inverse-bg, 25%);
292
- @navbar-inverse-search-bg-focus: #fff;
293
- @navbar-inverse-search-border: @navbar-inverse-bg;
294
- @navbar-inverse-search-placeholder-color: #ccc;
295
-
296
360
  // Inverted navbar toggle
297
361
  @navbar-inverse-toggle-hover-bg: #333;
298
362
  @navbar-inverse-toggle-icon-bar-bg: #fff;
299
363
  @navbar-inverse-toggle-border-color: #333;
300
364
 
301
365
 
302
- // Navs
303
- // -------------------------
366
+ //== Navs
367
+ //
368
+ //##
304
369
 
370
+ //=== Shared nav styles
305
371
  @nav-link-padding: 10px 15px;
306
372
  @nav-link-hover-bg: @gray-lighter;
307
373
 
@@ -309,9 +375,8 @@
309
375
  @nav-disabled-link-hover-color: @gray-light;
310
376
 
311
377
  @nav-open-link-hover-color: #fff;
312
- @nav-open-caret-border-color: #fff;
313
378
 
314
- // Tabs
379
+ //== Tabs
315
380
  @nav-tabs-border-color: #ddd;
316
381
 
317
382
  @nav-tabs-link-hover-border-color: @gray-lighter;
@@ -323,121 +388,188 @@
323
388
  @nav-tabs-justified-link-border-color: #ddd;
324
389
  @nav-tabs-justified-active-link-border-color: @body-bg;
325
390
 
326
- // Pills
391
+ //== Pills
392
+ @nav-pills-border-radius: @border-radius-base;
327
393
  @nav-pills-active-link-hover-bg: @component-active-bg;
328
- @nav-pills-active-link-hover-color: #fff;
394
+ @nav-pills-active-link-hover-color: @component-active-color;
329
395
 
330
396
 
331
- // Pagination
332
- // -------------------------
397
+ //== Pagination
398
+ //
399
+ //##
333
400
 
401
+ @pagination-color: @link-color;
334
402
  @pagination-bg: #fff;
335
403
  @pagination-border: #ddd;
336
404
 
405
+ @pagination-hover-color: @link-hover-color;
337
406
  @pagination-hover-bg: @gray-lighter;
407
+ @pagination-hover-border: #ddd;
338
408
 
339
- @pagination-active-bg: @brand-primary;
340
409
  @pagination-active-color: #fff;
410
+ @pagination-active-bg: @brand-primary;
411
+ @pagination-active-border: @brand-primary;
341
412
 
342
413
  @pagination-disabled-color: @gray-light;
414
+ @pagination-disabled-bg: #fff;
415
+ @pagination-disabled-border: #ddd;
343
416
 
344
417
 
345
- // Pager
346
- // -------------------------
418
+ //== Pager
419
+ //
420
+ //##
347
421
 
422
+ @pager-bg: @pagination-bg;
423
+ @pager-border: @pagination-border;
348
424
  @pager-border-radius: 15px;
349
- @pager-disabled-color: @gray-light;
350
425
 
426
+ @pager-hover-bg: @pagination-hover-bg;
427
+
428
+ @pager-active-bg: @pagination-active-bg;
429
+ @pager-active-color: @pagination-active-color;
430
+
431
+ @pager-disabled-color: @pagination-disabled-color;
351
432
 
352
- // Jumbotron
353
- // -------------------------
433
+
434
+ //== Jumbotron
435
+ //
436
+ //##
354
437
 
355
438
  @jumbotron-padding: 30px;
356
439
  @jumbotron-color: inherit;
357
440
  @jumbotron-bg: @gray-lighter;
358
-
359
441
  @jumbotron-heading-color: inherit;
442
+ @jumbotron-font-size: ceil((@font-size-base * 1.5));
360
443
 
361
444
 
362
- // Form states and alerts
363
- // -------------------------
364
-
365
- @state-warning-text: #c09853;
366
- @state-warning-bg: #fcf8e3;
367
- @state-warning-border: darken(spin(@state-warning-bg, -10), 3%);
368
-
369
- @state-danger-text: #b94a48;
370
- @state-danger-bg: #f2dede;
371
- @state-danger-border: darken(spin(@state-danger-bg, -10), 3%);
445
+ //== Form states and alerts
446
+ //
447
+ //## Define colors for form feedback states and, by default, alerts.
372
448
 
373
- @state-success-text: #468847;
449
+ @state-success-text: #3c763d;
374
450
  @state-success-bg: #dff0d8;
375
451
  @state-success-border: darken(spin(@state-success-bg, -10), 5%);
376
452
 
377
- @state-info-text: #3a87ad;
453
+ @state-info-text: #31708f;
378
454
  @state-info-bg: #d9edf7;
379
455
  @state-info-border: darken(spin(@state-info-bg, -10), 7%);
380
456
 
457
+ @state-warning-text: #8a6d3b;
458
+ @state-warning-bg: #fcf8e3;
459
+ @state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
460
+
461
+ @state-danger-text: #a94442;
462
+ @state-danger-bg: #f2dede;
463
+ @state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
381
464
 
382
- // Tooltips
383
- // -------------------------
465
+
466
+ //== Tooltips
467
+ //
468
+ //##
469
+
470
+ //** Tooltip max width
384
471
  @tooltip-max-width: 200px;
472
+ //** Tooltip text color
385
473
  @tooltip-color: #fff;
474
+ //** Tooltip background color
386
475
  @tooltip-bg: #000;
476
+ @tooltip-opacity: .9;
387
477
 
478
+ //** Tooltip arrow width
388
479
  @tooltip-arrow-width: 5px;
480
+ //** Tooltip arrow color
389
481
  @tooltip-arrow-color: @tooltip-bg;
390
482
 
391
483
 
392
- // Popovers
393
- // -------------------------
484
+ //== Popovers
485
+ //
486
+ //##
487
+
488
+ //** Popover body background color
394
489
  @popover-bg: #fff;
490
+ //** Popover maximum width
395
491
  @popover-max-width: 276px;
492
+ //** Popover border color
396
493
  @popover-border-color: rgba(0,0,0,.2);
494
+ //** Popover fallback border color
397
495
  @popover-fallback-border-color: #ccc;
398
496
 
497
+ //** Popover title background color
399
498
  @popover-title-bg: darken(@popover-bg, 3%);
400
499
 
500
+ //** Popover arrow width
401
501
  @popover-arrow-width: 10px;
502
+ //** Popover arrow color
402
503
  @popover-arrow-color: #fff;
403
504
 
505
+ //** Popover outer arrow width
404
506
  @popover-arrow-outer-width: (@popover-arrow-width + 1);
507
+ //** Popover outer arrow color
405
508
  @popover-arrow-outer-color: rgba(0,0,0,.25);
509
+ //** Popover outer arrow fallback color
406
510
  @popover-arrow-outer-fallback-color: #999;
407
511
 
408
512
 
409
- // Labels
410
- // -------------------------
513
+ //== Labels
514
+ //
515
+ //##
411
516
 
517
+ //** Default label background color
412
518
  @label-default-bg: @gray-light;
519
+ //** Primary label background color
413
520
  @label-primary-bg: @brand-primary;
521
+ //** Success label background color
414
522
  @label-success-bg: @brand-success;
523
+ //** Info label background color
415
524
  @label-info-bg: @brand-info;
525
+ //** Warning label background color
416
526
  @label-warning-bg: @brand-warning;
527
+ //** Danger label background color
417
528
  @label-danger-bg: @brand-danger;
418
529
 
530
+ //** Default label text color
419
531
  @label-color: #fff;
532
+ //** Default text color of a linked label
420
533
  @label-link-hover-color: #fff;
421
534
 
422
535
 
423
- // Modals
424
- // -------------------------
536
+ //== Modals
537
+ //
538
+ //##
539
+
540
+ //** Padding applied to the modal body
425
541
  @modal-inner-padding: 20px;
426
542
 
543
+ //** Padding applied to the modal title
427
544
  @modal-title-padding: 15px;
545
+ //** Modal title line-height
428
546
  @modal-title-line-height: @line-height-base;
429
547
 
548
+ //** Background color of modal content area
430
549
  @modal-content-bg: #fff;
550
+ //** Modal content border color
431
551
  @modal-content-border-color: rgba(0,0,0,.2);
552
+ //** Modal content border color **for IE8**
432
553
  @modal-content-fallback-border-color: #999;
433
554
 
555
+ //** Modal backdrop background color
434
556
  @modal-backdrop-bg: #000;
557
+ //** Modal backdrop opacity
558
+ @modal-backdrop-opacity: .5;
559
+ //** Modal header border color
435
560
  @modal-header-border-color: #e5e5e5;
561
+ //** Modal footer border color
436
562
  @modal-footer-border-color: @modal-header-border-color;
437
563
 
564
+ @modal-lg: 900px;
565
+ @modal-md: 600px;
566
+ @modal-sm: 300px;
567
+
568
+
569
+ //== Alerts
570
+ //
571
+ //## Define alert colors, border radius, and padding.
438
572
 
439
- // Alerts
440
- // -------------------------
441
573
  @alert-padding: 15px;
442
574
  @alert-border-radius: @border-radius-base;
443
575
  @alert-link-font-weight: bold;
@@ -459,38 +591,62 @@
459
591
  @alert-danger-border: @state-danger-border;
460
592
 
461
593
 
462
- // Progress bars
463
- // -------------------------
594
+ //== Progress bars
595
+ //
596
+ //##
597
+
598
+ //** Background color of the whole progress component
464
599
  @progress-bg: #f5f5f5;
600
+ //** Progress bar text color
465
601
  @progress-bar-color: #fff;
466
602
 
603
+ //** Default progress bar color
467
604
  @progress-bar-bg: @brand-primary;
605
+ //** Success progress bar color
468
606
  @progress-bar-success-bg: @brand-success;
607
+ //** Warning progress bar color
469
608
  @progress-bar-warning-bg: @brand-warning;
609
+ //** Danger progress bar color
470
610
  @progress-bar-danger-bg: @brand-danger;
611
+ //** Info progress bar color
471
612
  @progress-bar-info-bg: @brand-info;
472
613
 
473
614
 
474
- // List group
475
- // -------------------------
476
- @list-group-bg: #fff;
477
- @list-group-border: #ddd;
478
- @list-group-border-radius: @border-radius-base;
479
-
480
- @list-group-hover-bg: #f5f5f5;
481
- @list-group-active-color: #fff;
482
- @list-group-active-bg: @component-active-bg;
483
- @list-group-active-border: @list-group-active-bg;
484
-
485
- @list-group-link-color: #555;
486
- @list-group-link-heading-color: #333;
487
-
615
+ //== List group
616
+ //
617
+ //##
618
+
619
+ //** Background color on `.list-group-item`
620
+ @list-group-bg: #fff;
621
+ //** `.list-group-item` border color
622
+ @list-group-border: #ddd;
623
+ //** List group border radius
624
+ @list-group-border-radius: @border-radius-base;
625
+
626
+ //** Background color of single list elements on hover
627
+ @list-group-hover-bg: #f5f5f5;
628
+ //** Text color of active list elements
629
+ @list-group-active-color: @component-active-color;
630
+ //** Background color of active list elements
631
+ @list-group-active-bg: @component-active-bg;
632
+ //** Border color of active list elements
633
+ @list-group-active-border: @list-group-active-bg;
634
+ @list-group-active-text-color: lighten(@list-group-active-bg, 40%);
635
+
636
+ @list-group-link-color: #555;
637
+ @list-group-link-heading-color: #333;
638
+
639
+
640
+ //== Panels
641
+ //
642
+ //##
488
643
 
489
- // Panels
490
- // -------------------------
491
644
  @panel-bg: #fff;
492
- @panel-inner-border: #ddd;
645
+ @panel-body-padding: 15px;
493
646
  @panel-border-radius: @border-radius-base;
647
+
648
+ //** Border color for elements within panels
649
+ @panel-inner-border: #ddd;
494
650
  @panel-footer-bg: #f5f5f5;
495
651
 
496
652
  @panel-default-text: @gray-dark;
@@ -505,6 +661,10 @@
505
661
  @panel-success-border: @state-success-border;
506
662
  @panel-success-heading-bg: @state-success-bg;
507
663
 
664
+ @panel-info-text: @state-info-text;
665
+ @panel-info-border: @state-info-border;
666
+ @panel-info-heading-bg: @state-info-bg;
667
+
508
668
  @panel-warning-text: @state-warning-text;
509
669
  @panel-warning-border: @state-warning-border;
510
670
  @panel-warning-heading-bg: @state-warning-bg;
@@ -513,34 +673,46 @@
513
673
  @panel-danger-border: @state-danger-border;
514
674
  @panel-danger-heading-bg: @state-danger-bg;
515
675
 
516
- @panel-info-text: @state-info-text;
517
- @panel-info-border: @state-info-border;
518
- @panel-info-heading-bg: @state-info-bg;
519
676
 
677
+ //== Thumbnails
678
+ //
679
+ //##
520
680
 
521
- // Thumbnails
522
- // -------------------------
681
+ //** Padding around the thumbnail image
523
682
  @thumbnail-padding: 4px;
683
+ //** Thumbnail background color
524
684
  @thumbnail-bg: @body-bg;
685
+ //** Thumbnail border color
525
686
  @thumbnail-border: #ddd;
687
+ //** Thumbnail border radius
526
688
  @thumbnail-border-radius: @border-radius-base;
527
689
 
690
+ //** Custom text color for thumbnail captions
528
691
  @thumbnail-caption-color: @text-color;
692
+ //** Padding around the thumbnail caption
529
693
  @thumbnail-caption-padding: 9px;
530
694
 
531
695
 
532
- // Wells
533
- // -------------------------
696
+ //== Wells
697
+ //
698
+ //##
699
+
534
700
  @well-bg: #f5f5f5;
701
+ @well-border: darken(@well-bg, 7%);
535
702
 
536
703
 
537
- // Badges
538
- // -------------------------
704
+ //== Badges
705
+ //
706
+ //##
707
+
539
708
  @badge-color: #fff;
709
+ //** Linked badge text color on hover
540
710
  @badge-link-hover-color: #fff;
541
711
  @badge-bg: @gray-light;
542
712
 
713
+ //** Badge text color in active nav link
543
714
  @badge-active-color: @link-color;
715
+ //** Badge background color in active nav link
544
716
  @badge-active-bg: #fff;
545
717
 
546
718
  @badge-font-weight: bold;
@@ -548,15 +720,25 @@
548
720
  @badge-border-radius: 10px;
549
721
 
550
722
 
551
- // Breadcrumbs
552
- // -------------------------
553
- @breadcrumb-bg: #f5f5f5;
554
- @breadcrumb-color: #ccc;
555
- @breadcrumb-active-color: @gray-light;
723
+ //== Breadcrumbs
724
+ //
725
+ //##
726
+
727
+ @breadcrumb-padding-vertical: 8px;
728
+ @breadcrumb-padding-horizontal: 15px;
729
+ //** Breadcrumb background color
730
+ @breadcrumb-bg: #f5f5f5;
731
+ //** Breadcrumb text color
732
+ @breadcrumb-color: #ccc;
733
+ //** Text color of current page in the breadcrumb
734
+ @breadcrumb-active-color: @gray-light;
735
+ //** Textual separator for between breadcrumb elements
736
+ @breadcrumb-separator: "/";
556
737
 
557
738
 
558
- // Carousel
559
- // ------------------------
739
+ //== Carousel
740
+ //
741
+ //##
560
742
 
561
743
  @carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
562
744
 
@@ -571,50 +753,75 @@
571
753
  @carousel-caption-color: #fff;
572
754
 
573
755
 
574
- // Close
575
- // ------------------------
576
- @close-color: #000;
756
+ //== Close
757
+ //
758
+ //##
759
+
577
760
  @close-font-weight: bold;
761
+ @close-color: #000;
578
762
  @close-text-shadow: 0 1px 0 #fff;
579
763
 
580
764
 
581
- // Code
582
- // ------------------------
765
+ //== Code
766
+ //
767
+ //##
768
+
583
769
  @code-color: #c7254e;
584
770
  @code-bg: #f9f2f4;
585
771
 
772
+ @kbd-color: #fff;
773
+ @kbd-bg: #333;
774
+
586
775
  @pre-bg: #f5f5f5;
587
776
  @pre-color: @gray-dark;
588
777
  @pre-border-color: #ccc;
589
778
  @pre-scrollable-max-height: 340px;
590
779
 
591
- // Type
592
- // ------------------------
780
+
781
+ //== Type
782
+ //
783
+ //##
784
+
785
+ //** Text muted color
593
786
  @text-muted: @gray-light;
787
+ //** Abbreviations and acronyms border color
594
788
  @abbr-border-color: @gray-light;
789
+ //** Headings small color
595
790
  @headings-small-color: @gray-light;
791
+ //** Blockquote small color
596
792
  @blockquote-small-color: @gray-light;
793
+ //** Blockquote border color
597
794
  @blockquote-border-color: @gray-lighter;
795
+ //** Page header border color
598
796
  @page-header-border-color: @gray-lighter;
599
797
 
600
- // Miscellaneous
601
- // -------------------------
602
798
 
603
- // Hr border color
799
+ //== Miscellaneous
800
+ //
801
+ //##
802
+
803
+ //** Horizontal line color.
604
804
  @hr-border: @gray-lighter;
605
805
 
606
- // Horizontal forms & lists
806
+ //** Horizontal offset for forms and lists.
607
807
  @component-offset-horizontal: 180px;
608
808
 
609
809
 
610
- // Container sizes
611
- // --------------------------------------------------
810
+ //== Container sizes
811
+ //
812
+ //## Define the maximum width of `.container` for different screen sizes.
612
813
 
613
814
  // Small screen / tablet
614
- @container-tablet: ((720px + @grid-gutter-width));
815
+ @container-tablet: ((720px + @grid-gutter-width));
816
+ //** For `@screen-sm-min` and up.
817
+ @container-sm: @container-tablet;
615
818
 
616
819
  // Medium screen / desktop
617
- @container-desktop: ((940px + @grid-gutter-width));
820
+ @container-desktop: ((940px + @grid-gutter-width));
821
+ //** For `@screen-md-min` and up.
822
+ @container-md: @container-desktop;
618
823
 
619
824
  // Large screen / wide desktop
620
- @container-lg-desktop: ((1140px + @grid-gutter-width));
825
+ @container-large-desktop: ((1140px + @grid-gutter-width));
826
+ //** For `@screen-lg-min` and up.
827
+ @container-lg: @container-large-desktop;