From 0528b83fcc3f4f751aa099f9d94fc3d6dc443447 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Thu, 6 Jul 2017 14:15:57 +0200 Subject: [PATCH] Remove %page-width-container from common --- app/assets/stylesheets/new_design/_placeholders.scss | 7 ------- app/assets/stylesheets/new_design/common.scss | 6 +++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/new_design/_placeholders.scss b/app/assets/stylesheets/new_design/_placeholders.scss index 086e5ecfe..53e98918e 100644 --- a/app/assets/stylesheets/new_design/_placeholders.scss +++ b/app/assets/stylesheets/new_design/_placeholders.scss @@ -1,5 +1,4 @@ @import "constants"; -@import "mixins"; %horizontal-list { list-style-type: none; @@ -14,12 +13,6 @@ display: inline-block; } -%page-width-container { - @include horizontal-padding($default-padding); - max-width: $page-width + 2 * $default-padding; - margin: 0 auto; -} - %animation { animation-fill-mode: forwards; animation-duration: 0.3s; diff --git a/app/assets/stylesheets/new_design/common.scss b/app/assets/stylesheets/new_design/common.scss index d956cdc94..356958032 100644 --- a/app/assets/stylesheets/new_design/common.scss +++ b/app/assets/stylesheets/new_design/common.scss @@ -1,3 +1,5 @@ +@import "constants"; +@import "mixins"; @import "placeholders"; @import "typography"; @@ -13,5 +15,7 @@ h1 { } .container { - @extend %page-width-container; + @include horizontal-padding($default-padding); + max-width: $page-width + 2 * $default-padding; + margin: 0 auto; }