diff --git a/source/fonts/icons.svg b/source/fonts/icons.svg new file mode 100644 index 0000000..40b1b8a --- /dev/null +++ b/source/fonts/icons.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/source/fonts/material-icons.woff2 b/source/fonts/material-icons.woff2 deleted file mode 100644 index 5492a6e..0000000 Binary files a/source/fonts/material-icons.woff2 and /dev/null differ diff --git a/source/includes/comparison.html.jade b/source/includes/comparison.html.jade index e1f5a46..a8a8d1c 100644 --- a/source/includes/comparison.html.jade +++ b/source/includes/comparison.html.jade @@ -3,8 +3,10 @@ .version(ng-repeat="heading in headings") .version-padded .version-menu - .arrow.material-icons(ng-show="!pick") keyboard_arrow_up - .arrow.material-icons(ng-show="pick") keyboard_arrow_down + svg.icon.arrow(ng-show="!pick") + use(xlink:href="/fonts/icons.svg#icon-expand-less") + svg.icon.arrow(ng-show="pick") + use(xlink:href="/fonts/icons.svg#icon-expand-more") .text(ng-bind-html="heading") .pick(ng-show="pick") diff --git a/source/index.html.jade b/source/index.html.jade index 63d00bc..7ca9197 100644 --- a/source/index.html.jade +++ b/source/index.html.jade @@ -30,11 +30,13 @@ html(ng-app="sideBySide" ng-controller="AppController") a(href="" ng-click="display(link.display)" ng-bind-html="link.text") li a(href="" ng-click="flipPick()") - i.material-icons menu + svg.icon + use(xlink:href="/fonts/icons.svg#icon-menu") span Compare translations li a(href="" ng-click="showPage('about')") - i.material-icons star + svg.icon + use(xlink:href="/fonts/icons.svg#icon-star") span About div(ng-controller="ComparisonController" class="cols-{{columns}}") diff --git a/source/styles/fonts.css.styl b/source/styles/fonts.css.styl index d421406..9aea26a 100644 --- a/source/styles/fonts.css.styl +++ b/source/styles/fonts.css.styl @@ -11,25 +11,3 @@ font-family: 'Alegreya'; font-style: normal; font-weight: 700; font-display: swap; src: url('../fonts/alegreya-v29-all-700.woff2') format('woff2'); } - -/* Material Icons */ -@font-face { - font-family: 'Material Icons'; font-style: normal; font-weight: 400; font-display: swap; - src: url('../fonts/material-icons.woff2') format('woff2'); -} - -.material-icons { - font-family: 'Material Icons'; - font-weight: normal; - font-style: normal; - font-size: 24px; - line-height: 1; - letter-spacing: normal; - text-transform: none; - display: inline-block; - white-space: nowrap; - word-wrap: normal; - direction: ltr; - -webkit-font-feature-settings: 'liga'; - -webkit-font-smoothing: antialiased; -} diff --git a/source/styles/style.css.styl b/source/styles/style.css.styl index 6ac3a1d..4f3154e 100644 --- a/source/styles/style.css.styl +++ b/source/styles/style.css.styl @@ -33,11 +33,6 @@ body .pure-menu.menu-main height: 34px - .material-icons - font-size: 18px - margin-right: 7px - padding-bottom: 2px - vertical-align: middle .pure-menu.menu-verses height: $bottom_bar_height px @@ -47,10 +42,11 @@ body :hover cursor: pointer .arrow + width: 24px + height: 24px left: -15px + top: 2px position: absolute - vertical-align: middle - display: inline-block transition: .3s linear all .arrow.ng-hide transform: scale(.1) @@ -61,6 +57,15 @@ a p margin: 24px 0px +.icon + height: 18px + width: 18px + line-height: 18px + margin-right: 7px + margin-top: -2px + vertical-align: middle + display: inline-block + #section-meta .key padding-right: 10px font-style: italic