From ff3541567228c7862dd16db6690f5ceffe565430 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 30 Jan 2017 22:55:33 -0500 Subject: [PATCH] Override bootstrap variables correctly --- resources/assets/sass/_var.scss | 4 ++-- resources/assets/sass/app.scss | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/assets/sass/_var.scss b/resources/assets/sass/_var.scss index b7d9ceb..6930732 100644 --- a/resources/assets/sass/_var.scss +++ b/resources/assets/sass/_var.scss @@ -2,8 +2,8 @@ // Overrides // -$grid-float-breakpoint: $screen-sm; -$grid-float-breakpoint-max: ($grid-float-breakpoint - 1); +$grid-float-breakpoint: 768px; +$grid-float-breakpoint-max: ($grid-float-breakpoint - 1px); // // Custom Variables diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 0ddc9f7..e1fc692 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,10 +1,10 @@ -// Libraries -@import "bootstrap-sass/assets/stylesheets/_bootstrap.scss"; - // Core @import "_var"; @import "_fonts"; +// Libraries +@import "bootstrap-sass/assets/stylesheets/_bootstrap.scss"; + // Supplementary @import "elements/**/*.scss"; @import "pages/**/*.scss";