Skip to content

Commit e5f3767

Browse files
authored
Merge pull request #1040 from primer/next-overlays
Refresh box-shadow and borders
2 parents f5d2e10 + bf52fcd commit e5f3767

File tree

9 files changed

+29
-36
lines changed

9 files changed

+29
-36
lines changed

src/autocomplete/autocomplete.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
background: $bg-white;
1212
border-radius: $border-radius;
1313
// stylelint-disable-next-line primer/box-shadow
14-
box-shadow: 0 0 5px $black-fade-30;
14+
box-shadow: inset 0 0 0 1px $border-color, $box-shadow-medium;
1515
}
1616

1717
// One of the items that appears within an autocomplete group

src/autocomplete/suggester.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
li {
2020
display: block;
2121
padding: $spacer-1 $spacer-2;
22-
font-weight: $font-weight-bold;
23-
border-bottom: $border;
22+
font-weight: $font-weight-semibold;
23+
border-bottom: $border-width $border-style $border-gray-light;
2424

2525
small {
2626
font-weight: $font-weight-normal;

src/box/box.scss

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
.Box {
55
background-color: $bg-white;
6-
border: $border-width $border-style $border-gray-dark;
6+
border: $border;
77
border-radius: $border-radius;
88
}
99

@@ -75,7 +75,7 @@
7575
// stylelint-disable-next-line primer/spacing
7676
margin: (-$border-width) (-$border-width) 0;
7777
background-color: $bg-gray;
78-
border-color: $border-gray-dark;
78+
border-color: $border-color;
7979
border-style: $border-style;
8080
border-width: $border-width;
8181
border-top-left-radius: $border-radius;
@@ -95,10 +95,8 @@
9595
&:last-of-type {
9696
// stylelint-disable-next-line primer/spacing
9797
margin-bottom: -$border-width;
98-
// stylelint-disable-next-line primer/borders
99-
border-bottom-right-radius: 2px;
100-
// stylelint-disable-next-line primer/borders
101-
border-bottom-left-radius: 2px;
98+
border-bottom-right-radius: $border-radius;
99+
border-bottom-left-radius: $border-radius;
102100
}
103101
}
104102

@@ -108,21 +106,17 @@
108106
// stylelint-disable-next-line primer/spacing
109107
margin-top: -1px;
110108
list-style-type: none; // To account for applying Box component to a list
111-
border-top: $border-width $border-style $border-gray;
109+
border-top: $border;
112110

113111
&:first-of-type {
114112
border-top-color: transparent;
115-
// stylelint-disable-next-line primer/borders
116-
border-top-left-radius: 2px;
117-
// stylelint-disable-next-line primer/borders
118-
border-top-right-radius: 2px;
113+
border-top-left-radius: $border-radius;
114+
border-top-right-radius: $border-radius;
119115
}
120116

121117
&:last-of-type {
122-
// stylelint-disable-next-line primer/borders
123-
border-bottom-right-radius: 2px;
124-
// stylelint-disable-next-line primer/borders
125-
border-bottom-left-radius: 2px;
118+
border-bottom-right-radius: $border-radius;
119+
border-bottom-left-radius: $border-radius;
126120
}
127121

128122
// Adds a blue vertical line to the left of the row
@@ -216,7 +210,7 @@
216210
padding: $spacer-3;
217211
// stylelint-disable-next-line primer/spacing
218212
margin-top: -1px; // prevents double border when used with .Box-body
219-
border-top: $border-width $border-style $border-gray;
213+
border-top: $border;
220214
}
221215

222216
// Option for a box with scrolling content

src/buttons/button.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@
6969
color: $text-gray-dark;
7070
background-color: $bg-gray-light;
7171
border-color: $border-color-button;
72-
// stylelint-disable-next-line primer/box-shadow
73-
box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);
72+
box-shadow: $box-shadow, $box-shadow-highlight;
7473

