From 0c399a7784780bfa5682006fe76705ac50cef998 Mon Sep 17 00:00:00 2001 From: Alessandro Verdura Date: Thu, 25 Jul 2019 13:55:28 +0200 Subject: [PATCH 1/6] SHOR-144: Remove drupal partial --- scss/civicrm/cms/_cms.scss | 1 - scss/civicrm/cms/_drupal.scss | 91 ----------------------------------- 2 files changed, 92 deletions(-) delete mode 100644 scss/civicrm/cms/_drupal.scss diff --git a/scss/civicrm/cms/_cms.scss b/scss/civicrm/cms/_cms.scss index 9b11ce69..15488da6 100644 --- a/scss/civicrm/cms/_cms.scss +++ b/scss/civicrm/cms/_cms.scss @@ -1,2 +1 @@ -@import 'drupal'; @import 'wordpress'; diff --git a/scss/civicrm/cms/_drupal.scss b/scss/civicrm/cms/_drupal.scss deleted file mode 100644 index ef227631..00000000 --- a/scss/civicrm/cms/_drupal.scss +++ /dev/null @@ -1,91 +0,0 @@ -/* stylelint-disable selector-max-id */ - -@import 'base/scss/vendor/bootstrap/alerts'; - -.page-civicrm { - %title { - font-weight: 600 !important; - } - - h2 { - @extend %title; - } - - #branding { - background: $crm-page-topbar-bg !important; - color: $crm-white !important; - font-family: $font-family-base; - line-height: 20px; - overflow: visible !important; - padding: $crm-standard-gap 0 0; - - h1.page-title { /* stylelint-disable-line selector-no-qualifying-type */ - @extend %title; - - background: $crm-white; - box-sizing: border-box; - color: $gray-darker; - display: block; - line-height: 50px !important; - margin: -#{$crm-standard-gap} 0 $crm-standard-gap; - padding: 0 ($crm-standard-gap * 2); - position: relative; - top: 25px; - width: 100%; - z-index: 1; - } - - .add-shortcut { - display: none; - } - - .breadcrumb { - color: transparent; - float: left; - left: 10px; - padding: 0 ($crm-standard-gap * 2); - position: relative; - top: -5px; - - /* stylelint-disable selector-max-compound-selectors, max-nesting-depth */ - > a { - color: $crm-white; - font-size: 0.8rem; - left: -10px; - padding: 0; - position: relative; - - &:not(:last-of-type)::after { - content: '>'; - display: inline-block; - font-size: 0.6em; - position: absolute; - right: -10px; - } - } - /* stylelint-enable selector-max-compound-selectors, max-nesting-depth */ - } - } - - #console { - @extend .alert, .alert-warning; /* stylelint-disable-line scss/at-extend-no-missing-placeholder */ - - margin-top: 0 !important; - } - - // The "printer" icon button - #printer-friendly { - position: absolute !important; - right: 0 !important; - top: -50px !important; - z-index: 2; - - a { - color: $crm-white; - } - } - - #toolbar { - box-shadow: none !important; - } -} From 573abeb9bf3c7ebce94ff93684cdb6ab11ada43c Mon Sep 17 00:00:00 2001 From: Alessandro Verdura Date: Thu, 25 Jul 2019 14:59:26 +0200 Subject: [PATCH 2/6] SHOR-144: Remove styles for page and page title --- scss/civicrm/common/_backgrounds.scss | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/scss/civicrm/common/_backgrounds.scss b/scss/civicrm/common/_backgrounds.scss index 4ce14e76..b6d76273 100644 --- a/scss/civicrm/common/_backgrounds.scss +++ b/scss/civicrm/common/_backgrounds.scss @@ -1,20 +1,13 @@ /* stylelint-disable max-nesting-depth, selector-max-compound-selectors, selector-no-qualifying-type, selector-max-id, scss/at-extend-no-missing-placeholder, property-no-vendor-prefix */ .page-civicrm { - &, - #page { - background: $crm-background !important; - } - + background: $crm-background !important; + %block-with-shadow { background: $crm-white; box-shadow: 0 0 16px 1px rgba(0, 0, 0, 0.1); } - - h1.page-title { - @extend %block-with-shadow; - } - + .crm-container { background: inherit; From 7e0925017f0b2cafb3dd6573139c24df310633ab Mon Sep 17 00:00:00 2001 From: Alessandro Verdura Date: Thu, 25 Jul 2019 15:23:18 +0200 Subject: [PATCH 3/6] SHOR-144: Apply bg color only to main content area --- scss/civicrm/common/_backgrounds.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/civicrm/common/_backgrounds.scss b/scss/civicrm/common/_backgrounds.scss index b6d76273..48f71390 100644 --- a/scss/civicrm/common/_backgrounds.scss +++ b/scss/civicrm/common/_backgrounds.scss @@ -1,16 +1,16 @@ /* stylelint-disable max-nesting-depth, selector-max-compound-selectors, selector-no-qualifying-type, selector-max-id, scss/at-extend-no-missing-placeholder, property-no-vendor-prefix */ .page-civicrm { - background: $crm-background !important; - %block-with-shadow { background: $crm-white; box-shadow: 0 0 16px 1px rgba(0, 0, 0, 0.1); } + + #crm-main-content-wrapper { + background: $crm-background !important; + } .crm-container { - background: inherit; - .crm-form-block { @extend %block-with-shadow; border-radius: 0; From 0a084b5a437a70fcd55012ed747edab6c114280a Mon Sep 17 00:00:00 2001 From: Alessandro Verdura Date: Fri, 26 Jul 2019 10:21:59 +0200 Subject: [PATCH 4/6] SHOR-144: Update README --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 63ec0c9a..f0e326b1 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ Please note that this extension is currrently in **alpha stage** and under **act * CiviCRM `v5.8`+, `v5.12`+ recommended * [uk.squiffle.kam](https://github.com/aydun/uk.squiffle.kam) if the CiviCRM version is lower than `v5.12` * "CiviCRM Theme" module enabled -* "Seven" theme set as CiviCRM Administration theme +* The [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme) is optional but recommended ### For development * NodeJS `v10.15.3` ## Supported CMSs -At the moment the theme is being developed to work only in Drupal 7 (with default theme set to "Seven"). WordPress and Joomla are not currently supported. +At the moment the theme is being developed to work only in Drupal 7. WordPress and Joomla are not currently supported. ## Installation (git/cli) ```bash @@ -26,12 +26,12 @@ cd sites/default/files/civicrm/ext # Download and enable the extension git clone https://github.com/civicrm/org.civicrm.shoreditch cv en org.civicrm.shoreditch - -# Enable the "CiviCRM Theme" module and set "Seven" as the Civi admin theme -drush en -y civicrmtheme -drush vset civicrmtheme_theme_admin seven -drush cc civicrm ``` + +### Companion theme +If you also intend to use the [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme), please go to its repo and follow the insallation instructions there + +### Development / Bleeding edge version If you are [developing](CONTRIBUTING.md#code-contributions) for the theme or if want the very latest (but untested) version of the theme on your site, run ```bash cd org.civicrm.shoreditch From 3a519b856b0992f7537f938627ab9fab5d4cd0c8 Mon Sep 17 00:00:00 2001 From: Alessandro Verdura Date: Fri, 26 Jul 2019 11:57:39 +0200 Subject: [PATCH 5/6] SHOR-144: Fix README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f0e326b1..f18e44ef 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Please note that this extension is currrently in **alpha stage** and under **act * CiviCRM `v5.8`+, `v5.12`+ recommended * [uk.squiffle.kam](https://github.com/aydun/uk.squiffle.kam) if the CiviCRM version is lower than `v5.12` * "CiviCRM Theme" module enabled -* The [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme) is optional but recommended +* The [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme) is optional but recommended ### For development * NodeJS `v10.15.3` @@ -28,8 +28,8 @@ git clone https://github.com/civicrm/org.civicrm.shoreditch cv en org.civicrm.shoreditch ``` -### Companion theme -If you also intend to use the [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme), please go to its repo and follow the insallation instructions there +### CiviAdmin Companion Drupal theme +If you also intend to use the [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme), please go to its repo and follow the installation instructions there ### Development / Bleeding edge version If you are [developing](CONTRIBUTING.md#code-contributions) for the theme or if want the very latest (but untested) version of the theme on your site, run From 50ce6999b6591f64b7925ccace31ca8c1f6ccd14 Mon Sep 17 00:00:00 2001 From: Alessandro Verdura Date: Fri, 26 Jul 2019 14:07:19 +0200 Subject: [PATCH 6/6] SHOR-144: Add ver reference for companion theme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f18e44ef..eb800e4d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Please note that this extension is currrently in **alpha stage** and under **act * CiviCRM `v5.8`+, `v5.12`+ recommended * [uk.squiffle.kam](https://github.com/aydun/uk.squiffle.kam) if the CiviCRM version is lower than `v5.12` * "CiviCRM Theme" module enabled -* The [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme) is optional but recommended +* The [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme) is optional but recommended (only for Shoreditch `v0.1-alpha33`+) ### For development * NodeJS `v10.15.3` @@ -31,6 +31,8 @@ cv en org.civicrm.shoreditch ### CiviAdmin Companion Drupal theme If you also intend to use the [CiviAdmin Companion Drupal theme](https://github.com/compucorp/shoreditch-companion-d7-theme), please go to its repo and follow the installation instructions there +_(only for Shoreditch `v0.1-alpha33`+)_ + ### Development / Bleeding edge version If you are [developing](CONTRIBUTING.md#code-contributions) for the theme or if want the very latest (but untested) version of the theme on your site, run ```bash