Skip to content

added support for scss versioning #9

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

Open
flaviotulino wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added support for scss versioning #9

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
049bb1f
added support for scss versioning
Jan 29, 2018
d89e2d8
added missing BBUIVersionService
Jan 29, 2018
fca2305
removed unused line
Jan 30, 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
11 changes: 10 additions & 1 deletion src/public/main.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import 'file-loader?name=fonts/[name].[ext]!./fonts/bb-icons.svg';
import './images/bb-logo.svg';

// styles
import './main.scss';
//import './main.scss';
Copy link

@TolgaCura TolgaCura Jan 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this commented line need to be here?

Copy link
Author

@flaviotulino flaviotulino Jan 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely not!


// chosen angular translations
import 'file-loader?name=angular-i18n/[name].[ext]!bookingbug-angular/node_modules/angular-i18n/angular-locale_en.js';
Expand All @@ -26,6 +26,15 @@ import config from './main.config';
import run from './main.run';
import versionModule from './version/version.module';

// Try to load a versioned scss file, otherwise load the default one
import BBUIVersionService from 'bookingbug-angular/src/public-booking/-versioning/ui_version.service';
try {
require('./main_v' + BBUIVersionService.getUIVersion() + '.scss');
} catch (ex) {
require('./main.scss');
}


export default angular
.module('public', [
bbPublicBookingModule,
Expand Down
1 change: 1 addition & 0 deletions src/public/main_v2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "~bookingbug-angular/src/public-booking/main_v2.scss";