Skip to content

Commit

Permalink
Merge pull request #161 from UniversityofHelsinki/new_icons
Browse files Browse the repository at this point in the history
Added headphones icon and play pause icons to master
  • Loading branch information
tuukkaturu authored May 29, 2019
2 parents a06e7f1 + 6c0007b commit 524cd54
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 1 deletion.
33 changes: 33 additions & 0 deletions css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -1939,6 +1939,39 @@ th {
content: "";
}

.icon--pause:after {
display: inline-block;
font-family: "hy-icons";
font-style: normal;
font-weight: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
vertical-align: bottom;
content: "";
}

.icon--play-arrow:after {
display: inline-block;
font-family: "hy-icons";
font-style: normal;
font-weight: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
vertical-align: bottom;
content: "";
}

.icon--headphones:after {
display: inline-block;
font-family: "hy-icons";
font-style: normal;
font-weight: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
vertical-align: bottom;
content: "";
}

.bar, .tube {
display: block;
padding-bottom: 1em;
Expand Down
Binary file modified fonts/hy-icons.eot
Binary file not shown.
Binary file modified fonts/hy-icons.ttf
Binary file not shown.
Binary file modified fonts/hy-icons.woff
Binary file not shown.
1 change: 1 addition & 0 deletions icons/dest/uEA89-pause.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/dest/uEA8A-play-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/dest/uEA8B-headphones.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/src/headphones.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/src/pause.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/src/play-arrow.svg
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 icons/unicodes.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88"}
{"add-to-todo-list.svg":"uEA01","arrow.svg":"uEA03","avatar-group.svg":"uEA04","avatar.svg":"uEA05","bachelor.svg":"uEA06","camera.svg":"uEA07","chat.svg":"uEA08","date.svg":"uEA09","discover.svg":"uEA0A","done.svg":"uEA0B","download.svg":"uEA0C","drag.svg":"uEA0D","drop-down.svg":"uEA0E","edit-event.svg":"uEA0F","edit.svg":"uEA10","events.svg":"uEA11","facebook.svg":"uEA12","favorites.svg":"uEA13","grid.svg":"uEA14","hamburger.svg":"uEA15","home.svg":"uEA16","hy-logo.svg":"uEA17","info-stroke.svg":"uEA18","info.svg":"uEA19","link-arrow-offsite.svg":"uEA1A","link-arrow.svg":"uEA1B","linkedin.svg":"uEA1C","list.svg":"uEA1D","location.svg":"uEA1E","log.svg":"uEA1F","logout.svg":"uEA20","magnify-minus.svg":"uEA21","magnify-plus.svg":"uEA22","master.svg":"uEA23","minus.svg":"uEA24","modify.svg":"uEA25","navi-triangle.svg":"uEA26","new-group.svg":"uEA27","new-person.svg":"uEA28","notification.svg":"uEA29","opinder-logo-new.svg":"uEA2A","pdf.svg":"uEA2B","people.svg":"uEA2C","person-outline.svg":"uEA2D","person.svg":"uEA2E","plus.svg":"uEA2F","profile.svg":"uEA30","question.svg":"uEA31","remove.svg":"uEA32","rotate-left.svg":"uEA33","rotate-right.svg":"uEA34","search.svg":"uEA35","time.svg":"uEA36","todo-list.svg":"uEA37","tour.svg":"uEA38","twitter.svg":"uEA39","units-and-faculties.svg":"uEA3A","video.svg":"uEA3B","warning.svg":"uEA3C","you-tube.svg":"uEA3D","id-number.svg":"uEA3E","mail.svg":"uEA3F","mobile.svg":"uEA40","opinder-logo.svg":"uEA41","permission-all.svg":"uEA42","permission-group.svg":"uEA43","permission-private.svg":"uEA44","phone.svg":"uEA45","preview.svg":"uEA46","url.svg":"uEA47","instagram.svg":"uEA48","login.svg":"uEA49","spinner.svg":"uEA4A","you-tuubi.svg":"uEA4B","bullet-list.svg":"uEA4C","contentlink.svg":"uEA4D","customlink.svg":"uEA4E","dragbutton.svg":"uEA4F","embed-new (1).svg":"uEA50","embed.svg":"uEA51","feed.svg":"uEA52","file-text.svg":"uEA53","helsinginyliopisto.svg":"uEA54","horizontal-resize.svg":"uEA55","image-gallery.svg":"uEA56","images.svg":"uEA57","leiki-list.svg":"uEA58","listoflinks.svg":"uEA59","play.svg":"uEA5A","wrench.svg":"uEA5B","youtube.svg":"uEA5D","link-arrow-down.svg":"uEA5E","link-arrow-left.svg":"uEA5F","link-arrow-up.svg":"uEA60","code-fork.svg":"uEA61","cogs.svg":"uEA62","external-link.svg":"uEA63","globe.svg":"uEA64","image.svg":"uEA65","arrow-down.svg":"uEA66","arrow-left.svg":"uEA67","arrow-right.svg":"uEA68","arrow-up.svg":"uEA69","arrow-offsite.svg":"uEA6C","caret-down.svg":"uEA6D","caret-left.svg":"uEA6E","caret-right.svg":"uEA71","caret-up.svg":"uEA70","list-as-blocks.svg":"uEA72","social-media.svg":"uEA73","dot.svg":"uEA74","google-plus.svg":"uEA75","share.svg":"uEA76","heart.svg":"uEA77","retweet.svg":"uEA78","square-checked.svg":"uEA79","square.svg":"uEA7A","eye-slash.svg":"uEA7B","full-screen.svg":"uEA7C","alert.svg":"uEA7D","archive.svg":"uEA7E","copy.svg":"uEA7F","file-chart.svg":"uEA80","item-close.svg":"uEA81","item-edit.svg":"uEA82","item-set.svg":"uEA83","item-single.svg":"uEA84","new-version.svg":"uEA85","trash.svg":"uEA86","version-history.svg":"uEA87","whatsapp.svg":"uEA88","pause.svg":"uEA89","play-arrow.svg":"uEA8A","headphones.svg":"uEA8B"}
3 changes: 3 additions & 0 deletions sass/icons/__icon_font.scss
Original file line number Diff line number Diff line change
Expand Up @@ -201,3 +201,6 @@
.icon--trash:after { @include icon("\EA86"); }
.icon--version-history:after { @include icon("\EA87"); }
.icon--whatsapp:after { @include icon("\EA88"); }
.icon--pause:after { @include icon("\EA89"); }
.icon--play-arrow:after { @include icon("\EA8A"); }
.icon--headphones:after { @include icon("\EA8B"); }
6 changes: 6 additions & 0 deletions sass/icons/__variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,9 @@ $icon-trash: "\EA86";
$icon-version-history: "\EA87";

$icon-whatsapp: "\EA88";

$icon-pause: "\EA89";

$icon-play-arrow: "\EA8A";

$icon-headphones: "\EA8B";
2 changes: 2 additions & 0 deletions templates/2_1_icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<span class="icon--whatsapp"></span>
<span class="icon--wrench"></span>
<span class="icon--youtube"></span>
<span class="icon--headphones"></span>
</div><br><br>

<div>
Expand Down Expand Up @@ -244,6 +245,7 @@
<span class="icon-2x icon--whatsapp"></span>
<span class="icon-2x icon--wrench"></span>
<span class="icon-2x icon--youtube"></span>
<span class="icon-2x icon--headphones"></span>
</div>
<div>
<span class="icon-2x icon--twitter icon-rotate-90"></span>
Expand Down

0 comments on commit 524cd54

Please sign in to comment.