From 9f75f14aab2af9982b7309b75deeb5e6c64abf1b Mon Sep 17 00:00:00 2001 From: Jens Ulferts Date: Thu, 29 Jan 2015 14:13:14 +0100 Subject: [PATCH] adding new breakpoint xxxlarge --- app/assets/stylesheets/_settings.scss | 15 ++++++++------- app/assets/stylesheets/default.css.sass | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 1745ca59d7..a2ce669389 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -119,13 +119,14 @@ $include-css: ( // These are our named breakpoints. You can use them in our breakpoint function like this: // @include breakpoint(medium) { // Medium and larger styles } -// $breakpoints: ( -// small: rem-calc(0), -// medium: rem-calc(640), -// large: rem-calc(1200), -// xlarge: rem-calc(1440), -// xxlarge: rem-calc(1920), -// ); +$breakpoints: ( + small: rem-calc(300), + medium: rem-calc(640), + large: rem-calc(1200), + xlarge: rem-calc(1440), + xxlarge: rem-calc(1920), + xxxlarge: rem-calc(2048), +); // All of the names in this list will be output as classes in your CSS, // like small-12, medium-6, and so on. diff --git a/app/assets/stylesheets/default.css.sass b/app/assets/stylesheets/default.css.sass index b082b21f35..e5565334d2 100644 --- a/app/assets/stylesheets/default.css.sass +++ b/app/assets/stylesheets/default.css.sass @@ -35,13 +35,13 @@ @import bourbon @import open_project_global/all + +@import foundation @import settings @import fonts/lato @import fonts/openproject_icon_font -@import foundation - @import layout/all @import content/accounts @import content/context_menu