From 52fbcd45a4df8e93b04791fe25ff39c58f524bfa Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 18:34:24 +0200 Subject: [PATCH 1/3] Better organization of styles --- app/assets/stylesheets/gitlab_bootstrap.scss | 26 ++++ app/assets/stylesheets/main.scss | 128 ++----------------- app/assets/stylesheets/themes/ui_basic.scss | 12 -- 3 files changed, 38 insertions(+), 128 deletions(-) create mode 100644 app/assets/stylesheets/gitlab_bootstrap.scss diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss new file mode 100644 index 00000000000..d2efe1fa06a --- /dev/null +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -0,0 +1,26 @@ +/** Override bootstrap variables **/ +$baseFontSize: 13px !default; +$baseLineHeight: 18px !default; + +// BOOTSTRAP +@import "bootstrap"; +@import "bootstrap/responsive-utilities"; +@import "bootstrap/responsive-1200px-min"; + +@import "font-awesome"; +@import "variables.scss"; +@import "fonts.scss"; +@import "mixins.scss"; + +/** + * GitLab bootstrap. + * Overrides some styles of twitter bootstrap. + * Also give some common classes for GitLab app + */ +@import "gitlab_bootstrap/common.scss"; +@import "gitlab_bootstrap/typography.scss"; +@import "gitlab_bootstrap/buttons.scss"; +@import "gitlab_bootstrap/blocks.scss"; +@import "gitlab_bootstrap/files.scss"; +@import "gitlab_bootstrap/tables.scss"; +@import "gitlab_bootstrap/lists.scss"; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index ccae351eb8f..e74bc9d15cb 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -1,91 +1,13 @@ -/** Override bootstrap variables **/ -$baseFontSize: 13px !default; -$baseLineHeight: 18px !default; - -// BOOTSTRAP -@import "bootstrap"; -@import "bootstrap/responsive-utilities"; -@import "bootstrap/responsive-1200px-min"; - -// FONT AWESOME -@import "font-awesome"; - /** - * Variables - * Contains colors + * GitLab bootstrap: */ -@import "variables.scss"; +@import "gitlab_bootstrap.scss"; -/** - * Custom fonts - * Contains @font-face font Korolev and default $monotype - */ -@import "fonts.scss"; - -/** - * General mixins. - * Contains rounded borders, gradients and shades - */ -@import "mixins.scss"; +@import "common.scss"; +@import "ref_select.scss"; -/** - * Header of application. - * Contain application logo, search panel, profile icon - */ @import "sections/header.scss"; - -/** - * Navigation menu of application. - * Panel with links to pages depends on project, profile or admin area - */ @import "sections/nav.scss"; - -/** - * This file represent some UI that can be changed - * during web app restyle or theme select. - * - * Next items should be placed there - * - link, button colors - * - header restyles - * - main menu restyles - * - */ -@import "themes/ui_basic.scss"; - -/** - * UI themes: - */ -@import "themes/ui_mars.scss"; -@import "themes/ui_modern.scss"; -@import "themes/ui_gray.scss"; -@import "themes/ui_color.scss"; - -/** - * GitLab bootstrap. - * Overrides some styles of twitter bootstrap. - * Also give some common classes for GitLab app - */ -@import "gitlab_bootstrap/common.scss"; -@import "gitlab_bootstrap/typography.scss"; -@import "gitlab_bootstrap/buttons.scss"; -@import "gitlab_bootstrap/blocks.scss"; -@import "gitlab_bootstrap/files.scss"; -@import "gitlab_bootstrap/tables.scss"; -@import "gitlab_bootstrap/lists.scss"; - - -/** - * Most of application styles placed here. - * This file represent common UI that should not be changed between themes - * or project restyling like form width or user avatar class or commit title - * - * TODO: clean it - */ -@import "common.scss"; - -/** - * Styles related to specific part of app - */ @import "sections/commits.scss"; @import "sections/issues.scss"; @import "sections/projects.scss"; @@ -95,47 +17,21 @@ $baseLineHeight: 18px !default; @import "sections/graph.scss"; @import "sections/events.scss"; @import "sections/themes.scss"; - -/** - * This scss file redefine chozen selectbox styles for - * project Branch/Tag select element - */ -@import "ref_select.scss"; - -/** - * Code (files list) styles. Browsing project files there - */ @import "sections/tree.scss"; - -/** - * This file represent notes(comments) styles - */ @import "sections/notes.scss"; - -/** - * This file represent profile styles - */ @import "sections/profile.scss"; - -/** - * Devise styles - */ @import "sections/login.scss"; +@import "sections/editor.scss"; -/** - * CODE HIGHTLIGHT BASE - * - */ @import "highlight/white.scss"; - -/** - * CODE HIGHTLIGHT DARK schema - * - */ @import "highlight/dark.scss"; /** - * File Editor styles - * + * UI themes: */ -@import "sections/editor.scss"; +@import "themes/ui_basic.scss"; +@import "themes/ui_mars.scss"; +@import "themes/ui_modern.scss"; +@import "themes/ui_gray.scss"; +@import "themes/ui_color.scss"; + diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss index fee179899ce..b377727779a 100644 --- a/app/assets/stylesheets/themes/ui_basic.scss +++ b/app/assets/stylesheets/themes/ui_basic.scss @@ -4,18 +4,6 @@ * */ .ui_basic { - /* - * Common styles - * - */ - a { - color: $link_color; - &:hover { - text-decoration: none; - color: $primary_color; - } - } - .app_logo { .separator { margin-left: 0; -- GitLab From 965102b3f654544adada3283dcd0fab92028f253 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 19:02:12 +0200 Subject: [PATCH 2/3] Move mixins and variables under gitlab bootstrap --- app/assets/stylesheets/gitlab_bootstrap.scss | 6 +++--- app/assets/stylesheets/{ => gitlab_bootstrap}/fonts.scss | 0 app/assets/stylesheets/{ => gitlab_bootstrap}/mixins.scss | 0 .../stylesheets/{ => gitlab_bootstrap}/variables.scss | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename app/assets/stylesheets/{ => gitlab_bootstrap}/fonts.scss (100%) rename app/assets/stylesheets/{ => gitlab_bootstrap}/mixins.scss (100%) rename app/assets/stylesheets/{ => gitlab_bootstrap}/variables.scss (100%) diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index d2efe1fa06a..f53e0e50bab 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -8,15 +8,15 @@ $baseLineHeight: 18px !default; @import "bootstrap/responsive-1200px-min"; @import "font-awesome"; -@import "variables.scss"; -@import "fonts.scss"; -@import "mixins.scss"; /** * GitLab bootstrap. * Overrides some styles of twitter bootstrap. * Also give some common classes for GitLab app */ +@import "gitlab_bootstrap/variables.scss"; +@import "gitlab_bootstrap/fonts.scss"; +@import "gitlab_bootstrap/mixins.scss"; @import "gitlab_bootstrap/common.scss"; @import "gitlab_bootstrap/typography.scss"; @import "gitlab_bootstrap/buttons.scss"; diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/gitlab_bootstrap/fonts.scss similarity index 100% rename from app/assets/stylesheets/fonts.scss rename to app/assets/stylesheets/gitlab_bootstrap/fonts.scss diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/gitlab_bootstrap/mixins.scss similarity index 100% rename from app/assets/stylesheets/mixins.scss rename to app/assets/stylesheets/gitlab_bootstrap/mixins.scss diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/gitlab_bootstrap/variables.scss similarity index 100% rename from app/assets/stylesheets/variables.scss rename to app/assets/stylesheets/gitlab_bootstrap/variables.scss -- GitLab From 9b57bf78112017072ff3303946f9f2129a015cba Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 19 Dec 2012 20:57:41 +0200 Subject: [PATCH 3/3] Remove main. Use application.scss instead --- app/assets/stylesheets/application.css | 10 ---------- app/assets/stylesheets/{main.scss => application.scss} | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 app/assets/stylesheets/application.css rename app/assets/stylesheets/{main.scss => application.scss} (68%) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index a23d4532915..00000000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,10 +0,0 @@ -/* - * This is a manifest file that'll automatically include all the stylesheets available in this directory - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require jquery.ui.gitlab - *= require jquery.atwho - *= require chosen - *= require_self - *= require main -*/ diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/application.scss similarity index 68% rename from app/assets/stylesheets/main.scss rename to app/assets/stylesheets/application.scss index e74bc9d15cb..54690e73f81 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/application.scss @@ -1,3 +1,13 @@ +/* + * This is a manifest file that'll automatically include all the stylesheets available in this directory + * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + * the top of the compiled file, but it's generally better to create a new file per style scope. + *= require jquery.ui.gitlab + *= require jquery.atwho + *= require chosen + *= require_self +*/ + /** * GitLab bootstrap: */ -- GitLab