Skip to content

Commit

Permalink
Add bracelet and alt for images in credits page.
Browse files Browse the repository at this point in the history
  • Loading branch information
ubik23 committed Jan 20, 2019
1 parent 7c1c959 commit 3aba0e1
Show file tree
Hide file tree
Showing 14 changed files with 471 additions and 41 deletions.
32 changes: 16 additions & 16 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ <h3>Created by</h3>
<p>Frédéric Guimont</p>
<p>The continuation of this project is made possible by the contributions of our distinguished patrons.</p>
<h3>Patrons</h3>
<p>Pablo Saxton, Éric Spérano, Gennaio, Cappa Ribou, Véronique Hamel, Jared Pearson, April Kinghorn, Maxim St-Hillaire.</p>
<p>Pablo Saxton, Éric Spérano, Gennaio, Cappa Ribou, Véronique Hamel, Jared Pearson, April Kinghorn, Maxim St-Hillaire, Daren Conroy, Lain</p>
<h3>Contributors</h3>
<div class="overlay__credits__row--text">
<span class="overlay__credits__role">SEO</span>
Expand All @@ -533,34 +533,34 @@ <h3>Contributors</h3>
<span class="overlay__credits__name">Robin Millette</span>
</div>
<p>The Character Creator was built on the shoulders of giants:</p>
<h3>Free Software</h3>
<h3>Free Software used in this project:</h3>
<div class="overlay__credits__row">
<img src="credits/HTML5_Badge.svg" alt=""/>
<img src="credits/Unofficial_JavaScript_logo_2.svg" alt=""/>
<img src="credits/HTML5_Badge.svg" alt="HTML5"/></a>
<img src="credits/Unofficial_JavaScript_logo_2.svg" alt="Javascript/Ecmascript"/>
</div>
<div class="overlay__credits__row">
<img src="credits/Inkscape_Logo.svg" alt=""/>
<img src="credits/svg-logo.svg" alt=""/>
<img src="credits/Inkscape_Logo.svg" alt="Inkscape"/>
<img src="credits/svg-logo.svg" alt="Scalable Vector Graphics"/>
</div>
<div class="overlay__credits__row">
<img src="credits/vim.svg" alt=""/>
<img src="credits/atom-4.svg" alt=""/>
<img src="credits/vim.svg" alt="VI Improved"/>
<img src="credits/atom-4.svg" alt="Atom"/>
</div>
<div class="overlay__credits__row">
<img src="credits/nginx.svg" alt=""/>
<img src="credits/couchdb.svg" alt=""/>
<img src="credits/nginx.svg" alt="NGINX"/>
<img src="credits/couchdb.svg" alt="CouchDB"/>
</div>
<div class="overlay__credits__row">
<img src="credits/certbot-logo-1B.svg" alt=""/>
<img src="credits/monochrome_dark.svg" alt=""/>
<img src="credits/certbot-logo-1B.svg" alt="Certbot"/>
<img src="credits/monochrome_dark.svg" alt="Bourne Again SHell"/>
</div>
<div class="overlay__credits__row">
<img src="credits/ubuntu-4.svg" alt=""/>
<img src="credits/Openlogo-debianV2.svg" alt=""/>
<img src="credits/ubuntu-4.svg" alt="Ubuntu"/>
<img src="credits/Openlogo-debianV2.svg" alt="Debian"/>
</div>
<div class="overlay__credits__row">
<img src="credits/github.svg" alt=""/>
<img src="credits/Gnulinux.svg" alt=""/>
<img src="credits/github.svg" alt="Github"/>
<img src="credits/Gnulinux.svg" alt="GNU-Linux"/>
</div>
<p>&copy; copyright 2018 Frédéric Guimont.</p>
</div>
Expand Down
10 changes: 6 additions & 4 deletions src/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
if (femaleSilhouette && typeof selectFemale === 'function') {femaleSilhouette.addEventListener('click', selectFemale, false)}
if (svgContainer && typeof clickSelect === 'function') {svgContainer.addEventListener('click', clickSelect, false)}
if (svgContainer && typeof layerHighlight === 'function') {svgContainer.addEventListener('mouseover', layerHighlight, false)}
if (patreonLink && typeof tattle === 'function') {patreonBtn.addEventListener('click', tattle, false)}
if (patreonLink && typeof tattle === 'function') {patreonLink.addEventListener('click', tattle, false)}
if (patreonBtn && typeof gotoPatreon === 'function') {patreonBtn.addEventListener('click', gotoPatreon, false)}
if (newCharBtn && typeof gotoNewChar === 'function') {newCharBtn.addEventListener('click', gotoNewChar, false)}
if (loadCharBtn && typeof gotoLoadChar === 'function') {loadCharBtn.addEventListener('click', gotoLoadChar, false)}
Expand Down Expand Up @@ -523,7 +523,7 @@ function launch() {
'Suit': ['', 'asymetric', 'bands', 'onepiece', 'wetsuit'],
'Dress': ['', 'accolade', 'bobafett', 'casual', 'corset', 'suit', 'waitress', 'short', 'cheerleader', 'japanese_pleat', 'parisian_fall', 'german_expression'],
'Coat' : ['', 'lab', 'winter_furcollar', 'winter_tubecollar'],
'Bracelet' : ['','rings', 'wonder'],
'Bracelet' : ['', 'perl_left','perl_right', 'rings', 'wonder'],
'Pet': ['', 'feline', 'raven', 'rat', 'canine', 'siamese_cat', 'gerbil', 'chicken', 'fox', 'vulture', 'parrot', 'doge'],
'Wings' : ['', 'angel', 'devil', 'skeleton']
};
Expand All @@ -549,6 +549,7 @@ function launch() {
'hair_down_3_of_3','hair_manga_2_of_2', 'hair_pigtails_2_of_2',
'shoes_flip-flops_2_of_2',
'holster_revolver_thigh_2_of_2',
'bracelet_perl_right_2_of_2', 'bracelet_perl_left_2_of_2',
'body_athletic',
'nails_short_2_of_2','nails_long_2_of_2','nails_claws_2_of_2',
'tatoo_chaos_chest','tatoo_chaos_left','tatoo_chaos_right','tatoo_archeopteryx_left',
Expand All @@ -569,7 +570,7 @@ function launch() {
'belt_satchel', 'belt_bullet',
'collar_metal',
'veil_al-amira_2_of_2', 'veil_khimar_2_of_2',
'bracelet_rings', 'bracelet_wonder',
'bracelet_perl_right_1_of_2', 'bracelet_rings', 'bracelet_wonder',
'coat_lab_2_of_3', 'coat_winter_furcollar_2_of_3', 'coat_winter_tubecollar_2_of_3', 'coat_winter_tubecollar_1_of_3',
'coat_lab_1_of_3',
'shoulderpads_general',
Expand Down Expand Up @@ -598,6 +599,7 @@ function launch() {
'headband_medium_1_of_2',
'hat_baseball', 'hat_beach_1_of_2', 'hat_berret_badge', 'hat_waitress','hat_police','hat_cowboy','hat_top','hat_scumbag','hat_tiara','hat_magritte','hat_strainer_1_of_2','hat_helmet_vietnam_1_of_2','hat_tuque','hat_cap','hat_motorcycle',
'body_hand',
'bracelet_perl_left_1_of_2',
'nails_short_1_of_2','nails_long_1_of_2','nails_claws_1_of_2',
'mask_horse','mask_stormtrooper','mask_jason','mask_cat',
'horns_devil',
Expand All @@ -610,7 +612,7 @@ function launch() {

var layerDirectoryFemale = 'layer/female/';
var layerDirectoryMale = 'layer/male/';
var multiLayerFemale = [['coat_lab', 3], ['hair_pigtails', 2], ['hair_manga', 2], ['hair_down', 3], ['hat_beach', 2], ['hat_strainer', 2], ['hat_helmet_vietnam', 2], ['headband_medium', 2], ['coat_winter_furcollar', 3], ['coat_winter_tubecollar', 3], ['holster_revolver_thigh', 2], ['nails_short', 2], ['nails_long', 2], ['nails_claws', 2], ['nose_default', 2], ['nose_pointed', 2], ['nose_roman', 2], ['nose_strong', 2], ['nose_syrid', 2], ['shoulderpads_spikes', 2], ['veil_al-amira', 2], ['veil_khimar', 2], ['veil_shayla', 2], ['shoes_flip-flops', 2]];
var multiLayerFemale = [['bracelet_perl_left', 2], ['bracelet_perl_right', 2], ['coat_lab', 3], ['hair_pigtails', 2], ['hair_manga', 2], ['hair_down', 3], ['hat_beach', 2], ['hat_strainer', 2], ['hat_helmet_vietnam', 2], ['headband_medium', 2], ['coat_winter_furcollar', 3], ['coat_winter_tubecollar', 3], ['holster_revolver_thigh', 2], ['nails_short', 2], ['nails_long', 2], ['nails_claws', 2], ['nose_default', 2], ['nose_pointed', 2], ['nose_roman', 2], ['nose_strong', 2], ['nose_syrid', 2], ['shoulderpads_spikes', 2], ['veil_al-amira', 2], ['veil_khimar', 2], ['veil_shayla', 2], ['shoes_flip-flops', 2]];
var multiLayerMale = [['body_athletic', 2],['hair_manga', 2], ['cloak_default', 4], ['coat_lab', 2], ['coat_fall_long', 3], ['coat_trench', 4], ['hat_fedora', 2], ['headband_medium', 2], ['jacket_suit', 2], ['shirt_colar', 2], ['shirt_tanktop', 2], ['hat_strainer', 2], ['hat_helmet_vietnam', 2], ['nose_default', 2], ['nose_pointed', 2], ['nose_roman', 2], ['nose_strong', 2], ['nose_syrid', 2], ['pants_jeans', 2], ['pants_suit', 2], ['tie_bow', 2], ['shoes_flip-flops', 2], ['shoulderpads_spikes', 2]];
var size = function(obj) {
var size = 0, key;
Expand Down
35 changes: 35 additions & 0 deletions src/revenue/revenue.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<div class="inner">
<div class="introduction">
<p i18n>
Tout est une question d’équilibre. Quand les revenus sont suffisants pour financer les dépenses, c’est plutôt bon signe.
Lorsque c’est l’inverse, il faut songer à dépenser moins ou à emprunter. Les revenus de l’État sont générés par l’impôt
des particuliers et ceux des sociétés, les taxes à la consommation, des recettes provenant de ses entreprises, des
transferts fédéraux ainsi que par d’autres formes de revenu.
</p>
</div>

<header>
<h3 i18n>Étape&nbsp;2&nbsp;: Décidez des revenus de l’État</h3>
<p i18n>Sélectionnez une source de revenu et déplacez le curseur pour augmenter ou diminuer les gains.</p>
</header>

<div class="revenue" *ngFor="let budgetItem of data.revenue">
<app-budget-item [budgetItem]="budgetItem" [type]="type"></app-budget-item>
</div>

<div class="total">
<p *ngIf="totalRevenueDifference <= -0.05" i18n>
Vos choix représentent une diminution de
<span>{{ - totalRevenueDifference | number: '1.1-1' }}&nbsp;G$</span> des revenus.
</p>
<p *ngIf="totalRevenueDifference >= 0.05" i18n>
Vos choix représentent une augmentation de
<span>{{ totalRevenueDifference | number: '1.1-1' }}&nbsp;G$</span> des revenus.
</p>
</div>

<div class="navigation">
<a routerLink="/simulation/expenditure" i18n>Précédent</a>
<a routerLink="/simulation/conclusion" i18n>Suivant</a>
</div>
</div>
67 changes: 67 additions & 0 deletions src/revenue/revenue.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
::ng-deep div.revenue {

app-slider.actual {
div.bar {
background-color: #009982;
}
span.label, span.value {
color: #009982;
}
}

app-slider.simulation {
& .container {
div.bar {
background-color: #00665a;
transition: background-color 1s ease;
}
&.pan-active div.bar {
background-color: #23978a;
transition: background-color 1s ease;
}
}
span.label, span.value {
color: #00665a;
}
}

div.loupe button {
color: #004c4a;
}

div.tiroir {
background-color: #004c4a;
}

div.poste {
padding: 20px 30px;
h4 {
color: #009982;
}
}

}

div.total p {
background-color: #c5f2eb;
color: lighten(#00665a, 5%);
font-family: 'Roboto';
font-size: 22px / 16px * 1rem;
font-weight: 500;
margin: 2em 0;
padding: 1em 1em;

span {
color: #00665a;
font-size: 26px / 16px * 1rem;
font-weight: 700;
}
}

header {
background-color: white;

& h3 {
color: #00665a;
}
}
25 changes: 25 additions & 0 deletions src/revenue/revenue.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { RevenueComponent } from './revenue.component';

describe('RevenueComponent', () => {
let component: RevenueComponent;
let fixture: ComponentFixture<RevenueComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ RevenueComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(RevenueComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
33 changes: 33 additions & 0 deletions src/revenue/revenue.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { Component, OnInit } from '@angular/core';
import { DataService } from '../data.service';
import { PlatformLocation } from '@angular/common';
import { BudgetItemType } from '../budget-item/budget-item.component';

@Component({
selector: 'app-revenue',
templateUrl: './revenue.component.html',
styleUrls: ['./revenue.component.scss']
})
export class RevenueComponent implements OnInit {

data: any;
type: BudgetItemType;
public totalRevenueDifference = 0;

constructor(
private dataService: DataService,
public platformLocation: PlatformLocation,
) { }

ngOnInit() {
this.data = this.dataService.getData();
this.type = BudgetItemType.Revenue;

this.dataService.totalRevenueDifference.subscribe({
next: (totalRevenueDifference) => {
this.totalRevenueDifference = totalRevenueDifference;
}
});
}

}
Binary file modified target/character-creator-og-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion target/dist/all-min.js

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions target/dist/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -2967,7 +2967,7 @@ function saveChar() {
if (femaleSilhouette && typeof selectFemale === 'function') {femaleSilhouette.addEventListener('click', selectFemale, false)}
if (svgContainer && typeof clickSelect === 'function') {svgContainer.addEventListener('click', clickSelect, false)}
if (svgContainer && typeof layerHighlight === 'function') {svgContainer.addEventListener('mouseover', layerHighlight, false)}
if (patreonLink && typeof tattle === 'function') {patreonBtn.addEventListener('click', tattle, false)}
if (patreonLink && typeof tattle === 'function') {patreonLink.addEventListener('click', tattle, false)}
if (patreonBtn && typeof gotoPatreon === 'function') {patreonBtn.addEventListener('click', gotoPatreon, false)}
if (newCharBtn && typeof gotoNewChar === 'function') {newCharBtn.addEventListener('click', gotoNewChar, false)}
if (loadCharBtn && typeof gotoLoadChar === 'function') {loadCharBtn.addEventListener('click', gotoLoadChar, false)}
Expand Down Expand Up @@ -3459,7 +3459,7 @@ function launch() {
'Suit': ['', 'asymetric', 'bands', 'onepiece', 'wetsuit'],
'Dress': ['', 'accolade', 'bobafett', 'casual', 'corset', 'suit', 'waitress', 'short', 'cheerleader', 'japanese_pleat', 'parisian_fall', 'german_expression'],
'Coat' : ['', 'lab', 'winter_furcollar', 'winter_tubecollar'],
'Bracelet' : ['','rings', 'wonder'],
'Bracelet' : ['', 'perl_left','perl_right', 'rings', 'wonder'],
'Pet': ['', 'feline', 'raven', 'rat', 'canine', 'siamese_cat', 'gerbil', 'chicken', 'fox', 'vulture', 'parrot', 'doge'],
'Wings' : ['', 'angel', 'devil', 'skeleton']
};
Expand All @@ -3485,6 +3485,7 @@ function launch() {
'hair_down_3_of_3','hair_manga_2_of_2', 'hair_pigtails_2_of_2',
'shoes_flip-flops_2_of_2',
'holster_revolver_thigh_2_of_2',
'bracelet_perl_right_2_of_2', 'bracelet_perl_left_2_of_2',
'body_athletic',
'nails_short_2_of_2','nails_long_2_of_2','nails_claws_2_of_2',
'tatoo_chaos_chest','tatoo_chaos_left','tatoo_chaos_right','tatoo_archeopteryx_left',
Expand All @@ -3505,7 +3506,7 @@ function launch() {
'belt_satchel', 'belt_bullet',
'collar_metal',
'veil_al-amira_2_of_2', 'veil_khimar_2_of_2',
'bracelet_rings', 'bracelet_wonder',
'bracelet_perl_right_1_of_2', 'bracelet_rings', 'bracelet_wonder',
'coat_lab_2_of_3', 'coat_winter_furcollar_2_of_3', 'coat_winter_tubecollar_2_of_3', 'coat_winter_tubecollar_1_of_3',
'coat_lab_1_of_3',
'shoulderpads_general',
Expand Down Expand Up @@ -3534,6 +3535,7 @@ function launch() {
'headband_medium_1_of_2',
'hat_baseball', 'hat_beach_1_of_2', 'hat_berret_badge', 'hat_waitress','hat_police','hat_cowboy','hat_top','hat_scumbag','hat_tiara','hat_magritte','hat_strainer_1_of_2','hat_helmet_vietnam_1_of_2','hat_tuque','hat_cap','hat_motorcycle',
'body_hand',
'bracelet_perl_left_1_of_2',
'nails_short_1_of_2','nails_long_1_of_2','nails_claws_1_of_2',
'mask_horse','mask_stormtrooper','mask_jason','mask_cat',
'horns_devil',
Expand All @@ -3546,7 +3548,7 @@ function launch() {

var layerDirectoryFemale = 'layer/female/';
var layerDirectoryMale = 'layer/male/';
var multiLayerFemale = [['coat_lab', 3], ['hair_pigtails', 2], ['hair_manga', 2], ['hair_down', 3], ['hat_beach', 2], ['hat_strainer', 2], ['hat_helmet_vietnam', 2], ['headband_medium', 2], ['coat_winter_furcollar', 3], ['coat_winter_tubecollar', 3], ['holster_revolver_thigh', 2], ['nails_short', 2], ['nails_long', 2], ['nails_claws', 2], ['nose_default', 2], ['nose_pointed', 2], ['nose_roman', 2], ['nose_strong', 2], ['nose_syrid', 2], ['shoulderpads_spikes', 2], ['veil_al-amira', 2], ['veil_khimar', 2], ['veil_shayla', 2], ['shoes_flip-flops', 2]];
var multiLayerFemale = [['bracelet_perl_left', 2], ['bracelet_perl_right', 2], ['coat_lab', 3], ['hair_pigtails', 2], ['hair_manga', 2], ['hair_down', 3], ['hat_beach', 2], ['hat_strainer', 2], ['hat_helmet_vietnam', 2], ['headband_medium', 2], ['coat_winter_furcollar', 3], ['coat_winter_tubecollar', 3], ['holster_revolver_thigh', 2], ['nails_short', 2], ['nails_long', 2], ['nails_claws', 2], ['nose_default', 2], ['nose_pointed', 2], ['nose_roman', 2], ['nose_strong', 2], ['nose_syrid', 2], ['shoulderpads_spikes', 2], ['veil_al-amira', 2], ['veil_khimar', 2], ['veil_shayla', 2], ['shoes_flip-flops', 2]];
var multiLayerMale = [['body_athletic', 2],['hair_manga', 2], ['cloak_default', 4], ['coat_lab', 2], ['coat_fall_long', 3], ['coat_trench', 4], ['hat_fedora', 2], ['headband_medium', 2], ['jacket_suit', 2], ['shirt_colar', 2], ['shirt_tanktop', 2], ['hat_strainer', 2], ['hat_helmet_vietnam', 2], ['nose_default', 2], ['nose_pointed', 2], ['nose_roman', 2], ['nose_strong', 2], ['nose_syrid', 2], ['pants_jeans', 2], ['pants_suit', 2], ['tie_bow', 2], ['shoes_flip-flops', 2], ['shoulderpads_spikes', 2]];
var size = function(obj) {
var size = 0, key;
Expand Down
Loading

0 comments on commit 3aba0e1

Please sign in to comment.