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

Commit 8c9b81d

Browse files
esbanarangoesbanarango
committed
United to 3.3.4
1 parent 4c4f870 commit 8c9b81d

File tree

2 files changed

+73
-42
lines changed

2 files changed

+73
-42
lines changed

‎vendor/assets/stylesheets/bootswatch/united/_bootswatch.scss‎

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

@@ -22,6 +22,20 @@
2222
}
2323
}
2424

25+
26+
@media (max-width: $grid-float-breakpoint-max) {
27+
28+
.navbar {
29+
30+
.dropdown-menu {
31+
a {
32+
color: #fff;
33+
}
34+
}
35+
}
36+
}
37+
38+
2539
// Buttons ====================================================================
2640

2741
// Typography =================================================================

‎vendor/assets/stylesheets/bootswatch/united/_variables.scss‎

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

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

10-
$gray: #777 !default; // #555
11-
$gray-darker: lighten(#000, 13.5%) !default; // #222
10+
$gray-base: #000 !default;
11+
$gray-darker: lighten($gray-base, 13.5%) !default; // #222
1212
$gray-dark: #333 !default; // #333
13+
$gray: #777 !default; // #555
1314
$gray-light: #AEA79F !default; // #999
14-
$gray-lighter: lighten(#000, 93.5%) !default; // #eee
15+
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
1516

1617
$brand-primary: #DD4814 !default;
1718
$brand-success: #38B44A !default;
@@ -33,6 +34,8 @@ $text-color: $gray-dark !default;
3334
$link-color: $brand-primary !default;
3435
//** Link hover color set via `darken()` function.
3536
$link-hover-color: darken($link-color, 15%) !default;
37+
//** Link hover decoration.
38+
$link-hover-decoration: underline !default;
3639

3740

3841
//== Typography
@@ -95,7 +98,7 @@ $padding-small-horizontal: 10px !default;
9598
$padding-xs-vertical: 1px !default;
9699
$padding-xs-horizontal: 5px !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: 4px !default;
@@ -180,8 +183,16 @@ $input-bg-disabled: $gray-lighter !default;
180183
$input-color: $text-color !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: $text-color !default;
199213
$legend-border-color: #e5e5e5 !default;
200214

@@ -203,30 +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

206-
//== Type
207-
//
208-
//##
220+
//** Disabled cursor for form controls and buttons.
221+
$cursor-disabled: not-allowed !default;
209222

210-
//** Horizontal offset for forms and lists.
211-
$component-offset-horizontal: 180px !default;
212-
//** Text muted color
213-
$text-muted: $gray-light !default;
214-
//** Abbreviations and acronyms border color
215-
$abbr-border-color: $gray-light !default;
216-
//** Headings small color
217-
$headings-small-color: $gray-light !default;
218-
//** Blockquote small color
219-
$blockquote-small-color: $gray-light !default;
220-
//** Blockquote font size
221-
$blockquote-font-size: ($font-size-base * 1.25) !default;
222-
//** Blockquote border color
223-
$blockquote-border-color: $gray-lighter !default;
224-
//** Page header border color
225-
$page-header-border-color: $gray-lighter !default;
226-
//** Width of horizontal description list titles
227-
$dl-horizontal-offset: $component-offset-horizontal !default;
228-
//** Horizontal line color.
229-
$hr-border: $gray-lighter !default;
230223

231224
//== Dropdowns
232225
//
@@ -241,23 +234,23 @@ $dropdown-fallback-border: #ccc !default;
241234
//** Divider color for between dropdown items.
242235
$dropdown-divider-bg: #e5e5e5 !default;
243236

244-
//** Active dropdown menu item background color.
245-
$dropdown-link-active-bg: $component-active-bg !default;
246237
//** Dropdown link text color.
247238
$dropdown-link-color: $gray-dark !default;
248239
//** Hover color for dropdown links.
249240
$dropdown-link-hover-color: #fff !default;
250241
//** Hover background for dropdown links.
251-
$dropdown-link-hover-bg: $dropdown-link-active-bg !default;
242+
$dropdown-link-hover-bg: $component-active-bg !default;
252243

253244
//** Active dropdown menu item text color.
254245
$dropdown-link-active-color: #fff !default;
246+
//** Active dropdown menu item background color.
247+
$dropdown-link-active-bg: $component-active-bg !default;
255248

256249
//** Disabled dropdown menu item background color.
257-
$dropdown-link-disabled-color: $text-muted !default;
250+
$dropdown-link-disabled-color: $gray-light !default;
258251

259252
//** Text color for headers within dropdown menus.
260-
$dropdown-header-color: $text-muted !default;
253+
$dropdown-header-color: $gray-light !default;
261254

262255
//** Deprecated `@dropdown-caret-color` as of v3.1.0
263256
$dropdown-caret-color: #000 !default;
@@ -338,17 +331,17 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
338331
//## Define the maximum width of `.container` for different screen sizes.
339332

340333
// Small screen / tablet
341-
$container-tablet: ((720px + $grid-gutter-width)) !default;
334+
$container-tablet: (720px + $grid-gutter-width) !default;
342335
//** For `@screen-sm-min` and up.
343336
$container-sm: $container-tablet !default;
344337

345338
// Medium screen / desktop
346-
$container-desktop: ((940px + $grid-gutter-width)) !default;
339+
$container-desktop: (940px + $grid-gutter-width) !default;
347340
//** For `@screen-md-min` and up.
348341
$container-md: $container-desktop !default;
349342

350343
// Large screen / wide desktop
351-
$container-large-desktop: ((1140px + $grid-gutter-width)) !default;
344+
$container-large-desktop: (1140px + $grid-gutter-width) !default;
352345
//** For `@screen-lg-min` and up.
353346
$container-lg: $container-large-desktop !default;
354347

@@ -426,8 +419,6 @@ $nav-link-hover-bg: $gray-lighter !default;
426419
$nav-disabled-link-color: $gray-light !default;
427420
$nav-disabled-link-hover-color: $gray-light !default;
428421

429-
$nav-open-link-hover-color: #fff !default;
430-
431422
//== Tabs
432423
$nav-tabs-border-color: #ddd !default;
433424

@@ -524,7 +515,7 @@ $tooltip-max-width: 200px !default;
524515
//** Tooltip text color
525516
$tooltip-color: #fff !default;
526517
//** Tooltip background color
527-
$tooltip-bg: rgba(0,0,0,.9) !default;
518+
$tooltip-bg: #000 !default;
528519
$tooltip-opacity: .9 !default;
529520

530521
//** Tooltip arrow width
@@ -552,7 +543,7 @@ $popover-title-bg: darken($popover-bg, 3%) !default;
552543
//** Popover arrow width
553544
$popover-arrow-width: 10px !default;
554545
//** Popover arrow color
555-
$popover-arrow-color: #fff !default;
546+
$popover-arrow-color: $popover-bg !default;
556547

557548
//** Popover outer arrow width
558549
$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
@@ -651,6 +642,8 @@ $alert-danger-border: $state-danger-border !default;
651642
$progress-bg: #f5f5f5 !default;
652643
//** Progress bar text color
653644
$progress-bar-color: #fff !default;
645+
//** Variable for setting rounded corners on progress bar.
646+
$progress-border-radius: $border-radius-base !default;
654647

655648
//** Default progress bar color
656649
$progress-bar-bg: $brand-primary !default;
@@ -841,3 +834,27 @@ $pre-border-color: #ccc !default;
841834
$pre-scrollable-max-height: 340px !default;
842835

843836

837+
//== Type
838+
//
839+
//##
840+
841+
//** Horizontal offset for forms and lists.
842+
$component-offset-horizontal: 180px !default;
843+
//** Text muted color
844+
$text-muted: $gray-light !default;
845+
//** Abbreviations and acronyms border color
846+
$abbr-border-color: $gray-light !default;
847+
//** Headings small color
848+
$headings-small-color: $gray-light !default;
849+
//** Blockquote small color
850+
$blockquote-small-color: $gray-light !default;
851+
//** Blockquote font size
852+
$blockquote-font-size: ($font-size-base * 1.25) !default;
853+
//** Blockquote border color
854+
$blockquote-border-color: $gray-lighter !default;
855+
//** Page header border color
856+
$page-header-border-color: $gray-lighter !default;
857+
//** Width of horizontal description list titles
858+
$dl-horizontal-offset: $component-offset-horizontal !default;
859+
//** Horizontal line color.
860+
$hr-border: $gray-lighter !default;

0 commit comments

Comments
 (0)