Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCHR-3724: Sync styles with Shoreditch #2644

Merged
merged 1 commit into from
Jun 1, 2018

Conversation

igorpavlov-zz
Copy link
Contributor

@igorpavlov-zz igorpavlov-zz commented Jun 1, 2018

Overview

This PR syncs styles in the HRJobContract extension with Shoreditch. Please see compucorp/org.civicrm.shoreditch#110 for more info.

Technical Details

Strip out comments in dist CSS file

line_comments = false // that's why this PR introduces 2K+ deletions

Move variables and mixins to make them accessible outside namespace

/* Moved outside ##{$module} {...} */
@import 'civihr/bootstrap-variables';
@import 'bootstrap/variables';

Create a partial for Shoreditch imports

@import '../../../org.civicrm.shoreditch/scss/bootstrap/overrides/variables';
@import '../../../org.civicrm.shoreditch/scss/bootstrap/mixins/prefix';

##{$module} {
  // Still keep generic datepicker styles inside namespace
  @import '../../../org.civicrm.shoreditch/scss/angular/overrides/uib-datepicker';
}
// Import mobile datepicker styles outside namespace
@import '../../../org.civicrm.shoreditch/scss/angular/overrides/outside-namespace/uib-datepicker';

Finally include the partial

/* Also outside ##{$module} {...} */
@import 'civihr/partials/shoreditch-imports';

According to the dist CSS file diff, there are no style changes whatsoever.

@igorpavlov-zz igorpavlov-zz merged commit 4eca50e into staging Jun 1, 2018
@igorpavlov-zz igorpavlov-zz deleted the PCHR-3724-fix-mobile-datepicker-on-SSP branch June 1, 2018 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants