ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity

Merged in AD-591-finetune-build-process (pull request #13)

Browse Source 
Ad 591 finetune build process
This commit is contained in:
TimDaubenschuetz 2015-07-22 15:19:35 +02:00
commit 61077de3de
8 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gulpfile.js
View File

@ -184,7 +184,19 @@ function bundle(watch) {
.on('error', notify.onError('Error: <%= error.message %>')) .on('error', notify.onError('Error: <%= error.message %>'))
.pipe(gulpif(!argv.production, sourcemaps.write())) // writes .map file .pipe(gulpif(!argv.production, sourcemaps.write())) // writes .map file
.on('error', notify.onError('Error: <%= error.message %>')) .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 %>')) .on('error', notify.onError('Error: <%= error.message %>'))
.pipe(gulp.dest('./build/js')) .pipe(gulp.dest('./build/js'))
.on('error', notify.onError('Error: <%= error.message %>')) .on('error', notify.onError('Error: <%= error.message %>'))

2
index.html
View File

@ -30,7 +30,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Sans+Pro:400,600,700,900"> <link rel="stylesheet" href="//brick.a.ssl.fastly.net/Source+Sans+Pro:400,600,700,900">
<link rel="stylesheet" href="<%= BASE_URL %>static/css/main.css"> <link rel="stylesheet" href="<%= BASE_URL %>static/css/main.css">
<link rel="stylesheet" href="<%= BASE_URL %>static/css/maps/main.css.map"> <% DEBUG && print('<link rel="stylesheet" href="' + BASE_URL + 'static/css/maps/main.css.map">') %>
<!-- This is for sluice --> <!-- This is for sluice -->
<link href='//fonts.googleapis.com/css?family=Nunito:400,700,300' rel='stylesheet' type='text/css'> <link href='//fonts.googleapis.com/css?family=Nunito:400,700,300' rel='stylesheet' type='text/css'>

1
js/actions/loan_contract_actions.js
View File

@ -12,7 +12,6 @@ class LoanContractActions {
} }
fetchLoanContract(email) { fetchLoanContract(email) {
if(email.match(/.+\@.+\..+/)) { if(email.match(/.+\@.+\..+/)) {
OwnershipFetcher.fetchLoanContract(email) OwnershipFetcher.fetchLoanContract(email)
.then((contracts) => { .then((contracts) => {

4
sass/ascribe_accordion_list.scss
View File

@ -133,7 +133,7 @@ span.ascribe-accordion-list-table-toggle {
-ms-user-select: none; -ms-user-select: none;
&:hover { &:hover {
color: $ascribe-color-dark; color: $ascribe-color-green;
cursor:pointer; cursor:pointer;
} }
} }
@ -164,7 +164,7 @@ span.ascribe-accordion-list-table-toggle {
-ms-user-select: none; -ms-user-select: none;
&:hover { &:hover {
color: $ascribe-color-dark; color: $ascribe-color-green;
} }
.glyphicon { .glyphicon {
top: 1px !important; top: 1px !important;

4
sass/ascribe_media_player.scss
View File

@ -25,7 +25,7 @@
} }
.audiojs .loaded { .audiojs .loaded {
background-color: $ascribe-color-full; background-color: $ascribe-color-green;
background-image: none; background-image: none;
} }
.audiojs .progress { .audiojs .progress {
@ -48,7 +48,7 @@
.vjs-default-skin .vjs-play-progress, .vjs-default-skin .vjs-play-progress,
.vjs-default-skin .vjs-volume-level { .vjs-default-skin .vjs-volume-level {
background: $ascribe-color-full; background: $ascribe-color-green;
} }
.vjs-default-skin .vjs-big-play-button { .vjs-default-skin .vjs-big-play-button {

4
sass/ascribe_variables.scss
View File

@ -1,6 +1,4 @@
$ascribe-color: rgba(2, 182, 163, 0.5); $ascribe-color-green: rgba(2, 182, 163, 1);
$ascribe-color-dark: rgba(2, 182, 163, 0.8);
$ascribe-color-full: rgba(2, 182, 163, 1);
$ascribe-brand-danger: #FC535F; $ascribe-brand-danger: #FC535F;
$ascribe-brand-warning: #FFC354; $ascribe-brand-warning: #FFC354;

2
sass/main.scss
View File

@ -118,7 +118,7 @@ hr {
} }
.ascribe-color { .ascribe-color {
color: $ascribe-color; color: $ascribe-color-green;
} }
.ascribe-subheader{ .ascribe-subheader{

18
sass/variables.scss
View File

@ -150,8 +150,8 @@ $table-border-color: #ddd !default;
$btn-font-weight: normal !default; $btn-font-weight: normal !default;
$btn-default-color: white !default; $btn-default-color: white !default;
$btn-default-bg: $ascribe-color-full !default; $btn-default-bg: $ascribe-color-green !default;
$btn-default-border: $ascribe-color-full !default; $btn-default-border: $ascribe-color-green !default;
$btn-primary-color: #fff !default; $btn-primary-color: #fff !default;
$btn-primary-bg: $brand-primary !default; $btn-primary-bg: $brand-primary !default;
@ -219,9 +219,9 @@ $legend-color: $gray-dark !default;
$legend-border-color: #e5e5e5 !default; $legend-border-color: #e5e5e5 !default;
//** Background color for textual input addons //** 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 //** 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. //** Disabled cursor for form controls and buttons.
$cursor-disabled: not-allowed !default; $cursor-disabled: not-allowed !default;
@ -468,14 +468,14 @@ $pagination-disabled-border: #ddd !default;
// //
//## //##
$pager-bg: $ascribe-color-full !default; $pager-bg: $ascribe-color-green !default;
$pager-border: $ascribe-color-full !default; $pager-border: $ascribe-color-green !default;
$pager-border-radius: 0 !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-bg: $ascribe-color-green !default;
$pager-active-color: $ascribe-color-full !default; $pager-active-color: $ascribe-color-green !default;
$pager-disabled-color: #CCC !default; $pager-disabled-color: #CCC !default;
$pager-disabled-border: 1px solid #CCC !default; $pager-disabled-border: 1px solid #CCC !default;