Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Sass 1.77.7 warnings #124

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Sass 1.77.7 warnings #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/arctic_admin/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.button {
@include primary-button($primary-color, #fff);
padding: 5px 8px;
font-size: 16px;
@include primary-button($primary-color, #fff);

&.small {
padding: 2px 9px;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/arctic_admin/components/_comments.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
h3 {
margin: 0 0 10px 0;
}

.panel_contents .empty {
margin-bottom: 10px;
display: inline-block;
Expand All @@ -31,10 +31,10 @@
}

a[data-method="delete"] {
@include primary-button($primary-color, white);
padding: 2px 9px;
font-size: 12px;
float: right;
@include primary-button($primary-color, white);
}
}

Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/arctic_admin/components/_date_picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
background-color: #fff;
padding: 5px;
border-radius: $border-radius;
@include box-shadow(0 0 4px 0 rgba(0,0,0,.1));
z-index: 3!important;
padding: 8px 10px;
@include box-shadow(0 0 4px 0 rgba(0,0,0,.1));

.ui-datepicker-header {
@include clear-fix();
margin-bottom: 10px;
@include clear-fix();

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

.ui-datepicker-prev {
Expand Down
8 changes: 4 additions & 4 deletions app/assets/stylesheets/arctic_admin/components/_dialogs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
.ui-dialog {
background-color: #fff;
@include box-shadow($box-shadow);
border-radius: $border-radius;
padding: 15px 10px;
z-index: 1;
@include box-shadow($box-shadow);

&:focus, &:active {
-webkit-tap-highlight-color: rgba(0,0,0,0);
outline: 0;
}

.ui-button {
@include primary-button($primary-color, #fff);
border: 0;
border: none;
margin-right: 5px;
padding: 5px 10px;
@include primary-button($primary-color, #fff);
}

.ui-dialog-titlebar-close {
display: none;
}
}
}
8 changes: 4 additions & 4 deletions app/assets/stylesheets/arctic_admin/components/_inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ input[type="number"], textarea {

input[type="submit"] {
@include appearance();
@include primary-button($button-primary-color, white);
width: 100%;
padding: 0 12px;
font-size: 15px;
font-weight: 500;
@include box-shadow(0 1px 0 rgba(0,0,0,.05));
border: none;
cursor: pointer;
@include primary-button($button-primary-color, white);
}

input[type="checkbox"] {
Expand All @@ -56,9 +56,9 @@ input[type="checkbox"] {
border: 1px solid #e6e6e6;
border-radius: $border-radius;
box-sizing: border-box;
@include outline();
@include transition-button();
cursor: pointer;
@include transition-button();
@include outline();

&:checked {
border-color: $primary-color;
Expand All @@ -74,8 +74,8 @@ input[type="radio"] {
border-radius: 50%;
margin: 1px 5px 1px 1px;
display: inline-flex;
@include outline();
@include transition-button();
@include outline();

&:checked {
background-color: $primary-color;
Expand Down
8 changes: 4 additions & 4 deletions app/assets/stylesheets/arctic_admin/components/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

.nav {
border-bottom: 1px solid $border-color;

li {
display: inline-block;
text-align: center;
Expand All @@ -13,10 +13,10 @@
color: $text-color;
display: inline-block;
padding: 15px 25px;
@include outline();
@include transition-button();
@include outline();
}

&.ui-tabs-active {
border-bottom: 2px solid $link-primary-color;

Expand All @@ -30,4 +30,4 @@
.tab-content {
padding: 10px 20px;
}
}
}
6 changes: 3 additions & 3 deletions app/assets/stylesheets/arctic_admin/layouts/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ body.active_admin.logged_in {
@media screen and (min-width: $x-lg-width) {
width: $lg-header-width;
}

#site_title_image {
height: 100%;
padding: 6px 0;
Expand Down Expand Up @@ -180,7 +180,7 @@ body.active_admin.logged_in {
}

}

@media screen and (min-width: $sm-width) {
min-width: 60px;
min-height: 59px;
Expand Down Expand Up @@ -228,8 +228,8 @@ body.active_admin.logged_in {
float: right;

.action_item a {
@include primary-button($button-primary-color, #fff);
padding: 5px 8px;
@include primary-button($button-primary-color, #fff);
}
}

Expand Down
13 changes: 8 additions & 5 deletions app/assets/stylesheets/arctic_admin/mixins/_buttons_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ $bg-tertiary-button-hover: rgba($border-color, .3);;
@mixin primary-button($background-color, $color) {
background-color: $background-color;
color: $color;
border: none;
border: none;
@include button();

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

&:active, &:focus {
background-color: darken($background-color, 10%);
background-color: darken($background-color, 10%);
}

&:disabled {
Expand Down Expand Up @@ -73,9 +73,12 @@ $bg-tertiary-button-hover: rgba($border-color, .3);;
}

@mixin secondary-dropdown($color) {
@include secondary-button($color);
padding: 6px 25px 6px 10px;
position: relative;
@include secondary-button($color);

& {
padding: 6px 25px 6px 10px; // Preserve padding on Sass > 1.77.6 (See cprodhomme/arctic_admin#123)
}

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

&:active, &:focus {
background-color: darken($color, 10%);
background-color: darken($color, 10%);
color: #fff;
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/arctic_admin/pages/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ body.index {
margin-bottom: -4px;

.member_link {
@include primary-button($button-primary-color, white);
padding: 4px 8px;
margin-right: 4px;
margin-bottom: 4px;
@include primary-button($button-primary-color, white);
}
}

Expand Down