Skip to content
This repository was archived by the owner on Jan 8, 2023. It is now read-only.

Commit 6734751

Browse files
committed
Yeti to 3.3.4
1 parent 8c9b81d commit 6734751

File tree

2 files changed

+51
-31
lines changed

2 files changed

+51
-31
lines changed

vendor/assets/stylesheets/bootswatch/yeti/_bootswatch.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Yeti 3.2.0
1+
// Yeti 3.3.4
22
// Bootswatch
33
// -----------------------------------------------------
44

@@ -246,6 +246,11 @@ label,
246246
font-weight: normal;
247247
}
248248

249+
input[type="radio"],
250+
input[type="checkbox"] {
251+
margin-top: 1px;
252+
}
253+
249254
// Navs =======================================================================
250255

251256
.nav {

vendor/assets/stylesheets/bootswatch/yeti/_variables.scss

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Yeti 3.2.0
1+
// Yeti 3.3.4
22
// Variables
33
// --------------------------------------------------
44

@@ -7,11 +7,12 @@
77
//
88
//## Gray and brand colors for use across Bootstrap.
99

10+
$gray-base: #000 !default;
11+
$gray-darker: lighten($gray-base, 13.5%) !default; // #222
12+
$gray-dark: lighten($gray-base, 20%) !default; // #333
1013
$gray: #6f6f6f !default; // #555
11-
$gray-darker: lighten(#000, 13.5%) !default; // #222
12-
$gray-dark: lighten(#000, 20%) !default; // #333
13-
$gray-light: lighten(#000, 60%) !default; // #999
14-
$gray-lighter: lighten(#000, 93.5%) !default; // #eee
14+
$gray-light: lighten($gray-base, 60%) !default; // #999
15+
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
1516

1617
$brand-primary: #008cba !default;
1718
$brand-success: #43ac6a !default;
@@ -32,7 +33,9 @@ $text-color: $gray-darker !default;
3233
//** Global textual link color.
3334
$link-color: $brand-primary !default;
3435
//** Link hover color set via `darken()` function.
35-
$link-hover-color: darken($link-color, 15%) !default;
36+
$link-hover-color: $link-color !default;
37+
//** Link hover decoration.
38+
$link-hover-decoration: underline !default;
3639

3740

3841
//== Typography
@@ -57,7 +60,7 @@ $font-size-h5: $font-size-base !default;
5760
$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
5861

5962
//** Unit-less `line-height` for use in components like buttons.
60-
$line-height-base: 1.428571429 !default; // 20/14
63+
$line-height-base: 1.4 !default;
6164
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
6265
$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px
6366

@@ -95,7 +98,7 @@ $padding-small-horizontal: 12px !default;
9598
$padding-xs-vertical: 4px !default;
9699
$padding-xs-horizontal: 6px !default;
97100

98-
$line-height-large: 1.33 !default;
101+
$line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
99102
$line-height-small: 1.5 !default;
100103

101104
$border-radius-base: 0 !default;
@@ -142,7 +145,7 @@ $btn-font-weight: normal !default;
142145

143146
$btn-default-color: $gray-dark !default;
144147
$btn-default-bg: #e7e7e7 !default;
145-
$btn-default-border: #dadada !default;
148+
$btn-default-border: #ccc !default;
146149

147150
$btn-primary-color: #fff !default;
148151
$btn-primary-bg: $brand-primary !default;
@@ -180,8 +183,16 @@ $input-bg-disabled: $gray-lighter !default;
180183
$input-color: $gray !default;
181184
//** `<input>` border color
182185
$input-border: #ccc !default;
183-
//** `<input>` border radius
186+
187+
// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
188+
//** Default `.form-control` border radius
189+
// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
184190
$input-border-radius: $border-radius-base !default;
191+
//** Large `.form-control` border radius
192+
$input-border-radius-large: $border-radius-large !default;
193+
//** Small `.form-control` border radius
194+
$input-border-radius-small: $border-radius-small !default;
195+
185196
//** Border color for inputs on focus
186197
$input-border-focus: #66afe9 !default;
187198

@@ -195,6 +206,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
195206
//** Small `.form-control` height
196207
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
197208

209+
//** `.form-group` margin
210+
$form-group-margin-bottom: 15px !default;
211+
198212
$legend-color: $gray-dark !default;
199213
$legend-border-color: #e5e5e5 !default;
200214

@@ -203,6 +217,9 @@ $input-group-addon-bg: $gray-lighter !default;
203217
//** Border color for textual input addons
204218
$input-group-addon-border-color: $input-border !default;
205219

220+
//** Disabled cursor for form controls and buttons.
221+
$cursor-disabled: not-allowed !default;
222+
206223

207224
//== Dropdowns
208225
//
@@ -314,17 +331,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
314331
//## Define the maximum width of `.container` for different screen sizes.
315332

316333
// Small screen / tablet
317-
$container-tablet: ((720px + $grid-gutter-width)) !default;
334+
$container-tablet: (720px + $grid-gutter-width) !default;
318335
//** For `@screen-sm-min` and up.
319336
$container-sm: $container-tablet !default;
320337

321338
// Medium screen / desktop
322-
$container-desktop: ((940px + $grid-gutter-width)) !default;
339+
$container-desktop: (940px + $grid-gutter-width) !default;
323340
//** For `@screen-md-min` and up.
324341
$container-md: $container-desktop !default;
325342

326343
// Large screen / wide desktop
327-
$container-large-desktop: ((1140px + $grid-gutter-width)) !default;
344+
$container-large-desktop: (1140px + $grid-gutter-width) !default;
328345
//** For `@screen-lg-min` and up.
329346
$container-lg: $container-large-desktop !default;
330347

@@ -402,18 +419,16 @@ $nav-link-hover-bg: $gray-lighter !default;
402419
$nav-disabled-link-color: $gray-light !default;
403420
$nav-disabled-link-hover-color: $gray-light !default;
404421

405-
$nav-open-link-hover-color: #fff !default;
406-
407422
//== Tabs
408-
$nav-tabs-border-color: #ddd !default;
423+
$nav-tabs-border-color: $table-border-color !default;
409424

410425
$nav-tabs-link-hover-border-color: $gray-lighter !default;
411426

412427
$nav-tabs-active-link-hover-bg: $body-bg !default;
413428
$nav-tabs-active-link-hover-color: $gray !default;
414-
$nav-tabs-active-link-hover-border-color: #ddd !default;
429+
$nav-tabs-active-link-hover-border-color: $table-border-color !default;
415430

416-
$nav-tabs-justified-link-border-color: #ddd !default;
431+
$nav-tabs-justified-link-border-color: $table-border-color !default;
417432
$nav-tabs-justified-active-link-border-color: $body-bg !default;
418433

419434
//== Pills
@@ -627,6 +642,8 @@ $alert-danger-border: $state-danger-border !default;
627642
$progress-bg: #f5f5f5 !default;
628643
//** Progress bar text color
629644
$progress-bar-color: #fff !default;
645+
//** Variable for setting rounded corners on progress bar.
646+
$progress-border-radius: $border-radius-base !default;
630647

631648
//** Default progress bar color
632649
$progress-bar-bg: $brand-primary !default;
@@ -647,7 +664,7 @@ $progress-bar-info-bg: $brand-info !default;
647664
//** Background color on `.list-group-item`
648665
$list-group-bg: #fff !default;
649666
//** `.list-group-item` border color
650-
$list-group-border: #ddd !default;
667+
$list-group-border: $table-border-color !default;
651668
//** List group border radius
652669
$list-group-border-radius: $border-radius-base !default;
653670

@@ -685,11 +702,11 @@ $panel-footer-padding: $panel-heading-padding !default;
685702
$panel-border-radius: $border-radius-base !default;
686703

687704
//** Border color for elements within panels
688-
$panel-inner-border: #ddd !default;
705+
$panel-inner-border: $table-border-color !default;
689706
$panel-footer-bg: #f5f5f5 !default;
690707

691708
$panel-default-text: $gray-dark !default;
692-
$panel-default-border: #ddd !default;
709+
$panel-default-border: $table-border-color !default;
693710
$panel-default-heading-bg: #f5f5f5 !default;
694711

695712
$panel-primary-text: #fff !default;
@@ -722,7 +739,7 @@ $thumbnail-padding: 4px !default;
722739
//** Thumbnail background color
723740
$thumbnail-bg: $body-bg !default;
724741
//** Thumbnail border color
725-
$thumbnail-border: #ddd !default;
742+
$thumbnail-border: $table-border-color !default;
726743
//** Thumbnail border radius
727744
$thumbnail-border-radius: $border-radius-base !default;
728745

@@ -744,10 +761,10 @@ $well-border: darken($well-bg, 7%) !default;
744761
//
745762
//##
746763

747-
$badge-color: #777 !default;
764+
$badge-color: #fff !default;
748765
//** Linked badge text color on hover
749766
$badge-link-hover-color: #fff !default;
750-
$badge-bg: $btn-default-bg !default;
767+
$badge-bg: $btn-primary-bg !default;
751768

752769
//** Badge text color in active nav link
753770
$badge-active-color: $link-color !default;
@@ -833,13 +850,11 @@ $headings-small-color: $gray-light !default;
833850
$blockquote-small-color: $gray !default;
834851
//** Blockquote font size
835852
$blockquote-font-size: ($font-size-base * 1.25) !default;
836-
//** Horizontal line color.
837-
$hr-border: #ddd !default;
838853
//** Blockquote border color
839-
$blockquote-border-color: $hr-border !default;
854+
$blockquote-border-color: $table-border-color !default;
840855
//** Page header border color
841-
$page-header-border-color: $hr-border !default;
856+
$page-header-border-color: $table-border-color !default;
842857
//** Width of horizontal description list titles
843858
$dl-horizontal-offset: $component-offset-horizontal !default;
844-
845-
859+
//** Horizontal line color.
860+
$hr-border: $table-border-color !default;

0 commit comments

Comments
 (0)