diff --git a/app.vue b/app.vue index 532f415..d988151 100644 --- a/app.vue +++ b/app.vue @@ -9,7 +9,6 @@ { rel: 'icon', sizes: '16x16', href: '/favicon-16x16.png' }, { rel: 'manifest', href: '/site.webmanifest' }, { rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' }, - { rel: 'stylesheet', href: 'https://i.icomoon.io/public/870f1d17ba/crbtcorg/style.css' }, ], meta: [ { name: 'msapplication-TileColor', content: '#f59428' }, diff --git a/assets/fonts/crbtc/crbtc.eot b/assets/fonts/crbtc/crbtc.eot new file mode 100644 index 0000000..bb80689 Binary files /dev/null and b/assets/fonts/crbtc/crbtc.eot differ diff --git a/assets/fonts/crbtc/crbtc.svg b/assets/fonts/crbtc/crbtc.svg new file mode 100644 index 0000000..286318b --- /dev/null +++ b/assets/fonts/crbtc/crbtc.svg @@ -0,0 +1,13 @@ + + + +Generated by IcoMoon + + + + + + + + + \ No newline at end of file diff --git a/assets/fonts/crbtc/crbtc.ttf b/assets/fonts/crbtc/crbtc.ttf new file mode 100644 index 0000000..378a8a8 Binary files /dev/null and b/assets/fonts/crbtc/crbtc.ttf differ diff --git a/assets/fonts/crbtc/crbtc.woff b/assets/fonts/crbtc/crbtc.woff new file mode 100644 index 0000000..704cba4 Binary files /dev/null and b/assets/fonts/crbtc/crbtc.woff differ diff --git a/assets/fonts/crbtc/crbtc.woff2 b/assets/fonts/crbtc/crbtc.woff2 new file mode 100644 index 0000000..a6d8706 Binary files /dev/null and b/assets/fonts/crbtc/crbtc.woff2 differ diff --git a/assets/style/_fonts.scss b/assets/style/_fonts.scss index 5d8ea72..3c19885 100644 --- a/assets/style/_fonts.scss +++ b/assets/style/_fonts.scss @@ -38,54 +38,43 @@ url('/assets/fonts/titillium-web/titillium-web-v15-latin-700.ttf') format('truetype'); } - -/* public-sans-light @font-face { - font-family: 'Public Sans'; + font-family: 'crbtc'; + src: url('/assets/fonts/crbtc/crbtc.eot?ipcjib'); + src: url('/assets/fonts/crbtc/crbtc.eot?ipcjib#iefix') format('embedded-opentype'), + url('/assets/fonts/crbtc/crbtc.woff2?ipcjib') format('woff2'), + url('/assets/fonts/crbtc/crbtc.ttf?ipcjib') format('truetype'), + url('/assets/fonts/crbtc/crbtc.woff?ipcjib') format('woff'), + url('/assets/fonts/crbtc/crbtc.svg?ipcjib#crbtc') format('svg'); + font-weight: normal; font-style: normal; - font-weight: 300; - src: local(''), - url('/assets/fonts/public-sans/public-sans-light.woff2') format('woff2'), - url('/assets/fonts/public-sans/public-sans-light.woff') format('woff'); + font-display: block; } -/* public-sans-regular -@font-face { - font-family: 'Public Sans'; +[class^="icon-"], [class*=" icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'crbtc' !important; font-style: normal; - font-weight: 400; - src: local(''), - url('/assets/fonts/public-sans/public-sans-regular.woff2') format('woff2'), - url('/assets/fonts/public-sans/public-sans-regular.woff') format('woff'); + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } -/* public-sans-medium -@font-face { - font-family: 'Public Sans'; - font-style: normal; - font-weight: 500; - src: local(''), - url('/assets/fonts/public-sans/public-sans-medium.woff2') format('woff2'), - url('/assets/fonts/public-sans/public-sans-medium.woff') format('woff'); +.icon-btc .path1:before { + content: "\e900"; + color: rgb(245, 148, 40); } - -/* public-sans-semi-bold -@font-face { - font-family: 'Public Sans'; - font-style: normal; - font-weight: 600; - src: local(''), - url('/assets/fonts/public-sans/public-sans-semi-bold.woff2') format('woff2'), - url('/assets/fonts/public-sans/public-sans-semi-bold.woff') format('woff'); +.icon-btc .path2:before { + content: "\e901"; + margin-left: -1em; + color: rgb(255, 255, 255); } - -/* public-sans-bold -@font-face { - font-family: 'Public Sans'; - font-style: normal; - font-weight: 700; - src: local(''), - url('/assets/fonts/public-sans/public-sans-bold.woff2') format('woff2'), - url('/assets/fonts/public-sans/public-sans-bold.woff') format('woff'); -} -*/ \ No newline at end of file +.icon-btc-b:before { + content: "\e902"; + color: #f59428; +} \ No newline at end of file diff --git a/assets/style/components/_footer.scss b/assets/style/components/_footer.scss index e364b64..6613b5d 100644 --- a/assets/style/components/_footer.scss +++ b/assets/style/components/_footer.scss @@ -16,11 +16,10 @@ &:hover { text-decoration: underline } } - .icon-btc { + .icon-btc-b { position: relative; - top: .2rem; + top: .25rem; font-size: 1.1rem; - margin: 0 .1rem; } } diff --git a/assets/style/pages/index/_banner.scss b/assets/style/pages/index/_banner.scss index 0a70b38..22d64e6 100644 --- a/assets/style/pages/index/_banner.scss +++ b/assets/style/pages/index/_banner.scss @@ -23,9 +23,7 @@ padding: 3rem 1rem 8rem 1rem; .msg .donate { - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; + overflow-wrap: break-word; } } } \ No newline at end of file diff --git a/assets/style/pages/index/_events.scss b/assets/style/pages/index/_events.scss index a1a0a65..45801e8 100644 --- a/assets/style/pages/index/_events.scss +++ b/assets/style/pages/index/_events.scss @@ -45,10 +45,13 @@ grid-row: 1/4; h5 { - display: inline-block; + width: 95%; color: $f-color; font-size: 1.2rem; line-height: 1.8rem; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; &:hover { color: $fh-color; @@ -96,6 +99,7 @@ min-width: 0; h5 { + width: 90%; font-size: 1rem; line-height: 1.6rem; } diff --git a/components/Footer.vue b/components/Footer.vue index 5dcd1a8..5699838 100644 --- a/components/Footer.vue +++ b/components/Footer.vue @@ -1,7 +1,7 @@