Skip to content

Commit ec34d20

Browse files
committed
Updated Bootswatch themes, including adding the new Yeti theme
1 parent efef5de commit ec34d20

28 files changed

+1839
-657
lines changed

bootstrap_themes/static/bootstrap/themes/amelia/less/bootswatch.less

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Amelia 3.0.0
1+
// Amelia 3.0.2
22
// Bootswatch
33
// -----------------------------------------------------
44

@@ -35,32 +35,37 @@
3535

3636
// Typography =================================================================
3737

38-
h1, h2, h3, h4, h5, h6 {
39-
font-family: 'Lobster', cursive;
40-
}
41-
42-
.text-primary {
38+
.text-primary,
39+
.text-primary:hover {
4340
color: lighten(@brand-primary, 40%);
4441
}
4542

46-
.text-success {
43+
.text-success,
44+
.text-success:hover {
4745
color: lighten(@brand-success, 20%);
4846
}
4947

50-
.text-danger {
48+
.text-danger,
49+
.text-danger:hover {
5150
color: lighten(@brand-danger, 20%);
5251
}
5352

54-
.text-warning {
53+
.text-warning,
54+
.text-warning:hover {
5555
color: lighten(@brand-warning, 20%);
5656
}
5757

58-
.text-info {
58+
.text-info,
59+
.text-info:hover {
5960
color: lighten(@brand-info, 40%);
6061
}
6162

6263
// Tables =====================================================================
6364

65+
.table-responsive > .table {
66+
background-color: @table-bg;
67+
}
68+
6469
// Forms ======================================================================
6570

6671
.has-warning {

bootstrap_themes/static/bootstrap/themes/amelia/less/variables.less

+61-44
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Amelia 3.0.0
1+
// Amelia 3.0.2
22
// Variables
33
// --------------------------------------------------
44

@@ -48,12 +48,21 @@
4848
@font-size-large: ceil(@font-size-base * 1.25); // ~18px
4949
@font-size-small: ceil(@font-size-base * 0.85); // ~12px
5050

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+
5158
@line-height-base: 1.428571429; // 20/14
5259
@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
5360

54-
@headings-font-family: @font-family-base;
61+
@headings-font-family: 'Lobster', cursive;
5562
@headings-font-weight: 500;
5663
@headings-line-height: 1.1;
64+
@headings-color: inherit;
65+
5766

5867
// Iconography
5968
// -------------------------
@@ -82,6 +91,7 @@
8291
@border-radius-large: 6px;
8392
@border-radius-small: 3px;
8493

94+
@component-active-color: #fff;
8595
@component-active-bg: lighten(@body-bg, 10%);
8696

8797
@caret-width-base: 4px;
@@ -165,14 +175,14 @@
165175
@dropdown-fallback-border: #ccc;
166176
@dropdown-divider-bg: #e5e5e5;
167177

168-
@dropdown-link-active-color: #fff;
169-
@dropdown-link-active-bg: @component-active-bg;
170-
171178
@dropdown-link-color: @gray-dark;
172179
@dropdown-link-hover-color: #fff;
173180
@dropdown-link-hover-bg: @dropdown-link-active-bg;
174181

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;
176186

177187
@dropdown-header-color: @text-muted;
178188

@@ -200,25 +210,33 @@
200210
// --------------------------------------------------
201211

202212
// Extra small screen / phone
213+
// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
203214
@screen-xs: 480px;
204-
@screen-phone: @screen-xs;
215+
@screen-xs-min: @screen-xs;
216+
@screen-phone: @screen-xs-min;
205217

206218
// Small screen / tablet
219+
// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1
207220
@screen-sm: 768px;
208-
@screen-tablet: @screen-sm;
221+
@screen-sm-min: @screen-sm;
222+
@screen-tablet: @screen-sm-min;
209223

210224
// Medium screen / desktop
225+
// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1
211226
@screen-md: 992px;
212-
@screen-desktop: @screen-md;
227+
@screen-md-min: @screen-md;
228+
@screen-desktop: @screen-md-min;
213229

214230
// Large screen / wide desktop
231+
// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1
215232
@screen-lg: 1200px;
216-
@screen-lg-desktop: @screen-lg;
233+
@screen-lg-min: @screen-lg;
234+
@screen-lg-desktop: @screen-lg-min;
217235

218236
// 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);
222240

223241

224242
// Grid system
@@ -229,7 +247,7 @@
229247
// Padding, to be divided by two and applied to the left and right of all columns
230248
@grid-gutter-width: 30px;
231249
// Point at which the navbar stops collapsing
232-
@grid-float-breakpoint: @screen-tablet;
250+
@grid-float-breakpoint: @screen-sm-min;
233251

234252

235253
// Navbar
@@ -238,13 +256,14 @@
238256
// Basics of a navbar
239257
@navbar-height: 50px;
240258
@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%);
244259
@navbar-border-radius: @border-radius-base;
245260
@navbar-padding-horizontal: floor(@grid-gutter-width / 2);
246261
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
247262

263+
@navbar-default-color: @gray-light;
264+
@navbar-default-bg: @brand-primary;
265+
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
266+
248267
// Navbar links
249268
@navbar-default-link-color: #fff;
250269
@navbar-default-link-hover-color: #fff;
@@ -286,13 +305,6 @@
286305
@navbar-inverse-brand-hover-color: #fff;
287306
@navbar-inverse-brand-hover-bg: none;
288307

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-
296308
// Inverted navbar toggle
297309
@navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg;
298310
@navbar-inverse-toggle-icon-bar-bg: #fff;
@@ -305,8 +317,8 @@
305317
@nav-link-padding: 10px 15px;
306318
@nav-link-hover-bg: lighten(@body-bg, 10%);
307319

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;
310322

311323
@nav-open-link-hover-color: @nav-link-hover-bg;
312324
@nav-open-caret-border-color: @nav-link-hover-bg;
@@ -324,6 +336,7 @@
324336
@nav-tabs-justified-active-link-border-color: transparent;
325337

326338
// Pills
339+
@nav-pills-border-radius: @border-radius-base;
327340
@nav-pills-active-link-hover-bg: @component-active-bg;
328341
@nav-pills-active-link-hover-color: #fff;
329342

@@ -334,7 +347,7 @@
334347
@pagination-bg: lighten(@body-bg, 5%);
335348
@pagination-border: transparent;
336349

337-
@pagination-hover-bg: @gray-lighter;
350+
@pagination-hover-bg: @component-active-bg;
338351

339352
@pagination-active-bg: lighten(@body-bg, 10%);
340353
@pagination-active-color: #fff;
@@ -346,7 +359,7 @@
346359
// -------------------------
347360

348361
@pager-border-radius: 15px;
349-
@pager-disabled-color: #fff;
362+
@pager-disabled-color: @gray-lighter;
350363

351364

352365
// Jumbotron
@@ -355,21 +368,13 @@
355368
@jumbotron-padding: 30px;
356369
@jumbotron-color: inherit;
357370
@jumbotron-bg: darken(@body-bg, 5%);
358-
359371
@jumbotron-heading-color: inherit;
372+
@jumbotron-font-size: ceil(@font-size-base * 1.5);
360373

361374

362375
// Form states and alerts
363376
// -------------------------
364377

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-
373378
@state-success-text: #fff;
374379
@state-success-bg: @brand-success;
375380
@state-success-border: darken(spin(@state-success-bg, -10), 5%);
@@ -378,6 +383,14 @@
378383
@state-info-bg: @brand-info;
379384
@state-info-border: darken(spin(@state-info-bg, -10), 7%);
380385

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+
381394

382395
// Tooltips
383396
// -------------------------
@@ -478,7 +491,7 @@
478491
@list-group-border-radius: @border-radius-base;
479492

480493
@list-group-hover-bg: lighten(@body-bg, 10%);
481-
@list-group-active-color: #fff;
494+
@list-group-active-color: @component-active-color;
482495
@list-group-active-bg: @component-active-bg;
483496
@list-group-active-border: @list-group-border;
484497

@@ -493,7 +506,7 @@
493506
@panel-border-radius: @border-radius-base;
494507
@panel-footer-bg: @panel-default-heading-bg;
495508

496-
@panel-default-text: @gray-dark;
509+
@panel-default-text: #fff;
497510
@panel-default-border: darken(@body-bg, 5%);
498511
@panel-default-heading-bg: lighten(@body-bg, 15%);
499512

@@ -551,8 +564,9 @@
551564
// Breadcrumbs
552565
// -------------------------
553566
@breadcrumb-bg: lighten(@body-bg, 5%);
554-
@breadcrumb-color: #ccc;
567+
@breadcrumb-color: @gray-lighter;
555568
@breadcrumb-active-color: #fff;
569+
@breadcrumb-separator: "/";
556570

557571

558572
// Carousel
@@ -573,8 +587,8 @@
573587

574588
// Close
575589
// ------------------------
576-
@close-color: #000;
577590
@close-font-weight: bold;
591+
@close-color: #000;
578592
@close-text-shadow: 0 1px 0 #fff;
579593

580594

@@ -611,10 +625,13 @@
611625
// --------------------------------------------------
612626

613627
// Small screen / tablet
614-
@container-tablet: ((720px + @grid-gutter-width));
628+
@container-tablet: ((720px + @grid-gutter-width));
629+
@container-sm: @container-tablet;
615630

616631
// Medium screen / desktop
617-
@container-desktop: ((940px + @grid-gutter-width));
632+
@container-desktop: ((940px + @grid-gutter-width));
633+
@container-md: @container-desktop;
618634

619635
// 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

Comments
 (0)