Skip to content

Commit

Permalink
Remove mappy-bp dependency
Browse files Browse the repository at this point in the history
Resolves #21 #21
  • Loading branch information
chrislopresto committed Apr 7, 2016
1 parent 5764a72 commit d97c917
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
10 changes: 5 additions & 5 deletions app/styles/components/freestyle-guide.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ $FreestyleGuide-maxWidth: 1200px !default;
font-size: 1.4rem;
font-weight: bold;

@include mappy-bp(large) {
@include freestyle-breakpoint(large) {
font-size: 1.9rem;
}
}
Expand All @@ -65,15 +65,15 @@ $FreestyleGuide-maxWidth: 1200px !default;
flex: 1 0 auto;
flex-direction: column;

@include mappy-bp(large) {
@include freestyle-breakpoint(large) {
flex-direction: row;
}
}

&-content {
margin-top: 1.5rem;

@include mappy-bp(large) {
@include freestyle-breakpoint(large) {
flex: 1;
margin: 0;
}
Expand All @@ -84,7 +84,7 @@ $FreestyleGuide-maxWidth: 1200px !default;
order: -1;
padding: 1rem;

@include mappy-bp(large) {
@include freestyle-breakpoint(large) {
border-right: solid 1px $FreestyleGuide-color--secondary;
flex: 0 0 18rem;
}
Expand All @@ -98,7 +98,7 @@ $FreestyleGuide-maxWidth: 1200px !default;
margin-right: .5rem;
box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16), 0 2px 10px 0 rgba(0,0,0,0.12);

@include mappy-bp(large) {
@include freestyle-breakpoint(large) {
border-left: solid 1px $FreestyleGuide-color--secondary;
order: 1;
}
Expand Down
2 changes: 1 addition & 1 deletion app/styles/components/freestyle-usage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $FreestyleUsage-maxWidth: $FreestyleGuide-maxWidth !default;
padding-bottom: 0;
width: 100%;

@include mappy-bp(large) {
@include freestyle-breakpoint(large) {
max-width: inherit;
width: auto;
}
Expand Down
11 changes: 11 additions & 0 deletions app/styles/ember-freestyle.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
// TODO: Replace with actual breakpoint system
$FreestyleBreakpoints: (
large: 600px
);

@mixin freestyle-breakpoint($name: 'large') {
@media (min-width: map-get($FreestyleBreakpoints, $name)) {
@content
}
};

@import "components/freestyle-guide";
@import "components/freestyle-collection";
@import "components/freestyle-annotation";
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"es6-promise": "^3.0.2",
"glob": "^6.0.4",
"highlight.js": "^9.1.0",
"mappy-breakpoints": "^0.2.1",
"node-sass": "sass/node-sass#11c96eee55d00c65d1ad1fddf6111bbb731aa789",
"node-sass-json-importer": "chrislopresto/node-sass-json-importer#3fb198306aaab34f6eaf6c13e251adb43383970c"
},
Expand Down

0 comments on commit d97c917

Please sign in to comment.