Refactor gerneric css

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b1a2342..aa87ea7 100644 (file)
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,10 +9,26 @@
  *= require_self
 */
 
+/** Override bootstrap variables **/
+$font-size-base: 13px !default;
+
 /**
- * GitLab bootstrap:
+ * Twitter bootstrap:
  */
-@import "gitlab_bootstrap.scss";
+@import 'bootstrap';
+
+/**
+ * Font icons
+ *
+ */
+@import "font-awesome";
+
+/**
+ * Generic css (forms, nav etc):
+ */
+@import "generic.scss";
+
+
 
 @import "common.scss";
 @import "selects.scss";

diff --git a/app/assets/stylesheets/generic.scss b/app/assets/stylesheets/generic.scss
new file mode 100644 (file)
index 0000000..0ebbbf2
--- /dev/null
+++ b/app/assets/stylesheets/generic.scss
@@ -0,0 +1,14 @@
+@import "generic/variables.scss";
+@import "generic/fonts.scss";
+@import "generic/mixins.scss";
+@import "generic/avatar.scss";
+@import "generic/nav.scss";
+@import "generic/common.scss";
+@import "generic/typography.scss";
+@import "generic/buttons.scss";
+@import "generic/blocks.scss";
+@import "generic/ui_box.scss";
+@import "generic/issue_box.scss";
+@import "generic/files.scss";
+@import "generic/lists.scss";
+@import "generic/forms.scss";

diff --git a/app/assets/stylesheets/gitlab_bootstrap/avatar.scss b/app/assets/stylesheets/generic/avatar.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/avatar.scss
rename to app/assets/stylesheets/generic/avatar.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/blocks.scss b/app/assets/stylesheets/generic/blocks.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/blocks.scss
rename to app/assets/stylesheets/generic/blocks.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/generic/buttons.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/buttons.scss
rename to app/assets/stylesheets/generic/buttons.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/generic/common.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/common.scss
rename to app/assets/stylesheets/generic/common.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/generic/files.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/files.scss
rename to app/assets/stylesheets/generic/files.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/fonts.scss b/app/assets/stylesheets/generic/fonts.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/fonts.scss
rename to app/assets/stylesheets/generic/fonts.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/forms.scss b/app/assets/stylesheets/generic/forms.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/forms.scss
rename to app/assets/stylesheets/generic/forms.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/issue_box.scss
rename to app/assets/stylesheets/generic/issue_box.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/lists.scss b/app/assets/stylesheets/generic/lists.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/lists.scss
rename to app/assets/stylesheets/generic/lists.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/mixins.scss b/app/assets/stylesheets/generic/mixins.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/mixins.scss
rename to app/assets/stylesheets/generic/mixins.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/nav.scss b/app/assets/stylesheets/generic/nav.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/nav.scss
rename to app/assets/stylesheets/generic/nav.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/generic/typography.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/typography.scss
rename to app/assets/stylesheets/generic/typography.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/ui_box.scss b/app/assets/stylesheets/generic/ui_box.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/ui_box.scss
rename to app/assets/stylesheets/generic/ui_box.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap/variables.scss b/app/assets/stylesheets/generic/variables.scss
similarity index 100%
rename from app/assets/stylesheets/gitlab_bootstrap/variables.scss
rename to app/assets/stylesheets/generic/variables.scss

diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
deleted file mode 100644 (file)
index c851dd9..0000000
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-/** Override bootstrap variables **/
-$font-size-base: 13px !default;
-
-@import 'bootstrap';
-/**
- * BOOTSTRAP
- */
-/*@import "bootstrap/variables";*/
-/*@import "bootstrap/mixins";*/
-/*@import "bootstrap/reset";*/
-/*@import "bootstrap/scaffolding";*/
-/*@import "bootstrap/grid";*/
-/*@import "bootstrap/layouts";*/
-/*@import "bootstrap/type";*/
-/*@import "bootstrap/code";*/
-/*@import "bootstrap/forms";*/
-/*@import "bootstrap/tables";*/
-/*@import "bootstrap/sprites";*/
-/*@import "bootstrap/dropdowns";*/
-/*@import "bootstrap/wells";*/
-/*@import "bootstrap/component-animations";*/
-/*@import "bootstrap/close";*/
-/*@import "bootstrap/button-groups";*/
-/*@import "bootstrap/alerts";*/
-/*@import "bootstrap/navs";*/
-/*@import "bootstrap/navbar";*/
-/*@import "bootstrap/breadcrumbs";*/
-/*@import "bootstrap/pagination";*/
-/*@import "bootstrap/pager";*/
-/*@import "bootstrap/modals";*/
-/*@import "bootstrap/tooltip";*/
-/*@import "bootstrap/popovers";*/
-/*@import "bootstrap/thumbnails";*/
-/*@import "bootstrap/media";*/
-/*@import "bootstrap/labels-badges";*/
-/*@import "bootstrap/progress-bars";*/
-/*@import "bootstrap/accordion";*/
-/*@import "bootstrap/carousel";*/
-/*@import "bootstrap/hero-unit";*/
-/*@import "bootstrap/utilities";*/
-/*@import "bootstrap/responsive-utilities";*/
-/*@import "bootstrap/responsive-1200px-min";*/
-
-/**
- * Font icons
- *
- */
-@import "font-awesome";
-
-/**
- * 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/avatar.scss";
-@import "gitlab_bootstrap/nav.scss";
-@import "gitlab_bootstrap/common.scss";
-@import "gitlab_bootstrap/typography.scss";
-@import "gitlab_bootstrap/buttons.scss";
-@import "gitlab_bootstrap/blocks.scss";
-@import "gitlab_bootstrap/ui_box.scss";
-@import "gitlab_bootstrap/issue_box.scss";
-@import "gitlab_bootstrap/files.scss";
-@import "gitlab_bootstrap/lists.scss";
-@import "gitlab_bootstrap/forms.scss";