summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework.scss
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 14:46:15 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-02 14:46:15 +0100
commit3ae7dba931b880b8090edffb247ebfe32d26648e (patch)
tree11b681080e41dc6a859f73069db1702d1eb8ff28 /app/assets/stylesheets/framework.scss
parent58dad2a9dadea647b5665e1de6a6e997484b96b1 (diff)
downloadgitlab-ce-3ae7dba931b880b8090edffb247ebfe32d26648e.tar.gz
Use gl-padding instead of 15px/20px where appropriate
Diffstat (limited to 'app/assets/stylesheets/framework.scss')
-rw-r--r--app/assets/stylesheets/framework.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
index 1ec9d2fd84f..48a4971c8fc 100644
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -1,9 +1,9 @@
@import "framework/fonts";
@import "framework/variables";
@import "framework/mixins";
-@import "framework/layout";
@import 'framework/tw_bootstrap_variables';
@import 'framework/tw_bootstrap';
+@import "framework/layout";
@import "framework/avatar.scss";
@import "framework/blocks.scss";
@@ -25,6 +25,7 @@
@import "framework/markdown_area.scss";
@import "framework/mobile.scss";
@import "framework/pagination.scss";
+@import "framework/panels.scss";
@import "framework/selects.scss";
@import "framework/sidebar.scss";
@import "framework/tables.scss";