|
1 | | -// Cyborg 3.2.0 |
| 1 | +// Cyborg 3.3.1 |
2 | 2 | // Variables |
3 | 3 | // -------------------------------------------------- |
4 | 4 |
|
|
7 | 7 | // |
8 | 8 | //## Gray and brand colors for use across Bootstrap. |
9 | 9 |
|
| 10 | +@gray-base: #000; |
10 | 11 | @gray-darker: #222; // #222 |
11 | 12 | @gray-dark: #282828; // #333 |
12 | 13 | @gray: #555; // #555 |
|
33 | 34 | @link-color: @brand-primary; |
34 | 35 | //** Link hover color set via `darken()` function. |
35 | 36 | @link-hover-color: @link-color; |
| 37 | +//** Link hover decoration. |
| 38 | +@link-hover-decoration: underline; |
36 | 39 |
|
37 | 40 |
|
38 | 41 | //== Typography |
39 | 42 | // |
40 | 43 | //## Font, line-height, and color for body text, headings, and more. |
41 | 44 |
|
42 | | -@font-family-sans-serif: "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; |
| 45 | +@font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; |
43 | 46 | @font-family-serif: Georgia, "Times New Roman", Times, serif; |
44 | 47 | //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`. |
45 | 48 | @font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; |
|
49 | 52 | @font-size-large: ceil((@font-size-base * 1.25)); // ~18px |
50 | 53 | @font-size-small: ceil((@font-size-base * 0.85)); // ~12px |
51 | 54 |
|
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 |
| 55 | +@font-size-h1: 56px; |
| 56 | +@font-size-h2: 45px; |
| 57 | +@font-size-h3: 34px; |
| 58 | +@font-size-h4: 24px; |
| 59 | +@font-size-h5: 20px; |
| 60 | +@font-size-h6: 16px; |
58 | 61 |
|
59 | 62 | //** Unit-less `line-height` for use in components like buttons. |
60 | 63 | @line-height-base: 1.428571429; // 20/14 |
|
181 | 184 | @input-color: @text-color; |
182 | 185 | //** `<input>` border color |
183 | 186 | @input-border: @gray-dark; |
184 | | -//** `<input>` border radius |
| 187 | + |
| 188 | +// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4 |
| 189 | +//** Default `.form-control` border radius |
185 | 190 | @input-border-radius: @border-radius-base; |
| 191 | +//** Large `.form-control` border radius |
| 192 | +@input-border-radius-large: @border-radius-large; |
| 193 | +//** Small `.form-control` border radius |
| 194 | +@input-border-radius-small: @border-radius-small; |
| 195 | + |
186 | 196 | //** Border color for inputs on focus |
187 | 197 | @input-border-focus: #66afe9; |
188 | 198 |
|
|
204 | 214 | //** Border color for textual input addons |
205 | 215 | @input-group-addon-border-color: @input-border; |
206 | 216 |
|
| 217 | +//** Disabled cursor for form controls and buttons. |
| 218 | +@cursor-disabled: not-allowed; |
| 219 | + |
207 | 220 |
|
208 | 221 | //== Dropdowns |
209 | 222 | // |
|
223 | 236 | //** Hover color for dropdown links. |
224 | 237 | @dropdown-link-hover-color: #fff; |
225 | 238 | //** Hover background for dropdown links. |
226 | | -@dropdown-link-hover-bg: @dropdown-link-active-bg; |
| 239 | +@dropdown-link-hover-bg: @component-active-bg; |
227 | 240 |
|
228 | 241 | //** Active dropdown menu item text color. |
229 | 242 | @dropdown-link-active-color: #fff; |
230 | 243 | //** Active dropdown menu item background color. |
231 | 244 | @dropdown-link-active-bg: @component-active-bg; |
232 | 245 |
|
233 | 246 | //** Disabled dropdown menu item background color. |
234 | | -@dropdown-link-disabled-color: @text-muted; |
| 247 | +@dropdown-link-disabled-color: @gray-light; |
235 | 248 |
|
236 | 249 | //** Text color for headers within dropdown menus. |
237 | | -@dropdown-header-color: @text-muted; |
| 250 | +@dropdown-header-color: @gray-light; |
238 | 251 |
|
239 | 252 | //** Deprecated `@dropdown-caret-color` as of v3.1.0 |
240 | 253 | @dropdown-caret-color: #000; |
|
252 | 265 | @zindex-popover: 1060; |
253 | 266 | @zindex-tooltip: 1070; |
254 | 267 | @zindex-navbar-fixed: 1030; |
255 | | -@zindex-modal-background: 1040; |
256 | | -@zindex-modal: 1050; |
| 268 | +@zindex-modal: 1040; |
257 | 269 |
|
258 | 270 |
|
259 | 271 | //== Media queries breakpoints |
|
315 | 327 | //## Define the maximum width of `.container` for different screen sizes. |
316 | 328 |
|
317 | 329 | // Small screen / tablet |
318 | | -@container-tablet: ((720px + @grid-gutter-width)); |
| 330 | +@container-tablet: (720px + @grid-gutter-width); |
319 | 331 | //** For `@screen-sm-min` and up. |
320 | 332 | @container-sm: @container-tablet; |
321 | 333 |
|
322 | 334 | // Medium screen / desktop |
323 | | -@container-desktop: ((940px + @grid-gutter-width)); |
| 335 | +@container-desktop: (940px + @grid-gutter-width); |
324 | 336 | //** For `@screen-md-min` and up. |
325 | 337 | @container-md: @container-desktop; |
326 | 338 |
|
327 | 339 | // Large screen / wide desktop |
328 | | -@container-large-desktop: ((1140px + @grid-gutter-width)); |
| 340 | +@container-large-desktop: (1140px + @grid-gutter-width); |
329 | 341 | //** For `@screen-lg-min` and up. |
330 | 342 | @container-lg: @container-large-desktop; |
331 | 343 |
|
|
344 | 356 |
|
345 | 357 | @navbar-default-color: @text-color; |
346 | 358 | @navbar-default-bg: @body-bg; |
347 | | -@navbar-default-border: darken(@navbar-default-bg, 6.5%); |
| 359 | +@navbar-default-border: @gray-dark; |
348 | 360 |
|
349 | 361 | // Navbar links |
350 | 362 | @navbar-default-link-color: @text-color; |
|
403 | 415 | @nav-disabled-link-color: @gray-light; |
404 | 416 | @nav-disabled-link-hover-color: @gray-light; |
405 | 417 |
|
406 | | -@nav-open-link-hover-color: @gray-darker; |
407 | | - |
408 | 418 | //== Tabs |
409 | 419 | @nav-tabs-border-color: @gray-dark; |
410 | 420 |
|
|
628 | 638 | @progress-bg: @gray-darker; |
629 | 639 | //** Progress bar text color |
630 | 640 | @progress-bar-color: #fff; |
| 641 | +//** Variable for setting rounded corners on progress bar. |
| 642 | +@progress-border-radius: @border-radius-base; |
631 | 643 |
|
632 | 644 | //** Default progress bar color |
633 | 645 | @progress-bar-bg: @brand-primary; |
|
687 | 699 |
|
688 | 700 | //** Border color for elements within panels |
689 | 701 | @panel-inner-border: @gray-dark; |
690 | | -@panel-footer-bg: @panel-default-heading-bg; |
| 702 | +@panel-footer-bg: lighten(@gray-darker, 10%); |
691 | 703 |
|
692 | 704 | @panel-default-text: @text-color; |
693 | 705 | @panel-default-border: @panel-inner-border; |
694 | | -@panel-default-heading-bg: lighten(@gray-darker, 10%); |
| 706 | +@panel-default-heading-bg: @panel-footer-bg; |
695 | 707 |
|
696 | 708 | @panel-primary-text: #fff; |
697 | 709 | @panel-primary-border: @brand-primary; |
|
842 | 854 | @dl-horizontal-offset: @component-offset-horizontal; |
843 | 855 | //** Horizontal line color. |
844 | 856 | @hr-border: @gray-dark; |
845 | | - |
846 | | - |
|
0 commit comments