|
1 |
| -// Amelia 3.0.0 |
| 1 | +// Amelia 3.0.2 |
2 | 2 | // Variables
|
3 | 3 | // --------------------------------------------------
|
4 | 4 |
|
|
48 | 48 | @font-size-large: ceil(@font-size-base * 1.25); // ~18px
|
49 | 49 | @font-size-small: ceil(@font-size-base * 0.85); // ~12px
|
50 | 50 |
|
| 51 | +@font-size-h1: floor(@font-size-base * 2.6); // ~36px |
| 52 | +@font-size-h2: floor(@font-size-base * 2.15); // ~30px |
| 53 | +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px |
| 54 | +@font-size-h4: ceil(@font-size-base * 1.25); // ~18px |
| 55 | +@font-size-h5: @font-size-base; |
| 56 | +@font-size-h6: ceil(@font-size-base * 0.85); // ~12px |
| 57 | + |
51 | 58 | @line-height-base: 1.428571429; // 20/14
|
52 | 59 | @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
|
53 | 60 |
|
54 |
| -@headings-font-family: @font-family-base; |
| 61 | +@headings-font-family: 'Lobster', cursive; |
55 | 62 | @headings-font-weight: 500;
|
56 | 63 | @headings-line-height: 1.1;
|
| 64 | +@headings-color: inherit; |
| 65 | + |
57 | 66 |
|
58 | 67 | // Iconography
|
59 | 68 | // -------------------------
|
|
82 | 91 | @border-radius-large: 6px;
|
83 | 92 | @border-radius-small: 3px;
|
84 | 93 |
|
| 94 | +@component-active-color: #fff; |
85 | 95 | @component-active-bg: lighten(@body-bg, 10%);
|
86 | 96 |
|
87 | 97 | @caret-width-base: 4px;
|
|
165 | 175 | @dropdown-fallback-border: #ccc;
|
166 | 176 | @dropdown-divider-bg: #e5e5e5;
|
167 | 177 |
|
168 |
| -@dropdown-link-active-color: #fff; |
169 |
| -@dropdown-link-active-bg: @component-active-bg; |
170 |
| - |
171 | 178 | @dropdown-link-color: @gray-dark;
|
172 | 179 | @dropdown-link-hover-color: #fff;
|
173 | 180 | @dropdown-link-hover-bg: @dropdown-link-active-bg;
|
174 | 181 |
|
175 |
| -@dropdown-link-disabled-color: @text-muted; |
| 182 | +@dropdown-link-active-color: #fff; |
| 183 | +@dropdown-link-active-bg: @component-active-bg; |
| 184 | + |
| 185 | +@dropdown-link-disabled-color: @gray-lighter; |
176 | 186 |
|
177 | 187 | @dropdown-header-color: @text-muted;
|
178 | 188 |
|
|
200 | 210 | // --------------------------------------------------
|
201 | 211 |
|
202 | 212 | // Extra small screen / phone
|
| 213 | +// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 |
203 | 214 | @screen-xs: 480px;
|
204 |
| -@screen-phone: @screen-xs; |
| 215 | +@screen-xs-min: @screen-xs; |
| 216 | +@screen-phone: @screen-xs-min; |
205 | 217 |
|
206 | 218 | // Small screen / tablet
|
| 219 | +// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 |
207 | 220 | @screen-sm: 768px;
|
208 |
| -@screen-tablet: @screen-sm; |
| 221 | +@screen-sm-min: @screen-sm; |
| 222 | +@screen-tablet: @screen-sm-min; |
209 | 223 |
|
210 | 224 | // Medium screen / desktop
|
| 225 | +// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 |
211 | 226 | @screen-md: 992px;
|
212 |
| -@screen-desktop: @screen-md; |
| 227 | +@screen-md-min: @screen-md; |
| 228 | +@screen-desktop: @screen-md-min; |
213 | 229 |
|
214 | 230 | // Large screen / wide desktop
|
| 231 | +// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 |
215 | 232 | @screen-lg: 1200px;
|
216 |
| -@screen-lg-desktop: @screen-lg; |
| 233 | +@screen-lg-min: @screen-lg; |
| 234 | +@screen-lg-desktop: @screen-lg-min; |
217 | 235 |
|
218 | 236 | // 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); |
| 237 | +@screen-xs-max: (@screen-sm-min - 1); |
| 238 | +@screen-sm-max: (@screen-md-min - 1); |
| 239 | +@screen-md-max: (@screen-lg-min - 1); |
222 | 240 |
|
223 | 241 |
|
224 | 242 | // Grid system
|
|
229 | 247 | // Padding, to be divided by two and applied to the left and right of all columns
|
230 | 248 | @grid-gutter-width: 30px;
|
231 | 249 | // Point at which the navbar stops collapsing
|
232 |
| -@grid-float-breakpoint: @screen-tablet; |
| 250 | +@grid-float-breakpoint: @screen-sm-min; |
233 | 251 |
|
234 | 252 |
|
235 | 253 | // Navbar
|
|
238 | 256 | // Basics of a navbar
|
239 | 257 | @navbar-height: 50px;
|
240 | 258 | @navbar-margin-bottom: @line-height-computed;
|
241 |
| -@navbar-default-color: @gray-light; |
242 |
| -@navbar-default-bg: @brand-primary; |
243 |
| -@navbar-default-border: darken(@navbar-default-bg, 6.5%); |
244 | 259 | @navbar-border-radius: @border-radius-base;
|
245 | 260 | @navbar-padding-horizontal: floor(@grid-gutter-width / 2);
|
246 | 261 | @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
|
247 | 262 |
|
| 263 | +@navbar-default-color: @gray-light; |
| 264 | +@navbar-default-bg: @brand-primary; |
| 265 | +@navbar-default-border: darken(@navbar-default-bg, 6.5%); |
| 266 | + |
248 | 267 | // Navbar links
|
249 | 268 | @navbar-default-link-color: #fff;
|
250 | 269 | @navbar-default-link-hover-color: #fff;
|
|
286 | 305 | @navbar-inverse-brand-hover-color: #fff;
|
287 | 306 | @navbar-inverse-brand-hover-bg: none;
|
288 | 307 |
|
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 | 308 | // Inverted navbar toggle
|
297 | 309 | @navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg;
|
298 | 310 | @navbar-inverse-toggle-icon-bar-bg: #fff;
|
|
305 | 317 | @nav-link-padding: 10px 15px;
|
306 | 318 | @nav-link-hover-bg: lighten(@body-bg, 10%);
|
307 | 319 |
|
308 |
| -@nav-disabled-link-color: @gray-light; |
309 |
| -@nav-disabled-link-hover-color: @gray-light; |
| 320 | +@nav-disabled-link-color: @gray-lighter; |
| 321 | +@nav-disabled-link-hover-color: @gray-lighter; |
310 | 322 |
|
311 | 323 | @nav-open-link-hover-color: @nav-link-hover-bg;
|
312 | 324 | @nav-open-caret-border-color: @nav-link-hover-bg;
|
|
324 | 336 | @nav-tabs-justified-active-link-border-color: transparent;
|
325 | 337 |
|
326 | 338 | // Pills
|
| 339 | +@nav-pills-border-radius: @border-radius-base; |
327 | 340 | @nav-pills-active-link-hover-bg: @component-active-bg;
|
328 | 341 | @nav-pills-active-link-hover-color: #fff;
|
329 | 342 |
|
|
334 | 347 | @pagination-bg: lighten(@body-bg, 5%);
|
335 | 348 | @pagination-border: transparent;
|
336 | 349 |
|
337 |
| -@pagination-hover-bg: @gray-lighter; |
| 350 | +@pagination-hover-bg: @component-active-bg; |
338 | 351 |
|
339 | 352 | @pagination-active-bg: lighten(@body-bg, 10%);
|
340 | 353 | @pagination-active-color: #fff;
|
|
346 | 359 | // -------------------------
|
347 | 360 |
|
348 | 361 | @pager-border-radius: 15px;
|
349 |
| -@pager-disabled-color: #fff; |
| 362 | +@pager-disabled-color: @gray-lighter; |
350 | 363 |
|
351 | 364 |
|
352 | 365 | // Jumbotron
|
|
355 | 368 | @jumbotron-padding: 30px;
|
356 | 369 | @jumbotron-color: inherit;
|
357 | 370 | @jumbotron-bg: darken(@body-bg, 5%);
|
358 |
| - |
359 | 371 | @jumbotron-heading-color: inherit;
|
| 372 | +@jumbotron-font-size: ceil(@font-size-base * 1.5); |
360 | 373 |
|
361 | 374 |
|
362 | 375 | // Form states and alerts
|
363 | 376 | // -------------------------
|
364 | 377 |
|
365 |
| -@state-warning-text: #fff; |
366 |
| -@state-warning-bg: @brand-warning; |
367 |
| -@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); |
368 |
| - |
369 |
| -@state-danger-text: #fff; |
370 |
| -@state-danger-bg: @brand-danger; |
371 |
| -@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); |
372 |
| - |
373 | 378 | @state-success-text: #fff;
|
374 | 379 | @state-success-bg: @brand-success;
|
375 | 380 | @state-success-border: darken(spin(@state-success-bg, -10), 5%);
|
|
378 | 383 | @state-info-bg: @brand-info;
|
379 | 384 | @state-info-border: darken(spin(@state-info-bg, -10), 7%);
|
380 | 385 |
|
| 386 | +@state-warning-text: #fff; |
| 387 | +@state-warning-bg: @brand-warning; |
| 388 | +@state-warning-border: darken(spin(@state-warning-bg, -10), 3%); |
| 389 | + |
| 390 | +@state-danger-text: #fff; |
| 391 | +@state-danger-bg: @brand-danger; |
| 392 | +@state-danger-border: darken(spin(@state-danger-bg, -10), 3%); |
| 393 | + |
381 | 394 |
|
382 | 395 | // Tooltips
|
383 | 396 | // -------------------------
|
|
478 | 491 | @list-group-border-radius: @border-radius-base;
|
479 | 492 |
|
480 | 493 | @list-group-hover-bg: lighten(@body-bg, 10%);
|
481 |
| -@list-group-active-color: #fff; |
| 494 | +@list-group-active-color: @component-active-color; |
482 | 495 | @list-group-active-bg: @component-active-bg;
|
483 | 496 | @list-group-active-border: @list-group-border;
|
484 | 497 |
|
|
493 | 506 | @panel-border-radius: @border-radius-base;
|
494 | 507 | @panel-footer-bg: @panel-default-heading-bg;
|
495 | 508 |
|
496 |
| -@panel-default-text: @gray-dark; |
| 509 | +@panel-default-text: #fff; |
497 | 510 | @panel-default-border: darken(@body-bg, 5%);
|
498 | 511 | @panel-default-heading-bg: lighten(@body-bg, 15%);
|
499 | 512 |
|
|
551 | 564 | // Breadcrumbs
|
552 | 565 | // -------------------------
|
553 | 566 | @breadcrumb-bg: lighten(@body-bg, 5%);
|
554 |
| -@breadcrumb-color: #ccc; |
| 567 | +@breadcrumb-color: @gray-lighter; |
555 | 568 | @breadcrumb-active-color: #fff;
|
| 569 | +@breadcrumb-separator: "/"; |
556 | 570 |
|
557 | 571 |
|
558 | 572 | // Carousel
|
|
573 | 587 |
|
574 | 588 | // Close
|
575 | 589 | // ------------------------
|
576 |
| -@close-color: #000; |
577 | 590 | @close-font-weight: bold;
|
| 591 | +@close-color: #000; |
578 | 592 | @close-text-shadow: 0 1px 0 #fff;
|
579 | 593 |
|
580 | 594 |
|
|
611 | 625 | // --------------------------------------------------
|
612 | 626 |
|
613 | 627 | // Small screen / tablet
|
614 |
| -@container-tablet: ((720px + @grid-gutter-width)); |
| 628 | +@container-tablet: ((720px + @grid-gutter-width)); |
| 629 | +@container-sm: @container-tablet; |
615 | 630 |
|
616 | 631 | // Medium screen / desktop
|
617 |
| -@container-desktop: ((940px + @grid-gutter-width)); |
| 632 | +@container-desktop: ((940px + @grid-gutter-width)); |
| 633 | +@container-md: @container-desktop; |
618 | 634 |
|
619 | 635 | // Large screen / wide desktop
|
620 |
| -@container-lg-desktop: ((1140px + @grid-gutter-width)); |
| 636 | +@container-large-desktop: ((1140px + @grid-gutter-width)); |
| 637 | +@container-lg: @container-large-desktop; |
0 commit comments