diff --git a/gulpfile.js b/gulpfile.js index 25af23bf..22252fe8 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -184,7 +184,19 @@ function bundle(watch) { .on('error', notify.onError('Error: <%= error.message %>')) .pipe(gulpif(!argv.production, sourcemaps.write())) // writes .map file .on('error', notify.onError('Error: <%= error.message %>')) - .pipe(gulpif(argv.production, uglify())) + .pipe(gulpif(argv.production, uglify({ + mangle: true, + compress: { + sequences: true, + dead_code: true, + conditionals: true, + booleans: true, + unused: true, + if_return: true, + join_vars: true, + drop_console: true + } + }))) .on('error', notify.onError('Error: <%= error.message %>')) .pipe(gulp.dest('./build/js')) .on('error', notify.onError('Error: <%= error.message %>')) diff --git a/index.html b/index.html index d4ad1f66..1b5c26a2 100644 --- a/index.html +++ b/index.html @@ -30,7 +30,7 @@ - + <% DEBUG && print('') %> diff --git a/js/actions/loan_contract_actions.js b/js/actions/loan_contract_actions.js index 9757c2a2..07ce0966 100644 --- a/js/actions/loan_contract_actions.js +++ b/js/actions/loan_contract_actions.js @@ -12,7 +12,6 @@ class LoanContractActions { } fetchLoanContract(email) { - if(email.match(/.+\@.+\..+/)) { OwnershipFetcher.fetchLoanContract(email) .then((contracts) => { diff --git a/sass/ascribe_accordion_list.scss b/sass/ascribe_accordion_list.scss index 3d5d071c..33cf18a8 100644 --- a/sass/ascribe_accordion_list.scss +++ b/sass/ascribe_accordion_list.scss @@ -133,7 +133,7 @@ span.ascribe-accordion-list-table-toggle { -ms-user-select: none; &:hover { - color: $ascribe-color-dark; + color: $ascribe-color-green; cursor:pointer; } } @@ -164,7 +164,7 @@ span.ascribe-accordion-list-table-toggle { -ms-user-select: none; &:hover { - color: $ascribe-color-dark; + color: $ascribe-color-green; } .glyphicon { top: 1px !important; diff --git a/sass/ascribe_media_player.scss b/sass/ascribe_media_player.scss index 3a9c4be1..4aeba0d2 100644 --- a/sass/ascribe_media_player.scss +++ b/sass/ascribe_media_player.scss @@ -25,7 +25,7 @@ } .audiojs .loaded { - background-color: $ascribe-color-full; + background-color: $ascribe-color-green; background-image: none; } .audiojs .progress { @@ -48,7 +48,7 @@ .vjs-default-skin .vjs-play-progress, .vjs-default-skin .vjs-volume-level { - background: $ascribe-color-full; + background: $ascribe-color-green; } .vjs-default-skin .vjs-big-play-button { diff --git a/sass/ascribe_variables.scss b/sass/ascribe_variables.scss index 87cccb7b..412fb6f5 100644 --- a/sass/ascribe_variables.scss +++ b/sass/ascribe_variables.scss @@ -1,6 +1,4 @@ -$ascribe-color: rgba(2, 182, 163, 0.5); -$ascribe-color-dark: rgba(2, 182, 163, 0.8); -$ascribe-color-full: rgba(2, 182, 163, 1); +$ascribe-color-green: rgba(2, 182, 163, 1); $ascribe-brand-danger: #FC535F; $ascribe-brand-warning: #FFC354; \ No newline at end of file diff --git a/sass/main.scss b/sass/main.scss index 9fab6aeb..473e57d4 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -118,7 +118,7 @@ hr { } .ascribe-color { - color: $ascribe-color; + color: $ascribe-color-green; } .ascribe-subheader{ diff --git a/sass/variables.scss b/sass/variables.scss index 031ac9b2..e0cb6c7d 100644 --- a/sass/variables.scss +++ b/sass/variables.scss @@ -150,8 +150,8 @@ $table-border-color: #ddd !default; $btn-font-weight: normal !default; $btn-default-color: white !default; -$btn-default-bg: $ascribe-color-full !default; -$btn-default-border: $ascribe-color-full !default; +$btn-default-bg: $ascribe-color-green !default; +$btn-default-border: $ascribe-color-green !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; @@ -219,9 +219,9 @@ $legend-color: $gray-dark !default; $legend-border-color: #e5e5e5 !default; //** Background color for textual input addons -$input-group-addon-bg: $ascribe-color-full !default; +$input-group-addon-bg: $ascribe-color-green !default; //** Border color for textual input addons -$input-group-addon-border-color: $ascribe-color-full !default; +$input-group-addon-border-color: $ascribe-color-green !default; //** Disabled cursor for form controls and buttons. $cursor-disabled: not-allowed !default; @@ -468,14 +468,14 @@ $pagination-disabled-border: #ddd !default; // //## -$pager-bg: $ascribe-color-full !default; -$pager-border: $ascribe-color-full !default; +$pager-bg: $ascribe-color-green !default; +$pager-border: $ascribe-color-green !default; $pager-border-radius: 0 !default; -$pager-hover-bg: darken($ascribe-color-full, 10%) !default; +$pager-hover-bg: darken($ascribe-color-green, 10%) !default; -$pager-active-bg: $ascribe-color-full !default; -$pager-active-color: $ascribe-color-full !default; +$pager-active-bg: $ascribe-color-green !default; +$pager-active-color: $ascribe-color-green !default; $pager-disabled-color: #CCC !default; $pager-disabled-border: 1px solid #CCC !default;