Skip to content

Commit d6eb216

Browse files
committed
Fix Sass 1.77.7 warnings
- Use `border: none;` for uniformity and to prevent two rules to be added to `.ui-dialog .ui-button` Close cprodhomme#123
1 parent 9855857 commit d6eb216

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

app/assets/stylesheets/arctic_admin/_buttons.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.button {
2-
@include primary-button($primary-color, #fff);
32
padding: 5px 8px;
43
font-size: 16px;
4+
@include primary-button($primary-color, #fff);
55

66
&.small {
77
padding: 2px 9px;

app/assets/stylesheets/arctic_admin/components/_comments.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
h3 {
66
margin: 0 0 10px 0;
77
}
8-
8+
99
.panel_contents .empty {
1010
margin-bottom: 10px;
1111
display: inline-block;
@@ -31,10 +31,10 @@
3131
}
3232

3333
a[data-method="delete"] {
34-
@include primary-button($primary-color, white);
3534
padding: 2px 9px;
3635
font-size: 12px;
3736
float: right;
37+
@include primary-button($primary-color, white);
3838
}
3939
}
4040

app/assets/stylesheets/arctic_admin/components/_date_picker.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
background-color: #fff;
33
padding: 5px;
44
border-radius: $border-radius;
5-
@include box-shadow(0 0 4px 0 rgba(0,0,0,.1));
65
z-index: 3!important;
76
padding: 8px 10px;
7+
@include box-shadow(0 0 4px 0 rgba(0,0,0,.1));
88

99
.ui-datepicker-header {
10-
@include clear-fix();
1110
margin-bottom: 10px;
11+
@include clear-fix();
1212

1313
.ui-datepicker-prev, .ui-datepicker-next {
14-
@include primary-button($button-primary-color, #fff);
1514
padding: 2px 5px;
1615
font-size: 14px;
16+
@include primary-button($button-primary-color, #fff);
1717
}
1818

1919
.ui-datepicker-prev {
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
.ui-dialog {
22
background-color: #fff;
3-
@include box-shadow($box-shadow);
43
border-radius: $border-radius;
54
padding: 15px 10px;
65
z-index: 1;
6+
@include box-shadow($box-shadow);
77

88
&:focus, &:active {
99
-webkit-tap-highlight-color: rgba(0,0,0,0);
1010
outline: 0;
1111
}
1212

1313
.ui-button {
14-
@include primary-button($primary-color, #fff);
15-
border: 0;
14+
border: none;
1615
margin-right: 5px;
1716
padding: 5px 10px;
17+
@include primary-button($primary-color, #fff);
1818
}
1919

2020
.ui-dialog-titlebar-close {
2121
display: none;
2222
}
23-
}
23+
}

app/assets/stylesheets/arctic_admin/components/_inputs.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ input[type="number"], textarea {
3838

3939
input[type="submit"] {
4040
@include appearance();
41-
@include primary-button($button-primary-color, white);
4241
width: 100%;
4342
padding: 0 12px;
4443
font-size: 15px;
4544
font-weight: 500;
4645
@include box-shadow(0 1px 0 rgba(0,0,0,.05));
4746
border: none;
4847
cursor: pointer;
48+
@include primary-button($button-primary-color, white);
4949
}
5050

5151
input[type="checkbox"] {
@@ -56,9 +56,9 @@ input[type="checkbox"] {
5656
border: 1px solid #e6e6e6;
5757
border-radius: $border-radius;
5858
box-sizing: border-box;
59-
@include outline();
60-
@include transition-button();
6159
cursor: pointer;
60+
@include transition-button();
61+
@include outline();
6262

6363
&:checked {
6464
border-color: $primary-color;
@@ -74,8 +74,8 @@ input[type="radio"] {
7474
border-radius: 50%;
7575
margin: 1px 5px 1px 1px;
7676
display: inline-flex;
77-
@include outline();
7877
@include transition-button();
78+
@include outline();
7979

8080
&:checked {
8181
background-color: $primary-color;

app/assets/stylesheets/arctic_admin/components/_tabs.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
.nav {
55
border-bottom: 1px solid $border-color;
6-
6+
77
li {
88
display: inline-block;
99
text-align: center;
@@ -13,10 +13,10 @@
1313
color: $text-color;
1414
display: inline-block;
1515
padding: 15px 25px;
16-
@include outline();
1716
@include transition-button();
17+
@include outline();
1818
}
19-
19+
2020
&.ui-tabs-active {
2121
border-bottom: 2px solid $link-primary-color;
2222

@@ -30,4 +30,4 @@
3030
.tab-content {
3131
padding: 10px 20px;
3232
}
33-
}
33+
}

app/assets/stylesheets/arctic_admin/layouts/_header.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ body.active_admin.logged_in {
4747
@media screen and (min-width: $x-lg-width) {
4848
width: $lg-header-width;
4949
}
50-
50+
5151
#site_title_image {
5252
height: 100%;
5353
padding: 6px 0;
@@ -180,7 +180,7 @@ body.active_admin.logged_in {
180180
}
181181

182182
}
183-
183+
184184
@media screen and (min-width: $sm-width) {
185185
min-width: 60px;
186186
min-height: 59px;
@@ -228,8 +228,8 @@ body.active_admin.logged_in {
228228
float: right;
229229

230230
.action_item a {
231-
@include primary-button($button-primary-color, #fff);
232231
padding: 5px 8px;
232+
@include primary-button($button-primary-color, #fff);
233233
}
234234
}
235235

app/assets/stylesheets/arctic_admin/mixins/_buttons_mixins.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ $bg-tertiary-button-hover: rgba($border-color, .3);;
2020
@mixin primary-button($background-color, $color) {
2121
background-color: $background-color;
2222
color: $color;
23-
border: none;
23+
border: none;
2424
@include button();
2525

2626
&:hover {
2727
background-color: lighten($background-color, 10%);
2828
}
2929

3030
&:active, &:focus {
31-
background-color: darken($background-color, 10%);
31+
background-color: darken($background-color, 10%);
3232
}
3333

3434
&:disabled {
@@ -73,9 +73,9 @@ $bg-tertiary-button-hover: rgba($border-color, .3);;
7373
}
7474

7575
@mixin secondary-dropdown($color) {
76-
@include secondary-button($color);
7776
padding: 6px 25px 6px 10px;
7877
position: relative;
78+
@include secondary-button($color);
7979

8080
&:after {
8181
@include icon($icon-sort-down);
@@ -84,7 +84,7 @@ $bg-tertiary-button-hover: rgba($border-color, .3);;
8484
}
8585

8686
&:active, &:focus {
87-
background-color: darken($color, 10%);
87+
background-color: darken($color, 10%);
8888
color: #fff;
8989
}
9090

app/assets/stylesheets/arctic_admin/pages/_index.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ body.index {
9797
margin-bottom: -4px;
9898

9999
.member_link {
100-
@include primary-button($button-primary-color, white);
101100
padding: 4px 8px;
102101
margin-right: 4px;
103102
margin-bottom: 4px;
103+
@include primary-button($button-primary-color, white);
104104
}
105105
}
106106

0 commit comments

Comments
 (0)