Skip to content

Commit

Permalink
Merge remote-tracking branch 'ZM-Website/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pysis868 committed May 12, 2023
2 parents 4ced4c5 + eab6554 commit ca0497e
Show file tree
Hide file tree
Showing 13 changed files with 118 additions and 50 deletions.
Binary file modified fonts/icomoon.eot
Binary file not shown.
9 changes: 9 additions & 0 deletions fonts/icomoon.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 modified fonts/icomoon.ttf
Binary file not shown.
Binary file modified fonts/icomoon.woff
Binary file not shown.
Binary file added images/icons/totk/hyrule/ground/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/totk/hyrule/sky/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/totk/hyrule/underground/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified styles/fonts/icomoon.eot
Binary file not shown.
103 changes: 63 additions & 40 deletions styles/fonts/icomoon.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 modified styles/fonts/icomoon.ttf
Binary file not shown.
Binary file modified styles/fonts/icomoon.woff
Binary file not shown.
48 changes: 38 additions & 10 deletions styles/style.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?3m8qpl');
src: url('fonts/icomoon.eot?3m8qpl#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?3m8qpl') format('truetype'),
url('fonts/icomoon.woff?3m8qpl') format('woff'),
url('fonts/icomoon.svg?3m8qpl#icomoon') format('svg');
src: url('fonts/icomoon.eot?yy9fm4');
src: url('fonts/icomoon.eot?yy9fm4#iefix') format('embedded-opentype'),
url('fonts/icomoon.ttf?yy9fm4') format('truetype'),
url('fonts/icomoon.woff?yy9fm4') format('woff'),
url('fonts/icomoon.svg?yy9fm4#icomoon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
Expand All @@ -13,7 +13,7 @@
[class^="icon-"], [class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important;
speak: none;
speak: never;
font-style: normal;
font-weight: normal;
font-variant: normal;
Expand All @@ -25,11 +25,15 @@
-moz-osx-font-smoothing: grayscale;
}

.icon-General_Store:before {
content: "\e900";
.icon-Tears-of-the-Kingdom:before {
content: "\e932";
color: #fff;
}
.icon-General_Heart:before {
content: "\f004";
.icon-TotK_Well:before {
content: "\e92a";
}
.icon-General_Cave:before {
content: "\e92b";
}
.icon-General_Map:before {
content: "\e928";
Expand Down Expand Up @@ -205,6 +209,27 @@
.icon-fa-envelope:before {
content: "\f0e0";
}
.icon-TotK_Chasm:before {
content: "\e92c";
}
.icon-TotK_Bubbulfrog:before {
content: "\f069";
}
.icon-TotK_Sages-Will:before {
content: "\f111";
}
.icon-TotK_Lightroot:before {
content: "\f1bb";
}
.icon-TotK_SignNpc:before {
content: "\f277";
}
.icon-General_Heart:before {
content: "\f004";
}
.icon-LA_Portal:before {
content: "\e929";
}
.icon-General_House:before {
content: "\e92d";
}
Expand All @@ -217,3 +242,6 @@
.icon-embed2:before {
content: "\ea80";
}
.icon-General_Store:before {
content: "\e900";
}
8 changes: 8 additions & 0 deletions styles/zmain.css
Original file line number Diff line number Diff line change
Expand Up @@ -1345,3 +1345,11 @@ header.ex1 {
background-color: rgba(50,50,50,.8) !important;
}

.TotK-label {
color: #f8efae;
text-shadow: 0 1px 3px #977f41;
background-color: transparent;
box-shadow: none;
border: 0px;
font-size: 24px;
}

0 comments on commit ca0497e

Please sign in to comment.