From 8d37efec4030e9e69785c9c7ebb2d0a12b993b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Thu, 16 Jul 2015 13:50:19 +0200 Subject: [PATCH] fix layouting issues for sluice --- sass/ascribe_app.scss | 5 ----- sass/main.scss | 7 ++++++- sass/whitelabel/prize/index.scss | 1 - sass/whitelabel/prize/landing.scss | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 sass/ascribe_app.scss diff --git a/sass/ascribe_app.scss b/sass/ascribe_app.scss deleted file mode 100644 index ed811263..00000000 --- a/sass/ascribe_app.scss +++ /dev/null @@ -1,5 +0,0 @@ -.ascribe-default-app { - background-color: #FDFDFD; - border-radius: 0; - padding-top: 70px; -} diff --git a/sass/main.scss b/sass/main.scss index 6976f3b1..ae3ef98f 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -11,7 +11,6 @@ $BASE_URL: '<%= BASE_URL %>'; @import 'ascribe_theme'; @import './ascribe-fonts/style'; @import './ascribe-fonts/ascribe-fonts'; -@import 'ascribe_app'; @import 'ascribe_login'; @import 'ascribe_table'; @import 'ascribe_accordion_list'; @@ -34,12 +33,18 @@ $BASE_URL: '<%= BASE_URL %>'; html, body { height: 100%; + background-color: #FDFDFD; } html { overflow-y: scroll; } +.ascribe-default-app { + max-width: 90%; + padding-top: 70px; +} + hr { margin-bottom: 15px; } diff --git a/sass/whitelabel/prize/index.scss b/sass/whitelabel/prize/index.scss index 42f28ac5..cc25b7ec 100644 --- a/sass/whitelabel/prize/index.scss +++ b/sass/whitelabel/prize/index.scss @@ -1,7 +1,6 @@ @import 'landing'; .ascribe-prize-app { - background-color: #FDFDFD; border-radius: 0; padding-top: 70px; min-height: 100vh; diff --git a/sass/whitelabel/prize/landing.scss b/sass/whitelabel/prize/landing.scss index 98c44930..fd639ca4 100644 --- a/sass/whitelabel/prize/landing.scss +++ b/sass/whitelabel/prize/landing.scss @@ -3,7 +3,6 @@ max-width: 90%; margin: auto; /* We need this, otherwise piece list will have a scrollbar */ - overflow-x: hidden; } .hero {