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.

Sign up for GitHub

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-3424: Import styles from Bootstrapcivihr #377

Merged
merged 3 commits into from
Jul 26, 2018
Merged

PCHR-3424: Import styles from Bootstrapcivihr #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a988b19
PCHR-3424: Update icons fonts from Bootstrapcivihr
igorpavlov Jul 23, 2018
6f00470
PCHR-3424: Import missing partials from Bootstrapcivihr
igorpavlov Jul 23, 2018
31ba70b
PCHR-3424: Redefine images path variable and apply
igorpavlov Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion civihr_default_theme/assets/css/civihr_default_theme.style.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion civihr_default_theme/assets/css/civihr_default_theme.style.css.map
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions civihr_default_theme/assets/fonts/icomoon.svg
100755 → 100644
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified civihr_default_theme/assets/fonts/icomoon.ttf
100755 → 100644
View file
Open in desktop
Binary file not shown.
Binary file modified civihr_default_theme/assets/fonts/icomoon.woff
100755 → 100644
View file
Open in desktop
Binary file not shown.
13 changes: 13 additions & 0 deletions civihr_default_theme/assets/images/spinner.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 6 additions & 1 deletion civihr_default_theme/scss/base/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,16 @@ $crm-font-weight-light: 300;
$crm-font-weight-regular: 400;
$crm-font-weight-bold: 700;

// Images path
// -----------------------------------------------------------------------------
$crm-image-path: '../images/' !default;


// Iconography
// -----------------------------------------------------------------------------
$icon-font-path: '../fonts/' !default;

$crm-icon-image-path: '../images/icon/' !default;
$crm-icon-image-path: $crm-image-path + 'icon/' !default;
$crm-icon-asc: 'asc.gif' !default;
$crm-icon-desc: 'desc.gif' !default;

Expand Down
5 changes: 5 additions & 0 deletions civihr_default_theme/scss/civihr_default_theme.style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,12 @@
@import 'SCSSROOT/org.civicrm.shoreditch/scss/angular/overrides/outside-namespace/uib-datepicker-mobile';
@import 'SCSSROOT/org.civicrm.shoreditch/scss/bootstrap/variants/modals-xs-screen';

@import 'SCSSROOT/org.civicrm.bootstrapcivihr/scss/mixins/spinner';
@import 'SCSSROOT/org.civicrm.bootstrapcivihr/scss/components/scroll-shadows';
@import 'SCSSROOT/org.civicrm.bootstrapcivihr/scss/components/outside-namespace/logo';
@import 'SCSSROOT/org.civicrm.bootstrapcivihr/scss/components/outside-namespace/modal-scroll-locker';
@import 'SCSSROOT/org.civicrm.bootstrapcivihr/scss/components/outside-namespace/profile-card';
@import 'SCSSROOT/org.civicrm.bootstrapcivihr/scss/components/outside-namespace/spinner';
@import 'SCSSROOT/org.civicrm.bootstrapcivihr/scss/components/outside-namespace/user-menu';

@import 'SCSSROOT/uk.co.compucorp.civicrm.hrleaveandabsences/scss/overrides/variables';
Expand Down