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

Commit 67d24b9

Browse files
committed
Fixes from bootswatch on Amelia, Paper and Yeti.
1 parent d8daa12 commit 67d24b9

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,3 @@ a.thumbnail:focus,
186186
a.thumbnail.active {
187187
border-color: $thumbnail-border;
188188
}
189-
190-
.popover {
191-
color: $gray-dark;
192-
}

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ p {
138138
margin: 0 0 1em;
139139
}
140140

141-
input {
141+
input,
142+
button {
142143
-webkit-font-smoothing: antialiased;
143144
letter-spacing: .1px;
144145
text-rendering: optimizeLegibility;
@@ -234,13 +235,24 @@ select.form-control {
234235

235236
&:hover {
236237
border: none;
238+
color: $brand-primary;
237239
}
238240
}
239241

240242
& > li.disabled > a {
241243
@include box-shadow(inset 0 -1px 0 #ddd);
242244
}
243245

246+
&.nav-justified {
247+
248+
& > li > a,
249+
& > li > a:hover,
250+
& > .active > a,
251+
& > .active > a:hover {
252+
border: none;
253+
}
254+
}
255+
244256
.dropdown-menu {
245257
margin-top: 0;
246258
}
@@ -257,7 +269,7 @@ select.form-control {
257269
border: none;
258270
color: #fff;
259271

260-
a,
272+
a:not(.close),
261273
.alert-link {
262274
color: #fff;
263275
font-weight: bold;
@@ -340,6 +352,7 @@ select.form-control {
340352
.close {
341353
font-size: 34px;
342354
font-weight: 300;
355+
line-height: 24px;
343356
opacity: 0.6;
344357

345358
&:hover {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ $nav-tabs-active-link-hover-bg: hsla(0, 100%, 100%, 0) !default;
413413
$nav-tabs-active-link-hover-color: $gray !default;
414414
$nav-tabs-active-link-hover-border-color: hsla(0, 100%, 100%, 0) !default;
415415

416-
$nav-tabs-justified-link-border-color: #ddd !default;
416+
$nav-tabs-justified-link-border-color: $nav-tabs-border-color !default;
417417
$nav-tabs-justified-active-link-border-color: $body-bg !default;
418418

419419
//== Pills
@@ -533,7 +533,7 @@ $popover-arrow-color: #fff !default;
533533
//** Popover outer arrow width
534534
$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
535535
//** Popover outer arrow color
536-
$popover-arrow-outer-color: fadein($popover-border-color, 5%) !default;
536+
$popover-arrow-outer-color: fadein($popover-border-color, 7.5%) !default;
537537
//** Popover outer arrow fallback color
538538
$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default;
539539

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ $icon-font-svg-id: "glyphicons_halflingsregular" !default;
8383
//
8484
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
8585

86-
$padding-base-vertical: 14px !default;
87-
$padding-base-horizontal: 18px !default;
86+
$padding-base-vertical: 8px !default;
87+
$padding-base-horizontal: 12px !default;
8888

8989
$padding-large-vertical: 16px !default;
9090
$padding-large-horizontal: 20px !default;

0 commit comments

Comments
 (0)