From cba6d62323eba2286f78e8aea12a5ecd26903728 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 12 Oct 2015 14:49:23 +0200 Subject: [PATCH 1/4] Move CI styles to pages dir Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/{ci => pages}/builds.scss | 0 .../stylesheets/{ci/projects.scss => pages/ci_projects.scss} | 0 app/assets/stylesheets/{ci => pages}/lint.scss | 0 app/assets/stylesheets/{ci => pages}/runners.scss | 0 app/assets/stylesheets/{ci => pages}/status.scss | 0 app/assets/stylesheets/{ci => pages}/xterm.scss | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename app/assets/stylesheets/{ci => pages}/builds.scss (100%) rename app/assets/stylesheets/{ci/projects.scss => pages/ci_projects.scss} (100%) rename app/assets/stylesheets/{ci => pages}/lint.scss (100%) rename app/assets/stylesheets/{ci => pages}/runners.scss (100%) rename app/assets/stylesheets/{ci => pages}/status.scss (100%) rename app/assets/stylesheets/{ci => pages}/xterm.scss (100%) diff --git a/app/assets/stylesheets/ci/builds.scss b/app/assets/stylesheets/pages/builds.scss similarity index 100% rename from app/assets/stylesheets/ci/builds.scss rename to app/assets/stylesheets/pages/builds.scss diff --git a/app/assets/stylesheets/ci/projects.scss b/app/assets/stylesheets/pages/ci_projects.scss similarity index 100% rename from app/assets/stylesheets/ci/projects.scss rename to app/assets/stylesheets/pages/ci_projects.scss diff --git a/app/assets/stylesheets/ci/lint.scss b/app/assets/stylesheets/pages/lint.scss similarity index 100% rename from app/assets/stylesheets/ci/lint.scss rename to app/assets/stylesheets/pages/lint.scss diff --git a/app/assets/stylesheets/ci/runners.scss b/app/assets/stylesheets/pages/runners.scss similarity index 100% rename from app/assets/stylesheets/ci/runners.scss rename to app/assets/stylesheets/pages/runners.scss diff --git a/app/assets/stylesheets/ci/status.scss b/app/assets/stylesheets/pages/status.scss similarity index 100% rename from app/assets/stylesheets/ci/status.scss rename to app/assets/stylesheets/pages/status.scss diff --git a/app/assets/stylesheets/ci/xterm.scss b/app/assets/stylesheets/pages/xterm.scss similarity index 100% rename from app/assets/stylesheets/ci/xterm.scss rename to app/assets/stylesheets/pages/xterm.scss From bdd477a0f800328a527f2fad92d1303441689341 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 12 Oct 2015 15:00:04 +0200 Subject: [PATCH 2/4] Re-organize GitLab css into 2 directories: framework and page specific css Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/application.scss | 30 ++--------------- app/assets/stylesheets/framework.scss | 32 +++++++++++++++++++ .../{generic => framework}/avatar.scss | 0 .../{generic => framework}/blocks.scss | 0 .../{generic => framework}/buttons.scss | 0 .../{generic => framework}/calendar.scss | 0 .../{generic => framework}/callout.scss | 0 .../{generic => framework}/common.scss | 0 .../{generic => framework}/files.scss | 0 .../{generic => framework}/filters.scss | 0 .../{generic => framework}/flash.scss | 0 .../{base => framework}/fonts.scss | 0 .../{generic => framework}/forms.scss | 0 .../{generic => framework}/gfm.scss | 0 .../{themes => framework}/gitlab-theme.scss | 0 .../{base => framework}/gl_bootstrap.scss | 0 .../{base => framework}/gl_variables.scss | 0 .../{generic => framework}/header.scss | 0 .../{generic => framework}/highlight.scss | 0 .../{generic => framework}/issue_box.scss | 0 .../{generic => framework}/jquery.scss | 0 .../{base => framework}/layout.scss | 0 .../{generic => framework}/lists.scss | 0 .../{generic => framework}/markdown_area.scss | 0 .../{base => framework}/mixins.scss | 0 .../{generic => framework}/mobile.scss | 0 .../{generic => framework}/pagination.scss | 0 .../{generic => framework}/selects.scss | 0 .../{generic => framework}/sidebar.scss | 0 .../{generic => framework}/tables.scss | 0 .../{generic => framework}/timeline.scss | 0 .../{generic => framework}/typography.scss | 0 .../{base => framework}/variables.scss | 0 .../{generic => framework}/zen.scss | 0 34 files changed, 34 insertions(+), 28 deletions(-) create mode 100644 app/assets/stylesheets/framework.scss rename app/assets/stylesheets/{generic => framework}/avatar.scss (100%) rename app/assets/stylesheets/{generic => framework}/blocks.scss (100%) rename app/assets/stylesheets/{generic => framework}/buttons.scss (100%) rename app/assets/stylesheets/{generic => framework}/calendar.scss (100%) rename app/assets/stylesheets/{generic => framework}/callout.scss (100%) rename app/assets/stylesheets/{generic => framework}/common.scss (100%) rename app/assets/stylesheets/{generic => framework}/files.scss (100%) rename app/assets/stylesheets/{generic => framework}/filters.scss (100%) rename app/assets/stylesheets/{generic => framework}/flash.scss (100%) rename app/assets/stylesheets/{base => framework}/fonts.scss (100%) rename app/assets/stylesheets/{generic => framework}/forms.scss (100%) rename app/assets/stylesheets/{generic => framework}/gfm.scss (100%) rename app/assets/stylesheets/{themes => framework}/gitlab-theme.scss (100%) rename app/assets/stylesheets/{base => framework}/gl_bootstrap.scss (100%) rename app/assets/stylesheets/{base => framework}/gl_variables.scss (100%) rename app/assets/stylesheets/{generic => framework}/header.scss (100%) rename app/assets/stylesheets/{generic => framework}/highlight.scss (100%) rename app/assets/stylesheets/{generic => framework}/issue_box.scss (100%) rename app/assets/stylesheets/{generic => framework}/jquery.scss (100%) rename app/assets/stylesheets/{base => framework}/layout.scss (100%) rename app/assets/stylesheets/{generic => framework}/lists.scss (100%) rename app/assets/stylesheets/{generic => framework}/markdown_area.scss (100%) rename app/assets/stylesheets/{base => framework}/mixins.scss (100%) rename app/assets/stylesheets/{generic => framework}/mobile.scss (100%) rename app/assets/stylesheets/{generic => framework}/pagination.scss (100%) rename app/assets/stylesheets/{generic => framework}/selects.scss (100%) rename app/assets/stylesheets/{generic => framework}/sidebar.scss (100%) rename app/assets/stylesheets/{generic => framework}/tables.scss (100%) rename app/assets/stylesheets/{generic => framework}/timeline.scss (100%) rename app/assets/stylesheets/{generic => framework}/typography.scss (100%) rename app/assets/stylesheets/{base => framework}/variables.scss (100%) rename app/assets/stylesheets/{generic => framework}/zen.scss (100%) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d9ede63794..233e01cc06 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,18 +11,10 @@ *= require cal-heatmap */ - -@import "base/fonts"; -@import "base/variables"; -@import "base/mixins"; -@import "base/layout"; - - /** - * Customized Twitter bootstrap + * GitLab UI framework */ -@import 'base/gl_variables'; -@import 'base/gl_bootstrap'; +@import "framework"; /** * NProgress load bar css @@ -32,24 +24,12 @@ /** * Font icons - * */ @import "font-awesome"; -/** - * UI themes: - */ -@import "themes/**/*"; - -/** - * Generic css (forms, nav etc): - */ -@import "generic/**/*"; - /** * Page specific styles (issues, projects etc): */ - @import "pages/**/*"; /** @@ -61,9 +41,3 @@ * Styles for JS behaviors. */ @import "behaviors.scss"; - -/** - * CI specific styles: - */ -@import "ci/**/*"; - diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss new file mode 100644 index 0000000000..c5e23c1c32 --- /dev/null +++ b/app/assets/stylesheets/framework.scss @@ -0,0 +1,32 @@ +@import "framework/fonts"; +@import "framework/variables"; +@import "framework/mixins"; +@import "framework/layout"; +@import 'framework/gl_variables'; +@import 'framework/gl_bootstrap'; +@import "framework/avatar.scss"; +@import "framework/blocks.scss"; +@import "framework/buttons.scss"; +@import "framework/calendar.scss"; +@import "framework/callout.scss"; +@import "framework/common.scss"; +@import "framework/files.scss"; +@import "framework/filters.scss"; +@import "framework/flash.scss"; +@import "framework/forms.scss"; +@import "framework/gfm.scss"; +@import "framework/gitlab-theme.scss"; +@import "framework/header.scss"; +@import "framework/highlight.scss"; +@import "framework/issue_box.scss"; +@import "framework/jquery.scss"; +@import "framework/lists.scss"; +@import "framework/markdown_area.scss"; +@import "framework/mobile.scss"; +@import "framework/pagination.scss"; +@import "framework/selects.scss"; +@import "framework/sidebar.scss"; +@import "framework/tables.scss"; +@import "framework/timeline.scss"; +@import "framework/typography.scss"; +@import "framework/zen.scss"; diff --git a/app/assets/stylesheets/generic/avatar.scss b/app/assets/stylesheets/framework/avatar.scss similarity index 100% rename from app/assets/stylesheets/generic/avatar.scss rename to app/assets/stylesheets/framework/avatar.scss diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/framework/blocks.scss similarity index 100% rename from app/assets/stylesheets/generic/blocks.scss rename to app/assets/stylesheets/framework/blocks.scss diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/framework/buttons.scss similarity index 100% rename from app/assets/stylesheets/generic/buttons.scss rename to app/assets/stylesheets/framework/buttons.scss diff --git a/app/assets/stylesheets/generic/calendar.scss b/app/assets/stylesheets/framework/calendar.scss similarity index 100% rename from app/assets/stylesheets/generic/calendar.scss rename to app/assets/stylesheets/framework/calendar.scss diff --git a/app/assets/stylesheets/generic/callout.scss b/app/assets/stylesheets/framework/callout.scss similarity index 100% rename from app/assets/stylesheets/generic/callout.scss rename to app/assets/stylesheets/framework/callout.scss diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/framework/common.scss similarity index 100% rename from app/assets/stylesheets/generic/common.scss rename to app/assets/stylesheets/framework/common.scss diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/framework/files.scss similarity index 100% rename from app/assets/stylesheets/generic/files.scss rename to app/assets/stylesheets/framework/files.scss diff --git a/app/assets/stylesheets/generic/filters.scss b/app/assets/stylesheets/framework/filters.scss similarity index 100% rename from app/assets/stylesheets/generic/filters.scss rename to app/assets/stylesheets/framework/filters.scss diff --git a/app/assets/stylesheets/generic/flash.scss b/app/assets/stylesheets/framework/flash.scss similarity index 100% rename from app/assets/stylesheets/generic/flash.scss rename to app/assets/stylesheets/framework/flash.scss diff --git a/app/assets/stylesheets/base/fonts.scss b/app/assets/stylesheets/framework/fonts.scss similarity index 100% rename from app/assets/stylesheets/base/fonts.scss rename to app/assets/stylesheets/framework/fonts.scss diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/framework/forms.scss similarity index 100% rename from app/assets/stylesheets/generic/forms.scss rename to app/assets/stylesheets/framework/forms.scss diff --git a/app/assets/stylesheets/generic/gfm.scss b/app/assets/stylesheets/framework/gfm.scss similarity index 100% rename from app/assets/stylesheets/generic/gfm.scss rename to app/assets/stylesheets/framework/gfm.scss diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss similarity index 100% rename from app/assets/stylesheets/themes/gitlab-theme.scss rename to app/assets/stylesheets/framework/gitlab-theme.scss diff --git a/app/assets/stylesheets/base/gl_bootstrap.scss b/app/assets/stylesheets/framework/gl_bootstrap.scss similarity index 100% rename from app/assets/stylesheets/base/gl_bootstrap.scss rename to app/assets/stylesheets/framework/gl_bootstrap.scss diff --git a/app/assets/stylesheets/base/gl_variables.scss b/app/assets/stylesheets/framework/gl_variables.scss similarity index 100% rename from app/assets/stylesheets/base/gl_variables.scss rename to app/assets/stylesheets/framework/gl_variables.scss diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/framework/header.scss similarity index 100% rename from app/assets/stylesheets/generic/header.scss rename to app/assets/stylesheets/framework/header.scss diff --git a/app/assets/stylesheets/generic/highlight.scss b/app/assets/stylesheets/framework/highlight.scss similarity index 100% rename from app/assets/stylesheets/generic/highlight.scss rename to app/assets/stylesheets/framework/highlight.scss diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss similarity index 100% rename from app/assets/stylesheets/generic/issue_box.scss rename to app/assets/stylesheets/framework/issue_box.scss diff --git a/app/assets/stylesheets/generic/jquery.scss b/app/assets/stylesheets/framework/jquery.scss similarity index 100% rename from app/assets/stylesheets/generic/jquery.scss rename to app/assets/stylesheets/framework/jquery.scss diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/framework/layout.scss similarity index 100% rename from app/assets/stylesheets/base/layout.scss rename to app/assets/stylesheets/framework/layout.scss diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/framework/lists.scss similarity index 100% rename from app/assets/stylesheets/generic/lists.scss rename to app/assets/stylesheets/framework/lists.scss diff --git a/app/assets/stylesheets/generic/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss similarity index 100% rename from app/assets/stylesheets/generic/markdown_area.scss rename to app/assets/stylesheets/framework/markdown_area.scss diff --git a/app/assets/stylesheets/base/mixins.scss b/app/assets/stylesheets/framework/mixins.scss similarity index 100% rename from app/assets/stylesheets/base/mixins.scss rename to app/assets/stylesheets/framework/mixins.scss diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/framework/mobile.scss similarity index 100% rename from app/assets/stylesheets/generic/mobile.scss rename to app/assets/stylesheets/framework/mobile.scss diff --git a/app/assets/stylesheets/generic/pagination.scss b/app/assets/stylesheets/framework/pagination.scss similarity index 100% rename from app/assets/stylesheets/generic/pagination.scss rename to app/assets/stylesheets/framework/pagination.scss diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/framework/selects.scss similarity index 100% rename from app/assets/stylesheets/generic/selects.scss rename to app/assets/stylesheets/framework/selects.scss diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss similarity index 100% rename from app/assets/stylesheets/generic/sidebar.scss rename to app/assets/stylesheets/framework/sidebar.scss diff --git a/app/assets/stylesheets/generic/tables.scss b/app/assets/stylesheets/framework/tables.scss similarity index 100% rename from app/assets/stylesheets/generic/tables.scss rename to app/assets/stylesheets/framework/tables.scss diff --git a/app/assets/stylesheets/generic/timeline.scss b/app/assets/stylesheets/framework/timeline.scss similarity index 100% rename from app/assets/stylesheets/generic/timeline.scss rename to app/assets/stylesheets/framework/timeline.scss diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/framework/typography.scss similarity index 100% rename from app/assets/stylesheets/generic/typography.scss rename to app/assets/stylesheets/framework/typography.scss diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/framework/variables.scss similarity index 100% rename from app/assets/stylesheets/base/variables.scss rename to app/assets/stylesheets/framework/variables.scss diff --git a/app/assets/stylesheets/generic/zen.scss b/app/assets/stylesheets/framework/zen.scss similarity index 100% rename from app/assets/stylesheets/generic/zen.scss rename to app/assets/stylesheets/framework/zen.scss From c42d35b7214348e5c31014b3d3d54e59f6030ddc Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 12 Oct 2015 15:08:33 +0200 Subject: [PATCH 3/4] Add css welcome notice Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/application.scss | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 233e01cc06..65f775ca3f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,33 +11,41 @@ *= require cal-heatmap */ -/** +/* + * Welcome to GitLab css! + * If you need to add or modify UI component that is commont for many pages + * like table or typography then make changes in framework/ directory. + * If you need to add uniq style that should affect only one page - use pages/ + * directory. + */ + +/* * GitLab UI framework */ @import "framework"; -/** +/* * NProgress load bar css */ @import 'nprogress'; @import 'nprogress-bootstrap'; -/** +/* * Font icons */ @import "font-awesome"; -/** +/* * Page specific styles (issues, projects etc): */ @import "pages/**/*"; -/** +/* * Code highlight */ @import "highlight/**/*"; -/** +/* * Styles for JS behaviors. */ @import "behaviors.scss"; From 1af4fcfa123370ab6dcf38a424c54029d7734032 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 12 Oct 2015 19:00:21 +0000 Subject: [PATCH 4/4] Fix typos in application.scss --- app/assets/stylesheets/application.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 65f775ca3f..7b060ce485 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -13,9 +13,9 @@ /* * Welcome to GitLab css! - * If you need to add or modify UI component that is commont for many pages - * like table or typography then make changes in framework/ directory. - * If you need to add uniq style that should affect only one page - use pages/ + * If you need to add or modify UI component that is common for many pages + * like a table or typography then make changes in the framework/ directory. + * If you need to add unique style that should affect only one page - use pages/ * directory. */ @@ -48,4 +48,4 @@ /* * Styles for JS behaviors. */ -@import "behaviors.scss"; +@import "behaviors.scss"; \ No newline at end of file