7574
&:focus,
7675
&.focus {
@@ -108,7 +107,7 @@
108107
$bg: #159739; // custom green
109108
$border-color: $green-600;
110109
$shadow: $green-900;
111-
$box-shadow: 0 1px 0 rgba($shadow, 0.1), inset 0 1px 0 rgba($white, 0.03);
110+
$box-shadow: $box-shadow, inset 0 1px 0 rgba($white, 0.03);
112111

113112
$bg-hover: #138934; // custom green
114113
$border-hover: $green-700;
@@ -213,7 +212,7 @@
213212
color: rgba($color, 0.5);
214213
background-color: #f3f4f6;
215214
border-color: $border-color-button;
216-
box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);
215+
box-shadow: $box-shadow, $box-shadow-highlight;
217216
}
218217

219218
.Counter {

src/buttons/misc.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
border-left: 0;
7878
border-top-right-radius: $border-radius;
7979
border-bottom-right-radius: $border-radius;
80-
// stylelint-disable-next-line primer/box-shadow
81-
box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);
80+
box-shadow: $box-shadow, $box-shadow-highlight;
8281

8382
&:hover,
8483
&:active {

src/dropdown/dropdown.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@
3131
list-style: none;
3232
background-color: $bg-white;
3333
background-clip: padding-box;
34-
border: $border-width $border-style $border-black-fade;
35-
// stylelint-disable-next-line primer/borders
36-
border-radius: $spacer-1;
34+
border: $border;
35+
border-radius: $border-radius;
3736
box-shadow: $box-shadow-large;
3837

3938
&::before,

src/select-menu/select-menu.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ $SelectMenu-max-height: 480px !default;
7373
// stylelint-disable-next-line primer/borders
7474
border-radius: $border-radius * 2;
7575
// stylelint-disable-next-line primer/box-shadow
76-
box-shadow: 0 0 18px rgba(0, 0, 0, 0.4);
76+
box-shadow: 0 0 18px rgba($black, 0.4);
7777
animation: SelectMenu-modal-animation 0.12s cubic-bezier(0, 0.1, 0.1, 1) backwards;
7878

7979
@keyframes SelectMenu-modal-animation {
@@ -96,9 +96,9 @@ $SelectMenu-max-height: 480px !default;
9696
max-height: $SelectMenu-max-height;
9797
margin: $spacer-1 0 $spacer-3 0;
9898
font-size: $font-size-small;
99-
border: $border-width $border-style $border-gray-dark;
99+
border: $border;
100100
border-radius: $border-radius;
101-
box-shadow: $box-shadow-medium;
101+
box-shadow: $box-shadow-large;
102102
animation-name: SelectMenu-modal-animation--sm;
103103
}
104104
}

src/support/variables/misc.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ $border: $border-width $border-color $border-style !default;
88
$border-radius: 6px !default;
99

1010
// Box shadow
11-
$box-shadow: 0 1px 1px rgba($black, 0.1) !default;
12-
$box-shadow-medium: 0 1px 5px $black-fade-15 !default;
13-
$box-shadow-large: 0 1px 15px $black-fade-15 !default;
14-
$box-shadow-extra-large: 0 10px 50px rgba($black, 0.07) !default;
11+
$box-shadow: 0 1px 0 rgba($gray-400, 0.1) !default;
12+
$box-shadow-medium: 0 3px 6px rgba($gray-400, 0.15) !default;
13+
$box-shadow-large: 0 8px 24px rgba($gray-400, 0.2) !default;
14+
$box-shadow-extra-large: 0 12px 48px rgba($gray-400, 0.3) !default;
15+
16+
$box-shadow-highlight: inset 0 1px 0 rgba($white, 0.25) !default;
1517

1618
// Focus shadow
1719
$focus-shadow: 0 0 0 3px rgba($border-blue, 0.3) !default;

src/toasts/toasts.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
background-color: $bg-white;
88
border-radius: $border-radius;
99
// stylelint-disable-next-line primer/box-shadow
10-
box-shadow: inset 0 0 0 1px $border-gray-dark, $box-shadow-medium;
10+
box-shadow: inset 0 0 0 1px $border-color, $box-shadow-large;
1111

1212
@include breakpoint(sm) {
1313
width: max-content;

0 commit comments

Comments
 (0)