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.

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

style to disability and services pages #137

Merged
merged 29 commits into from
Jun 7, 2017
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0a64d71
add style to disability page
Suuuuha Jun 5, 2017
50ad009
fix clicking on buttons bug
Suuuuha Jun 5, 2017
12add11
fix eventListener functionality
Suuuuha Jun 5, 2017
4457846
add style to disability page
Suuuuha Jun 5, 2017
cfb195d
add background to body
Suuuuha Jun 5, 2017
58169e0
add icon for mental dis
m4v15 Jun 6, 2017
324d311
add a circle class to have good size buttons
m4v15 Jun 6, 2017
4f2a2cf
add links to new stylesheets
m4v15 Jun 6, 2017
9487fe3
change buttons to icons
m4v15 Jun 6, 2017
394b259
change functionality to add title instead of inner html
m4v15 Jun 6, 2017
297021f
add titles so js works
m4v15 Jun 6, 2017
1fba1ce
Merge branch 'master' into disPageStyle
m4v15 Jun 6, 2017
a355c78
do filters added styling
m4v15 Jun 6, 2017
b32d585
change the back arrow icon color
Suuuuha Jun 6, 2017
f2b0860
add style to services page
Suuuuha Jun 6, 2017
5de43e0
change style of next button
Suuuuha Jun 6, 2017
6d46f3f
add icons to services butons
Suuuuha Jun 6, 2017
84f8e70
change icon for mental option
Suuuuha Jun 6, 2017
8cf7d04
fix the stylesheet link
Suuuuha Jun 6, 2017
1f87cf3
replace flaticon collection with more updated one
Suuuuha Jun 6, 2017
1074eb2
fix merge conflict
Suuuuha Jun 6, 2017
cd4cc4a
add z-index to header
Suuuuha Jun 6, 2017
0a686f4
use helper to change back icon
Suuuuha Jun 6, 2017
0d1bb7c
fix height and margin
Suuuuha Jun 6, 2017
6145709
add height class
Suuuuha Jun 6, 2017
dcfef95
make helper function for converting back button
Suuuuha Jun 6, 2017
c3c2d76
remove back button svg file
Suuuuha Jun 6, 2017
646de6e
add dim to back arrow
Suuuuha Jun 6, 2017
e5fbce0
add fr and fl to back arrow
Suuuuha Jun 6, 2017
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
9 changes: 8 additions & 1 deletion app.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ app.engine('hbs', hbs({
mapSrcLink: () => {
return `https://maps.googleapis.com/maps/api/js?key=${process.env.GOOGLE_API}&callback=_myMap`
},
convertToIcons: convertToIcons
convertToIcons: convertToIcons,
chooseBack: (dir) => {
if (dir === 'ltr') {
return 'fa fa-arrow-left'
} else {
return 'fa fa-arrow-right'
}
}
}
}))

Expand Down
15 changes: 0 additions & 15 deletions public/assets/icons/BACK_btn.svg

This file was deleted.

Binary file not shown.
84 changes: 84 additions & 0 deletions public/assets/my-icons-collection /font/Flaticon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
47 changes: 47 additions & 0 deletions public/assets/my-icons-collection /font/_flaticon.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
Flaticon icon font: Flaticon
Creation date: 06/06/2017 14:34
*/

@font-face {
font-family: "Flaticon";
src: url("./Flaticon.eot");
src: url("./Flaticon.eot?#iefix") format("embedded-opentype"),
url("./Flaticon.woff") format("woff"),
url("./Flaticon.ttf") format("truetype"),
url("./Flaticon.svg#Flaticon") format("svg");
font-weight: normal;
font-style: normal;
}

@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: "Flaticon";
src: url("./Flaticon.svg#Flaticon") format("svg");
}
}

.fi:before{
display: inline-block;
font-family: "Flaticon";
font-style: normal;
font-weight: normal;
font-variant: normal;
line-height: 1;
text-decoration: inherit;
text-rendering: optimizeLegibility;
text-transform: none;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
}

.flaticon-worker-of-construction-working-with-a-shovel-beside-material-pile:before { content: "\f100"; }
.flaticon-city-hall-silhouette:before { content: "\f101"; }
.flaticon-airplane-flight-in-circle-around-earth:before { content: "\f102"; }
.flaticon-productivity:before { content: "\f103"; }

$font-Flaticon-worker-of-construction-working-with-a-shovel-beside-material-pile: "\f100";
$font-Flaticon-city-hall-silhouette: "\f101";
$font-Flaticon-airplane-flight-in-circle-around-earth: "\f102";
$font-Flaticon-productivity: "\f103";
33 changes: 33 additions & 0 deletions public/assets/my-icons-collection /font/flaticon.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
Flaticon icon font: Flaticon
Creation date: 06/06/2017 14:34
*/

@font-face {
font-family: "Flaticon";
src: url("./Flaticon.eot");
src: url("./Flaticon.eot?#iefix") format("embedded-opentype"),
url("./Flaticon.woff") format("woff"),
url("./Flaticon.ttf") format("truetype"),
url("./Flaticon.svg#Flaticon") format("svg");
font-weight: normal;
font-style: normal;
}

@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: "Flaticon";
src: url("./Flaticon.svg#Flaticon") format("svg");
}
}

[class^="flaticon-"]:before, [class*=" flaticon-"]:before,
[class^="flaticon-"]:after, [class*=" flaticon-"]:after {
font-family: Flaticon;
font-style: normal;
}

.flaticon-worker-of-construction-working-with-a-shovel-beside-material-pile:before { content: "\f100"; }
.flaticon-city-hall-silhouette:before { content: "\f101"; }
.flaticon-airplane-flight-in-circle-around-earth:before { content: "\f102"; }
.flaticon-productivity:before { content: "\f103"; }
Loading