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

Replace deprecated bourbon mixins with unprefixed CSS #1706

Merged
merged 4 commits into from
Feb 7, 2017
Merged

Replace deprecated bourbon mixins with unprefixed CSS #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b23c895
Use unprefixed flexbox CSS attributes
jhawthorn Feb 6, 2017
84a4bb7
Use unprefixed calc CSS
jhawthorn Feb 6, 2017
6372731
Use unprefixed animation CSS
jhawthorn Feb 6, 2017
08c86da
Use unprefixed CSS transforms
jhawthorn Feb 6, 2017
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 backend/app/assets/stylesheets/spree/backend/components/_navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ nav.menu {
&:before {
position: absolute;
left: 1em;
@include transform(translateX(-50%));
transform: translateX(-50%);
}
}

Expand Down
10 changes: 5 additions & 5 deletions backend/app/assets/stylesheets/spree/backend/components/_progress.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
bottom: 0;
z-index: 1000;
opacity: 0.8;
@include calc(width, "100% - #{$width-sidebar}");
width: calc(100% - #{$width-sidebar});

.wrapper {
border-radius: 10px;
Expand Down Expand Up @@ -40,15 +40,15 @@
height: 30px;
border: 6px solid rgba($color-spinner, 0.2);
border-left-color: rgba($color-spinner, 1);
@include animation(spinner 1s infinite linear);
animation: spinner 1s infinite linear;
border-radius: 50%;
}

@include keyframes(spinner) {
@keyframes spinner {
from {
@include transform(rotate(0));
transform: rotate(0);
}
to {
@include transform(rotate(360deg));
transform: rotate(360deg);
}
}
14 changes: 7 additions & 7 deletions backend/app/assets/stylesheets/spree/backend/components/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.tabs {
@include display(flex);
display: flex;
margin: 1em 0;
border-bottom: 1px solid $color-border;
white-space: nowrap;
Expand All @@ -18,8 +18,8 @@
}

.tabs > li:not(.in-dropdown) {
@include flex-grow(0);
@include flex-shrink(0);
flex-grow: 0;
flex-shrink: 0;

// Move down one pixel to sit on top of the ul's border-bottom
position: relative;
Expand Down Expand Up @@ -54,13 +54,13 @@
}

.tabs-overflowed.tabs > li:not(.tabs-dropdown) {
@include flex-grow(1);
@include flex-shrink(1);
flex-grow: 1;
flex-shrink: 1;
}

.tabs-dropdown {
@include flex-grow(0);
@include flex-shrink(0);
flex-grow: 0;
flex-shrink: 0;
position: relative;

.tabs:not(.tabs-overflowed) & {
Expand Down
10 changes: 5 additions & 5 deletions backend/app/assets/stylesheets/spree/backend/sections/_style_guide.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.style-guide {
@include display(flex);
display: flex;

&-sidebar {
width: 225px;
Expand All @@ -23,7 +23,7 @@
}

&-main-content {
@include flex(1);
flex: 1;
}

ul {
Expand Down Expand Up @@ -109,12 +109,12 @@
}

.color-variables {
@include display(flex);
@include flex-wrap(wrap);
display: flex;
flex-wrap: wrap;
}

.color-variable {
@include flex-shrink(0);
flex-shrink: 0;
width: 240px;
padding: 1rem;

Expand Down
4 changes: 2 additions & 2 deletions backend/app/assets/stylesheets/spree/backend/shared/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ span.info {

&.checkbox {
min-height: 73px;
@include display(flex);
@include align-items(center);
display: flex;
align-items: center;

input[type="checkbox"] {
display: inline-block;
Expand Down
6 changes: 3 additions & 3 deletions backend/app/assets/stylesheets/spree/backend/shared/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.main-header {
@include display(flex);
@include align-items(center);
display: flex;
align-items: center;
padding: 15px $grid-gutter-width;
background-color: very-light($color-3, 4);
border-bottom: 1px solid $color-border;
Expand All @@ -25,7 +25,7 @@
}

.header-actions {
@include flex-grow(1);
flex-grow: 1;
text-align: right;
line-height: 38px;

Expand Down