Skip to content

remove bourbon-neat #671

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

Merged
merged 1 commit into from
Mar 7, 2020
Merged

remove bourbon-neat #671

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
1 change: 0 additions & 1 deletion app/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import "normalize";
@import "bourbon";
@import "./base/base";
@import "neat";
@import "./components/all";
@import "class";
@import "ember-power-select";
9 changes: 1 addition & 8 deletions app/styles/base/_grid-settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
@import "neat-helpers"; // or "../neat/neat-helpers" when not in Rails
// Neat Overrides
// $column: 90px;
// $gutter: 30px;
// $grid-columns: 12;
// $max-width: 1088px;
// Neat Breakpoints
$mobile-portrait-screen: 30em; // 480px
$medium-screen: 40em; // 640px
$large-screen: 54em; // 864px
$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
$medium-large-screen-up: new-breakpoint(min-width $medium-screen 8);
$large-screen-up: new-breakpoint(min-width $large-screen 8);
$large-screen-up: new-breakpoint(min-width $large-screen 8);
4 changes: 2 additions & 2 deletions app/styles/components/_back-to-top.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
margin-left: 1em;
text-align: center;

@include media(max-width 89em) {
@media (max-width: 89em) {
@include size(1.5em);
overflow: hidden;
}

@include media(max-width 78em) {
@media (max-width: 78em) {
height: 0;
}
}
4 changes: 2 additions & 2 deletions app/styles/components/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
main {
@include media($large-screen) {
@media screen and (min-width: $large-screen) {
display: flex;
}
}

.container {
@include outer-container;
margin: 0 auto;
padding: 0 1em;
&::after {
clear: both;
Expand Down
6 changes: 3 additions & 3 deletions app/styles/components/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.sidebar {

@include media($large-screen-up) {
@media (min-width: $large-screen-up) {
margin-right: 0;
border-bottom: 0;
padding: $small-spacing $base-spacing $base-spacing * 1.5;
Expand Down Expand Up @@ -46,7 +46,7 @@ label[for="toc-toggle"] {
border-width: 0 4px 5px 4px;
}

@include media($large-screen) {
@media screen and (min-width: $large-screen) {
display: none;
}
}
Expand All @@ -59,7 +59,7 @@ label[for="toc-toggle"] {
.toc-toggle:checked ~ & {
display: block;
}
@include media($large-screen) {
@media screen and (min-width: $large-screen) {
display: block;

// ensure toc-toggle can not cause toc-container to be hidden on large screen
Expand Down
1 change: 0 additions & 1 deletion ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module.exports = function(defaults) {
sassOptions: {
includePaths: [
'app/styles',
'node_modules/bourbon-neat/app/assets/stylesheets',
'node_modules/normalize.css'
]
},
Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"@ember/jquery": "^0.5.2",
"@ember/optional-features": "^0.6.3",
"algoliasearch": "^3.32.1",
"bourbon-neat": "^1.9.1",
"broccoli-asset-rev": "^3.0.0",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^2.0.0",
Expand Down
Loading