Skip to content

Commit

Permalink
Merge pull request #398 from civicrm/SHOR-144-add-companion-drupal-theme
Browse files Browse the repository at this point in the history
SHOR-144: Remove drupal partial
  • Loading branch information
Alessandro authored Jul 26, 2019
2 parents 54c25fa + 50ce699 commit 1ffea56
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 109 deletions.
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 (only for Shoreditch `v0.1-alpha33`+)

### 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
Expand All @@ -26,12 +26,14 @@ 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
```

### 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
cd org.civicrm.shoreditch
Expand Down
1 change: 0 additions & 1 deletion scss/civicrm/cms/_cms.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@import 'drupal';
@import 'wordpress';
91 changes: 0 additions & 91 deletions scss/civicrm/cms/_drupal.scss

This file was deleted.

13 changes: 3 additions & 10 deletions scss/civicrm/common/_backgrounds.scss
Original file line number Diff line number Diff line change
@@ -1,23 +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 {
&,
#page {
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-main-content-wrapper {
background: $crm-background !important;
}

.crm-container {
background: inherit;

.crm-form-block {
@extend %block-with-shadow;
border-radius: 0;
Expand Down

0 comments on commit 1ffea56

Please sign in to comment.