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

Commit 02a82da

Browse files
committed
Tweaks on Yeti, Paper, Lumen, Cosmo & Amelia
1 parent 17e55c4 commit 02a82da

File tree

7 files changed

+32
-34
lines changed

7 files changed

+32
-34
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ $tooltip-arrow-color: $tooltip-bg !default;
540540
//##
541541

542542
//** Popover body background color
543-
$popover-bg: #fff !default;
543+
$popover-bg: lighten($body-bg, 5%) !default;
544544
//** Popover maximum width
545545
$popover-max-width: 276px !default;
546546
//** Popover border color
@@ -554,7 +554,7 @@ $popover-title-bg: darken($popover-bg, 3%) !default;
554554
//** Popover arrow width
555555
$popover-arrow-width: 10px !default;
556556
//** Popover arrow color
557-
$popover-arrow-color: #fff !default;
557+
$popover-arrow-color: lighten($body-bg, 5%) !default;
558558

559559
//** Popover outer arrow width
560560
$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
// Buttons ====================================================================
1818

19-
.btn-lg {
20-
padding-top: 19px;
21-
}
2219

2320
// Typography =================================================================
2421

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// Buttons ====================================================================
1818

1919
.btn {
20-
padding: 8px $padding-base-horizontal 7px;
20+
padding: $padding-base-vertical+2 $padding-base-horizontal $padding-base-vertical;
2121
@include shadow();
2222
font-size: 12px;
2323
font-weight: bold;
@@ -37,18 +37,18 @@
3737

3838
.btn-lg,
3939
.btn-group-lg > .btn {
40-
padding: 14px $padding-large-horizontal 13px;
40+
padding: $padding-large-vertical+2 $padding-large-horizontal $padding-large-vertical;
4141
line-height: 15px;
4242
}
4343

4444
.btn-sm,
4545
.btn-group-sm > .btn {
46-
padding: 4px $padding-small-horizontal;
46+
padding: $padding-small-vertical+2 $padding-small-horizontal $padding-small-vertical;
4747
}
4848

4949
.btn-xs,
5050
.btn-group-xs > .btn {
51-
padding: $padding-xs-vertical $padding-xs-horizontal;
51+
padding: $padding-xs-vertical+2 $padding-xs-horizontal $padding-xs-vertical;
5252
}
5353

5454
.btn-default:hover,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ $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: 6px !default;
86+
$padding-base-vertical: 7px !default;
8787
$padding-base-horizontal: 12px !default;
8888

89-
$padding-large-vertical: 10px !default;
89+
$padding-large-vertical: 13px !default;
9090
$padding-large-horizontal: 16px !default;
9191

92-
$padding-small-vertical: 5px !default;
92+
$padding-small-vertical: 4px !default;
9393
$padding-small-horizontal: 10px !default;
9494

9595
$padding-xs-vertical: 1px !default;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ a {
154154

155155
input[type=text],
156156
input[type=password],
157+
input[type=email],
157158
textarea,
158159
[type=text].form-control,
159160
[type=password].form-control,

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@
3737

3838
}
3939

40+
.navbar-form {
41+
margin-top: 7px;
42+
margin-bottom: 5px;
43+
44+
.form-control {
45+
height: auto;
46+
padding: $padding-xs-vertical $padding-xs-horizontal;
47+
}
48+
}
49+
4050
.navbar-collapse {
4151
border-top-color: $dropdown-divider-bg;
4252
@include box-shadow(none);
@@ -81,19 +91,19 @@
8191
// Buttons ====================================================================
8292

8393
.btn {
84-
padding: 14px 28px;
94+
padding: $padding-base-vertical $padding-base-horizontal;
8595
}
8696

8797
.btn-lg {
88-
padding: 16px 32px;
98+
padding: $padding-large-vertical $padding-large-horizontal;
8999
}
90100

91101
.btn-sm {
92-
padding: 8px 16px;
102+
padding: $padding-small-vertical $padding-small-horizontal;
93103
}
94104

95105
.btn-xs {
96-
padding: 4px 8px;
106+
padding: $padding-xs-vertical $padding-xs-horizontal;
97107
}
98108

99109
.btn-group {
@@ -227,10 +237,6 @@ table {
227237

228238
// Forms ======================================================================
229239

230-
input {
231-
padding: 7px;
232-
}
233-
234240
label,
235241
.control-label,
236242
.help-block,
@@ -240,12 +246,6 @@ label,
240246
font-weight: normal;
241247
}
242248

243-
.input-group-addon,
244-
.input-group-btn .btn {
245-
padding: 8px 14px;
246-
font-size: $font-size-small;
247-
}
248-
249249
// Navs =======================================================================
250250

251251
.nav {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ $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: 6px !default;
87-
$padding-base-horizontal: 12px !default;
86+
$padding-base-vertical: 14px !default;
87+
$padding-base-horizontal: 18px !default;
8888

89-
$padding-large-vertical: 10px !default;
90-
$padding-large-horizontal: 16px !default;
89+
$padding-large-vertical: 16px !default;
90+
$padding-large-horizontal: 20px !default;
9191

92-
$padding-small-vertical: 5px !default;
93-
$padding-small-horizontal: 10px !default;
92+
$padding-small-vertical: 8px !default;
93+
$padding-small-horizontal: 12px !default;
9494

95-
$padding-xs-vertical: 1px !default;
96-
$padding-xs-horizontal: 5px !default;
95+
$padding-xs-vertical: 4px !default;
96+
$padding-xs-horizontal: 6px !default;
9797

9898
$line-height-large: 1.33 !default;
9999
$line-height-small: 1.5 !default;

0 commit comments

Comments
 (0)