diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d9ede6379440525a0d6935209cb58a5841c6db56..233e01cc06b354a504dda5e8bbeb0c63eebec394 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 0000000000000000000000000000000000000000..c5e23c1c328cff7bec6a01e53321c00fc3748bec --- /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