From c240a8991d347149679ca727fa3a2f98e1f3830e Mon Sep 17 00:00:00 2001 From: Molkobain Date: Sat, 22 May 2021 23:00:05 +0200 Subject: [PATCH] SCSS: Fix import ordering of the custom root folders --- css/backoffice/README.md | 13 +++++++++++++ .../tabular-fields/_tabular-fields-selector.scss | 2 +- .../blocks-integrations/_add-to-dashboard.scss | 0 .../{layout => }/blocks-integrations/_all.scss | 4 +++- .../_caselog-entry-form-within-activity-panel.scss | 0 .../_dashlet-within-dashboard.scss | 0 .../_medallion-with-blocklist.scss | 0 .../_object-details-with-tab-container.scss | 0 .../blocks-integrations/_panel-with-datatable.scss | 0 .../_panel-with-tab-container.scss | 1 - css/backoffice/layout/_all.scss | 1 - css/backoffice/main.scss | 3 ++- 12 files changed, 19 insertions(+), 5 deletions(-) rename css/backoffice/{layout => }/blocks-integrations/_add-to-dashboard.scss (100%) rename css/backoffice/{layout => }/blocks-integrations/_all.scss (85%) rename css/backoffice/{layout => }/blocks-integrations/_caselog-entry-form-within-activity-panel.scss (100%) rename css/backoffice/{layout => }/blocks-integrations/_dashlet-within-dashboard.scss (100%) rename css/backoffice/{layout => }/blocks-integrations/_medallion-with-blocklist.scss (100%) rename css/backoffice/{layout => }/blocks-integrations/_object-details-with-tab-container.scss (100%) rename css/backoffice/{layout => }/blocks-integrations/_panel-with-datatable.scss (100%) rename css/backoffice/{layout => }/blocks-integrations/_panel-with-tab-container.scss (99%) diff --git a/css/backoffice/README.md b/css/backoffice/README.md index 8887f1b4b..f7dedd625 100644 --- a/css/backoffice/README.md +++ b/css/backoffice/README.md @@ -7,6 +7,8 @@ This is a brief description of the SASS 7-1 system and how to use it. SCSS files are structured following the [7-1 pattern](https://sass-guidelin.es/#the-7-1-pattern). \ @rveitch made a great summary with the following, which can also be found [here](https://gist.github.com/rveitch/84cea9650092119527bc). +_Note: Folders with an * are customizations we made to the original 7-1 pattern to best fit our needs_ + ``` css/backoffice/ | @@ -42,11 +44,20 @@ css/backoffice/ | |– _forms.scss # Forms | ... # Etc… | +|- *application/ # Elements that are not usable as a standalone (like componants and layouts are) and very application (the backoffice) specific +| |- display-block +| |- tabular-fields +| ... +| |– pages/ | |– _home.scss # Home specific styles | |– _contact.scss # Contact specific styles | ... # Etc… | +|- *blocks-integrations # Specific rules for the integration of a block with another one, those kind of rules should never be in the block partial directly +| |- _panel-with-datatable.scss # Changes the negative margins of the datatable so it overlaps the panel's original padding +| ... +| |– themes/ | |– _theme.scss # Default theme | |– _admin.scss # Admin theme @@ -68,6 +79,8 @@ To avoid common errors, files should be imported in the final file in the follow - Base - Components - Layout +- \*Application - Pages +- \*Block integrations - Themes - Shame file \ No newline at end of file diff --git a/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss b/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss index 9f93694c1..a2e015da8 100644 --- a/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss +++ b/css/backoffice/application/tabular-fields/_tabular-fields-selector.scss @@ -11,7 +11,7 @@ padding: 5px; border-width: 1px 1px 0; border-style: groove groove none; - background: $ibo-body-background-color; + background: $ibo-color-white-200; } td { diff --git a/css/backoffice/layout/blocks-integrations/_add-to-dashboard.scss b/css/backoffice/blocks-integrations/_add-to-dashboard.scss similarity index 100% rename from css/backoffice/layout/blocks-integrations/_add-to-dashboard.scss rename to css/backoffice/blocks-integrations/_add-to-dashboard.scss diff --git a/css/backoffice/layout/blocks-integrations/_all.scss b/css/backoffice/blocks-integrations/_all.scss similarity index 85% rename from css/backoffice/layout/blocks-integrations/_all.scss rename to css/backoffice/blocks-integrations/_all.scss index 32cdb62b8..a16d14cff 100644 --- a/css/backoffice/layout/blocks-integrations/_all.scss +++ b/css/backoffice/blocks-integrations/_all.scss @@ -6,7 +6,9 @@ @import "dashlet-within-dashboard"; @import "add-to-dashboard"; @import "caselog-entry-form-within-activity-panel"; -@import "panel-with-tab-container"; @import "panel-with-datatable"; +@import "panel-with-tab-container"; +@import "panel-within-main-content"; +@import "panel-within-modal"; @import "object-details-with-tab-container"; @import "medallion-with-blocklist"; diff --git a/css/backoffice/layout/blocks-integrations/_caselog-entry-form-within-activity-panel.scss b/css/backoffice/blocks-integrations/_caselog-entry-form-within-activity-panel.scss similarity index 100% rename from css/backoffice/layout/blocks-integrations/_caselog-entry-form-within-activity-panel.scss rename to css/backoffice/blocks-integrations/_caselog-entry-form-within-activity-panel.scss diff --git a/css/backoffice/layout/blocks-integrations/_dashlet-within-dashboard.scss b/css/backoffice/blocks-integrations/_dashlet-within-dashboard.scss similarity index 100% rename from css/backoffice/layout/blocks-integrations/_dashlet-within-dashboard.scss rename to css/backoffice/blocks-integrations/_dashlet-within-dashboard.scss diff --git a/css/backoffice/layout/blocks-integrations/_medallion-with-blocklist.scss b/css/backoffice/blocks-integrations/_medallion-with-blocklist.scss similarity index 100% rename from css/backoffice/layout/blocks-integrations/_medallion-with-blocklist.scss rename to css/backoffice/blocks-integrations/_medallion-with-blocklist.scss diff --git a/css/backoffice/layout/blocks-integrations/_object-details-with-tab-container.scss b/css/backoffice/blocks-integrations/_object-details-with-tab-container.scss similarity index 100% rename from css/backoffice/layout/blocks-integrations/_object-details-with-tab-container.scss rename to css/backoffice/blocks-integrations/_object-details-with-tab-container.scss diff --git a/css/backoffice/layout/blocks-integrations/_panel-with-datatable.scss b/css/backoffice/blocks-integrations/_panel-with-datatable.scss similarity index 100% rename from css/backoffice/layout/blocks-integrations/_panel-with-datatable.scss rename to css/backoffice/blocks-integrations/_panel-with-datatable.scss diff --git a/css/backoffice/layout/blocks-integrations/_panel-with-tab-container.scss b/css/backoffice/blocks-integrations/_panel-with-tab-container.scss similarity index 99% rename from css/backoffice/layout/blocks-integrations/_panel-with-tab-container.scss rename to css/backoffice/blocks-integrations/_panel-with-tab-container.scss index f37d486b9..7ba27806b 100644 --- a/css/backoffice/layout/blocks-integrations/_panel-with-tab-container.scss +++ b/css/backoffice/blocks-integrations/_panel-with-tab-container.scss @@ -19,7 +19,6 @@ $ibo-panel-with-tab-container--margin-x: -1 * $ibo-panel--body--padding-x !defau margin-top: $ibo-panel-with-tab-container--padding-top; margin-left: $ibo-panel-with-tab-container--margin-x; margin-right: $ibo-panel-with-tab-container--margin-x; - height: 80vh; > .ibo-tab-container--tab-container-list { height: 100%; diff --git a/css/backoffice/layout/_all.scss b/css/backoffice/layout/_all.scss index 0a7b68663..69ec39832 100644 --- a/css/backoffice/layout/_all.scss +++ b/css/backoffice/layout/_all.scss @@ -27,4 +27,3 @@ @import "wizard-container/wizard-container"; @import "object/object-details"; @import "activity-panel/all"; -@import "blocks-integrations/all"; diff --git a/css/backoffice/main.scss b/css/backoffice/main.scss index 37797ff29..189bf11d4 100644 --- a/css/backoffice/main.scss +++ b/css/backoffice/main.scss @@ -21,8 +21,9 @@ @import "base/all"; @import "components/all"; @import "layout/all"; -@import "pages/all"; @import "application/all"; +@import "pages/all"; +@import "blocks-integrations/all"; @import "themes/all"; @import "fallback"; @import "shame";