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

Remove bourbon from admin #2491

Merged
merged 2 commits into from
Jan 12, 2018
Merged

Remove bourbon from admin #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2e7793
Replace bourbon directional props with plain CSS
Jan 8, 2018
67d687b
Remove bourbon from solidus_backend
Jan 8, 2018
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
5 changes: 4 additions & 1 deletion backend/app/assets/stylesheets/spree/backend/components/_messages.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
}

.flash-wrapper {
@include position(fixed, null 0 0 $width-sidebar);
position: fixed;
bottom: 0;
left: $width-sidebar;
right: 0;
z-index: 1000;
}

Expand Down
6 changes: 4 additions & 2 deletions 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 @@ -123,15 +123,17 @@ nav.menu {

.admin-subnav {
background: $color-navbar-submenu-bg;
@include padding($padding-y-navbar - $padding-y-navbar-submenu null);
padding-top: $padding-y-navbar - $padding-y-navbar-submenu;
padding-bottom: $padding-y-navbar - $padding-y-navbar-submenu;

li {
background: $color-navbar-submenu-bg;
}

a {
color: $color-navbar-submenu;
@include padding($padding-y-navbar-submenu null);
padding-top: $padding-y-navbar-submenu;
padding-bottom: $padding-y-navbar-submenu;

&:hover {
color: $color-navbar-submenu-active;
Expand Down
4 changes: 3 additions & 1 deletion backend/app/assets/stylesheets/spree/backend/components/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@
}

ul {
@include position(absolute, calc(100% - 1px) 0 null null);
position: absolute;
top: calc(100% - 1px);
right: 0;
z-index: 1;
}
}
Expand Down
3 changes: 2 additions & 1 deletion backend/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
}

> * { // usually a <span> but we'll use an * just in case
@include padding(null 1rem);
padding-left: 1rem;
padding-right: 1rem;
position: relative;
background: $background;
z-index: 1;
Expand Down
12 changes: 8 additions & 4 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
Expand Up @@ -37,8 +37,10 @@
text-transform: capitalize;

> li {
@include margin(0.5rem null);
@include padding(0.75rem null);
margin-top: 0.5rem;
margin-bottom: 0.5rem;
padding-top: 0.75rem;
padding-bottom: 0.75rem;

&:not(:first-of-type) {
border-top: 1px solid $color-style-guide-nav-border;
Expand Down Expand Up @@ -67,7 +69,8 @@
}

&-section-header {
@include margin(7rem 0 3rem);
margin: 7rem 0 3rem;

border-bottom: 1px solid $color-style-guide-section-border;
font-size: 1.5rem;
font-weight: bold;
Expand All @@ -77,7 +80,8 @@

span {
background: $body-bg;
@include padding(null 0.5em);
padding-left: 0.5em;
padding-right: 0.5em;
}

a {
Expand Down
4 changes: 3 additions & 1 deletion backend/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
}

i {
@include margin(null 4px 0 6px);
margin-right: 4px;
margin-bottom: 0;
margin-left: 6px;
}

.actions a {
Expand Down
12 changes: 9 additions & 3 deletions backend/app/assets/stylesheets/spree/backend/shared/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,22 @@ body {
}

.admin-nav {
@include position(absolute, 0 null 0 0);
position: absolute;
top: 0;
bottom: 0;
left: 0;
width: $width-sidebar;
@media print { display: none }
}

.content-wrapper {
@include padding(1rem $grid-gutter-width null);
padding-top: 1rem;
padding-left: $grid-gutter-width;
padding-right: $grid-gutter-width;

&:not(.full-width) {
@include margin(null auto);
margin-left: auto;
margin-right: auto;
max-width: map-get($container-max-widths, "xl");
}
}
Expand Down
2 changes: 0 additions & 2 deletions backend/app/assets/stylesheets/spree/backend/spree_admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import 'bourbon';

@import 'spree/backend/globals/functions';
@import 'spree/backend/globals/deprecation';
@import 'spree/backend/globals/variables_override';
Expand Down
1 change: 0 additions & 1 deletion backend/lib/spree/backend.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require 'jquery-ui-rails'
require 'coffee-rails'
require 'sass-rails'
require 'bourbon'
require 'handlebars_assets'
require 'font-awesome-rails'
require 'autoprefixer-rails'
Expand Down
1 change: 0 additions & 1 deletion backend/solidus_backend.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Gem::Specification.new do |s|

s.add_dependency 'sass-rails'
s.add_dependency 'coffee-rails'
s.add_dependency 'bourbon', '>= 4', '< 6'
s.add_dependency 'jquery-rails'
s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
s.add_dependency 'font-awesome-rails', '~> 4.0'
Expand Down