From ee3877f20cb699237365a0ed5a6e45820bcd1b14 Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Sun, 26 Jun 2016 10:27:47 +0200 Subject: [PATCH] new css file structure --- resources/styles/{ => common}/base.scss | 0 .../{ => common}/dependencies/animations.scss | 0 .../{ => common}/dependencies/colors.scss | 0 .../{ => common}/dependencies/fonts.scss | 0 .../{ => common}/dependencies/helpers.scss | 0 .../{ => common}/dependencies/mixin.scss | 0 .../{ => common}/dependencies/reset.scss | 0 .../{ => common}/dependencies/uxbox-dark.scss | 0 .../dependencies/uxbox-light.scss | 0 .../{ => common}/dependencies/z-index.scss | 0 resources/styles/{ => common}/framework.scss | 0 resources/styles/main.scss | 72 +++++++++---------- .../styles/{ => main}/layouts/login.scss | 0 .../{ => main}/layouts/main-layout.scss | 0 .../{ => main}/partials/activity-bar.scss | 0 .../{ => main}/partials/color-palette.scss | 0 .../{ => main}/partials/colorpicker.scss | 0 .../{ => main}/partials/dashboard-bar.scss | 0 .../{ => main}/partials/dashboard-grid.scss | 0 .../styles/{ => main}/partials/forms.scss | 0 .../{ => main}/partials/library-bar.scss | 0 .../styles/{ => main}/partials/lightbox.scss | 0 .../styles/{ => main}/partials/loader.scss | 0 .../styles/{ => main}/partials/main-bar.scss | 0 .../{ => main}/partials/project-bar.scss | 0 .../partials/sidebar-document-history.scss | 0 .../partials/sidebar-element-options.scss | 0 .../{ => main}/partials/sidebar-icons.scss | 0 .../partials/sidebar-interactions.scss | 0 .../{ => main}/partials/sidebar-layers.scss | 0 .../{ => main}/partials/sidebar-sitemap.scss | 0 .../{ => main}/partials/sidebar-tools.scss | 0 .../styles/{ => main}/partials/sidebar.scss | 0 .../styles/{ => main}/partials/tool-bar.scss | 0 .../{ => main}/partials/user-settings.scss | 0 .../{ => main}/partials/workspace-bar.scss | 0 .../{ => main}/partials/workspace-canvas.scss | 0 resources/styles/view.scss | 48 ++++--------- .../styles/view/layouts/main-layout.scss | 0 39 files changed, 48 insertions(+), 72 deletions(-) rename resources/styles/{ => common}/base.scss (100%) rename resources/styles/{ => common}/dependencies/animations.scss (100%) rename resources/styles/{ => common}/dependencies/colors.scss (100%) rename resources/styles/{ => common}/dependencies/fonts.scss (100%) rename resources/styles/{ => common}/dependencies/helpers.scss (100%) rename resources/styles/{ => common}/dependencies/mixin.scss (100%) rename resources/styles/{ => common}/dependencies/reset.scss (100%) rename resources/styles/{ => common}/dependencies/uxbox-dark.scss (100%) rename resources/styles/{ => common}/dependencies/uxbox-light.scss (100%) rename resources/styles/{ => common}/dependencies/z-index.scss (100%) rename resources/styles/{ => common}/framework.scss (100%) rename resources/styles/{ => main}/layouts/login.scss (100%) rename resources/styles/{ => main}/layouts/main-layout.scss (100%) rename resources/styles/{ => main}/partials/activity-bar.scss (100%) rename resources/styles/{ => main}/partials/color-palette.scss (100%) rename resources/styles/{ => main}/partials/colorpicker.scss (100%) rename resources/styles/{ => main}/partials/dashboard-bar.scss (100%) rename resources/styles/{ => main}/partials/dashboard-grid.scss (100%) rename resources/styles/{ => main}/partials/forms.scss (100%) rename resources/styles/{ => main}/partials/library-bar.scss (100%) rename resources/styles/{ => main}/partials/lightbox.scss (100%) rename resources/styles/{ => main}/partials/loader.scss (100%) rename resources/styles/{ => main}/partials/main-bar.scss (100%) rename resources/styles/{ => main}/partials/project-bar.scss (100%) rename resources/styles/{ => main}/partials/sidebar-document-history.scss (100%) rename resources/styles/{ => main}/partials/sidebar-element-options.scss (100%) rename resources/styles/{ => main}/partials/sidebar-icons.scss (100%) rename resources/styles/{ => main}/partials/sidebar-interactions.scss (100%) rename resources/styles/{ => main}/partials/sidebar-layers.scss (100%) rename resources/styles/{ => main}/partials/sidebar-sitemap.scss (100%) rename resources/styles/{ => main}/partials/sidebar-tools.scss (100%) rename resources/styles/{ => main}/partials/sidebar.scss (100%) rename resources/styles/{ => main}/partials/tool-bar.scss (100%) rename resources/styles/{ => main}/partials/user-settings.scss (100%) rename resources/styles/{ => main}/partials/workspace-bar.scss (100%) rename resources/styles/{ => main}/partials/workspace-canvas.scss (100%) create mode 100644 resources/styles/view/layouts/main-layout.scss diff --git a/resources/styles/base.scss b/resources/styles/common/base.scss similarity index 100% rename from resources/styles/base.scss rename to resources/styles/common/base.scss diff --git a/resources/styles/dependencies/animations.scss b/resources/styles/common/dependencies/animations.scss similarity index 100% rename from resources/styles/dependencies/animations.scss rename to resources/styles/common/dependencies/animations.scss diff --git a/resources/styles/dependencies/colors.scss b/resources/styles/common/dependencies/colors.scss similarity index 100% rename from resources/styles/dependencies/colors.scss rename to resources/styles/common/dependencies/colors.scss diff --git a/resources/styles/dependencies/fonts.scss b/resources/styles/common/dependencies/fonts.scss similarity index 100% rename from resources/styles/dependencies/fonts.scss rename to resources/styles/common/dependencies/fonts.scss diff --git a/resources/styles/dependencies/helpers.scss b/resources/styles/common/dependencies/helpers.scss similarity index 100% rename from resources/styles/dependencies/helpers.scss rename to resources/styles/common/dependencies/helpers.scss diff --git a/resources/styles/dependencies/mixin.scss b/resources/styles/common/dependencies/mixin.scss similarity index 100% rename from resources/styles/dependencies/mixin.scss rename to resources/styles/common/dependencies/mixin.scss diff --git a/resources/styles/dependencies/reset.scss b/resources/styles/common/dependencies/reset.scss similarity index 100% rename from resources/styles/dependencies/reset.scss rename to resources/styles/common/dependencies/reset.scss diff --git a/resources/styles/dependencies/uxbox-dark.scss b/resources/styles/common/dependencies/uxbox-dark.scss similarity index 100% rename from resources/styles/dependencies/uxbox-dark.scss rename to resources/styles/common/dependencies/uxbox-dark.scss diff --git a/resources/styles/dependencies/uxbox-light.scss b/resources/styles/common/dependencies/uxbox-light.scss similarity index 100% rename from resources/styles/dependencies/uxbox-light.scss rename to resources/styles/common/dependencies/uxbox-light.scss diff --git a/resources/styles/dependencies/z-index.scss b/resources/styles/common/dependencies/z-index.scss similarity index 100% rename from resources/styles/dependencies/z-index.scss rename to resources/styles/common/dependencies/z-index.scss diff --git a/resources/styles/framework.scss b/resources/styles/common/framework.scss similarity index 100% rename from resources/styles/framework.scss rename to resources/styles/common/framework.scss diff --git a/resources/styles/main.scss b/resources/styles/main.scss index efe9c01f5e..b82acfb849 100644 --- a/resources/styles/main.scss +++ b/resources/styles/main.scss @@ -1,58 +1,58 @@ -// UXBOX STYLES +// UXBOX MAIN STYLES //################################################# // //################################################# -@import 'dependencies/colors'; -@import 'dependencies/uxbox-light'; -/* @import 'dependencies/uxbox-dark'; */ -@import 'dependencies/helpers'; -@import 'dependencies/mixin'; -@import 'dependencies/fonts'; -@import 'dependencies/reset'; -@import 'dependencies/animations'; -@import 'dependencies/z-index'; +@import 'common/dependencies/colors'; +@import 'common/dependencies/uxbox-light'; +/* @import 'common/dependencies/uxbox-dark'; */ +@import 'common/dependencies/helpers'; +@import 'common/dependencies/mixin'; +@import 'common/dependencies/fonts'; +@import 'common/dependencies/reset'; +@import 'common/dependencies/animations'; +@import 'common/dependencies/z-index'; //################################################# // Layouts //################################################# -@import 'base'; -@import 'layouts/main-layout'; -@import 'layouts/login'; +@import 'common/base'; +@import 'main/layouts/main-layout'; +@import 'main/layouts/login'; //################################################# // Commons //################################################# -@import 'framework'; +@import 'common/framework'; //################################################# // Partials //################################################# -@import 'partials/main-bar'; -@import 'partials/workspace-bar'; -@import 'partials/workspace-canvas'; -@import 'partials/tool-bar'; -@import 'partials/project-bar'; -@import 'partials/sidebar'; -@import 'partials/sidebar-tools'; -@import 'partials/sidebar-element-options'; -@import 'partials/sidebar-icons'; -@import 'partials/sidebar-layers'; -@import 'partials/sidebar-sitemap'; -@import 'partials/sidebar-document-history'; -@import 'partials/dashboard-bar'; -@import 'partials/dashboard-grid'; -@import 'partials/user-settings'; -@import 'partials/activity-bar'; -@import 'partials/library-bar'; -@import 'partials/lightbox'; -@import 'partials/color-palette'; -@import 'partials/colorpicker'; -@import 'partials/forms'; -@import 'partials/loader'; +@import 'main/partials/main-bar'; +@import 'main/partials/workspace-bar'; +@import 'main/partials/workspace-canvas'; +@import 'main/partials/tool-bar'; +@import 'main/partials/project-bar'; +@import 'main/partials/sidebar'; +@import 'main/partials/sidebar-tools'; +@import 'main/partials/sidebar-element-options'; +@import 'main/partials/sidebar-icons'; +@import 'main/partials/sidebar-layers'; +@import 'main/partials/sidebar-sitemap'; +@import 'main/partials/sidebar-document-history'; +@import 'main/partials/dashboard-bar'; +@import 'main/partials/dashboard-grid'; +@import 'main/partials/user-settings'; +@import 'main/partials/activity-bar'; +@import 'main/partials/library-bar'; +@import 'main/partials/lightbox'; +@import 'main/partials/color-palette'; +@import 'main/partials/colorpicker'; +@import 'main/partials/forms'; +@import 'main/partials/loader'; //################################################# // Resources diff --git a/resources/styles/layouts/login.scss b/resources/styles/main/layouts/login.scss similarity index 100% rename from resources/styles/layouts/login.scss rename to resources/styles/main/layouts/login.scss diff --git a/resources/styles/layouts/main-layout.scss b/resources/styles/main/layouts/main-layout.scss similarity index 100% rename from resources/styles/layouts/main-layout.scss rename to resources/styles/main/layouts/main-layout.scss diff --git a/resources/styles/partials/activity-bar.scss b/resources/styles/main/partials/activity-bar.scss similarity index 100% rename from resources/styles/partials/activity-bar.scss rename to resources/styles/main/partials/activity-bar.scss diff --git a/resources/styles/partials/color-palette.scss b/resources/styles/main/partials/color-palette.scss similarity index 100% rename from resources/styles/partials/color-palette.scss rename to resources/styles/main/partials/color-palette.scss diff --git a/resources/styles/partials/colorpicker.scss b/resources/styles/main/partials/colorpicker.scss similarity index 100% rename from resources/styles/partials/colorpicker.scss rename to resources/styles/main/partials/colorpicker.scss diff --git a/resources/styles/partials/dashboard-bar.scss b/resources/styles/main/partials/dashboard-bar.scss similarity index 100% rename from resources/styles/partials/dashboard-bar.scss rename to resources/styles/main/partials/dashboard-bar.scss diff --git a/resources/styles/partials/dashboard-grid.scss b/resources/styles/main/partials/dashboard-grid.scss similarity index 100% rename from resources/styles/partials/dashboard-grid.scss rename to resources/styles/main/partials/dashboard-grid.scss diff --git a/resources/styles/partials/forms.scss b/resources/styles/main/partials/forms.scss similarity index 100% rename from resources/styles/partials/forms.scss rename to resources/styles/main/partials/forms.scss diff --git a/resources/styles/partials/library-bar.scss b/resources/styles/main/partials/library-bar.scss similarity index 100% rename from resources/styles/partials/library-bar.scss rename to resources/styles/main/partials/library-bar.scss diff --git a/resources/styles/partials/lightbox.scss b/resources/styles/main/partials/lightbox.scss similarity index 100% rename from resources/styles/partials/lightbox.scss rename to resources/styles/main/partials/lightbox.scss diff --git a/resources/styles/partials/loader.scss b/resources/styles/main/partials/loader.scss similarity index 100% rename from resources/styles/partials/loader.scss rename to resources/styles/main/partials/loader.scss diff --git a/resources/styles/partials/main-bar.scss b/resources/styles/main/partials/main-bar.scss similarity index 100% rename from resources/styles/partials/main-bar.scss rename to resources/styles/main/partials/main-bar.scss diff --git a/resources/styles/partials/project-bar.scss b/resources/styles/main/partials/project-bar.scss similarity index 100% rename from resources/styles/partials/project-bar.scss rename to resources/styles/main/partials/project-bar.scss diff --git a/resources/styles/partials/sidebar-document-history.scss b/resources/styles/main/partials/sidebar-document-history.scss similarity index 100% rename from resources/styles/partials/sidebar-document-history.scss rename to resources/styles/main/partials/sidebar-document-history.scss diff --git a/resources/styles/partials/sidebar-element-options.scss b/resources/styles/main/partials/sidebar-element-options.scss similarity index 100% rename from resources/styles/partials/sidebar-element-options.scss rename to resources/styles/main/partials/sidebar-element-options.scss diff --git a/resources/styles/partials/sidebar-icons.scss b/resources/styles/main/partials/sidebar-icons.scss similarity index 100% rename from resources/styles/partials/sidebar-icons.scss rename to resources/styles/main/partials/sidebar-icons.scss diff --git a/resources/styles/partials/sidebar-interactions.scss b/resources/styles/main/partials/sidebar-interactions.scss similarity index 100% rename from resources/styles/partials/sidebar-interactions.scss rename to resources/styles/main/partials/sidebar-interactions.scss diff --git a/resources/styles/partials/sidebar-layers.scss b/resources/styles/main/partials/sidebar-layers.scss similarity index 100% rename from resources/styles/partials/sidebar-layers.scss rename to resources/styles/main/partials/sidebar-layers.scss diff --git a/resources/styles/partials/sidebar-sitemap.scss b/resources/styles/main/partials/sidebar-sitemap.scss similarity index 100% rename from resources/styles/partials/sidebar-sitemap.scss rename to resources/styles/main/partials/sidebar-sitemap.scss diff --git a/resources/styles/partials/sidebar-tools.scss b/resources/styles/main/partials/sidebar-tools.scss similarity index 100% rename from resources/styles/partials/sidebar-tools.scss rename to resources/styles/main/partials/sidebar-tools.scss diff --git a/resources/styles/partials/sidebar.scss b/resources/styles/main/partials/sidebar.scss similarity index 100% rename from resources/styles/partials/sidebar.scss rename to resources/styles/main/partials/sidebar.scss diff --git a/resources/styles/partials/tool-bar.scss b/resources/styles/main/partials/tool-bar.scss similarity index 100% rename from resources/styles/partials/tool-bar.scss rename to resources/styles/main/partials/tool-bar.scss diff --git a/resources/styles/partials/user-settings.scss b/resources/styles/main/partials/user-settings.scss similarity index 100% rename from resources/styles/partials/user-settings.scss rename to resources/styles/main/partials/user-settings.scss diff --git a/resources/styles/partials/workspace-bar.scss b/resources/styles/main/partials/workspace-bar.scss similarity index 100% rename from resources/styles/partials/workspace-bar.scss rename to resources/styles/main/partials/workspace-bar.scss diff --git a/resources/styles/partials/workspace-canvas.scss b/resources/styles/main/partials/workspace-canvas.scss similarity index 100% rename from resources/styles/partials/workspace-canvas.scss rename to resources/styles/main/partials/workspace-canvas.scss diff --git a/resources/styles/view.scss b/resources/styles/view.scss index efe9c01f5e..afe1f00ab7 100644 --- a/resources/styles/view.scss +++ b/resources/styles/view.scss @@ -1,58 +1,34 @@ -// UXBOX STYLES +// UXBOX VIEW STYLES //################################################# // //################################################# -@import 'dependencies/colors'; -@import 'dependencies/uxbox-light'; -/* @import 'dependencies/uxbox-dark'; */ -@import 'dependencies/helpers'; -@import 'dependencies/mixin'; -@import 'dependencies/fonts'; -@import 'dependencies/reset'; -@import 'dependencies/animations'; -@import 'dependencies/z-index'; +@import 'common/dependencies/colors'; +@import 'common/dependencies/uxbox-light'; +@import 'common/dependencies/helpers'; +@import 'common/dependencies/mixin'; +@import 'common/dependencies/fonts'; +@import 'common/dependencies/reset'; +@import 'common/dependencies/animations'; +@import 'common/dependencies/z-index'; //################################################# // Layouts //################################################# -@import 'base'; -@import 'layouts/main-layout'; -@import 'layouts/login'; +@import 'common/base'; +@import 'view/layouts/main-layout'; //################################################# // Commons //################################################# -@import 'framework'; +@import 'common/framework'; //################################################# // Partials //################################################# -@import 'partials/main-bar'; -@import 'partials/workspace-bar'; -@import 'partials/workspace-canvas'; -@import 'partials/tool-bar'; -@import 'partials/project-bar'; -@import 'partials/sidebar'; -@import 'partials/sidebar-tools'; -@import 'partials/sidebar-element-options'; -@import 'partials/sidebar-icons'; -@import 'partials/sidebar-layers'; -@import 'partials/sidebar-sitemap'; -@import 'partials/sidebar-document-history'; -@import 'partials/dashboard-bar'; -@import 'partials/dashboard-grid'; -@import 'partials/user-settings'; -@import 'partials/activity-bar'; -@import 'partials/library-bar'; -@import 'partials/lightbox'; -@import 'partials/color-palette'; -@import 'partials/colorpicker'; -@import 'partials/forms'; -@import 'partials/loader'; //################################################# // Resources diff --git a/resources/styles/view/layouts/main-layout.scss b/resources/styles/view/layouts/main-layout.scss new file mode 100644 index 0000000000..e69de29bb2