diff --git a/src/assets/icons/android-chrome-192x192.png b/src/assets/icons/android-chrome-192x192.png new file mode 100755 index 0000000..cb4b2b5 Binary files /dev/null and b/src/assets/icons/android-chrome-192x192.png differ diff --git a/src/assets/icons/android-chrome-512x512.png b/src/assets/icons/android-chrome-512x512.png new file mode 100755 index 0000000..7709da5 Binary files /dev/null and b/src/assets/icons/android-chrome-512x512.png differ diff --git a/src/assets/icons/apple-touch-icon-114x114.png b/src/assets/icons/apple-touch-icon-114x114.png deleted file mode 100644 index a731add..0000000 Binary files a/src/assets/icons/apple-touch-icon-114x114.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-120x120.png b/src/assets/icons/apple-touch-icon-120x120.png deleted file mode 100644 index 8f01fd9..0000000 Binary files a/src/assets/icons/apple-touch-icon-120x120.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-144x144.png b/src/assets/icons/apple-touch-icon-144x144.png deleted file mode 100644 index c8eaa0a..0000000 Binary files a/src/assets/icons/apple-touch-icon-144x144.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-152x152.png b/src/assets/icons/apple-touch-icon-152x152.png deleted file mode 100644 index 56111e2..0000000 Binary files a/src/assets/icons/apple-touch-icon-152x152.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-180x180.png b/src/assets/icons/apple-touch-icon-180x180.png deleted file mode 100644 index 3f683f8..0000000 Binary files a/src/assets/icons/apple-touch-icon-180x180.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-57x57.png b/src/assets/icons/apple-touch-icon-57x57.png deleted file mode 100644 index bc99fbc..0000000 Binary files a/src/assets/icons/apple-touch-icon-57x57.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-60x60.png b/src/assets/icons/apple-touch-icon-60x60.png deleted file mode 100644 index 212e725..0000000 Binary files a/src/assets/icons/apple-touch-icon-60x60.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-72x72.png b/src/assets/icons/apple-touch-icon-72x72.png deleted file mode 100644 index 6d32499..0000000 Binary files a/src/assets/icons/apple-touch-icon-72x72.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-76x76.png b/src/assets/icons/apple-touch-icon-76x76.png deleted file mode 100644 index 272223d..0000000 Binary files a/src/assets/icons/apple-touch-icon-76x76.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon-precomposed.png b/src/assets/icons/apple-touch-icon-precomposed.png deleted file mode 100644 index d355220..0000000 Binary files a/src/assets/icons/apple-touch-icon-precomposed.png and /dev/null differ diff --git a/src/assets/icons/apple-touch-icon.png b/src/assets/icons/apple-touch-icon.png old mode 100644 new mode 100755 index 3f683f8..a84a2f5 Binary files a/src/assets/icons/apple-touch-icon.png and b/src/assets/icons/apple-touch-icon.png differ diff --git a/src/assets/icons/browserconfig.xml b/src/assets/icons/browserconfig.xml deleted file mode 100644 index e562b87..0000000 --- a/src/assets/icons/browserconfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - #3090de - - - diff --git a/src/assets/icons/favicon-160x160.png b/src/assets/icons/favicon-160x160.png deleted file mode 100644 index 0b7bdf5..0000000 Binary files a/src/assets/icons/favicon-160x160.png and /dev/null differ diff --git a/src/assets/icons/favicon-16x16.png b/src/assets/icons/favicon-16x16.png old mode 100644 new mode 100755 index bcdf23e..4b01ad8 Binary files a/src/assets/icons/favicon-16x16.png and b/src/assets/icons/favicon-16x16.png differ diff --git a/src/assets/icons/favicon-192x192.png b/src/assets/icons/favicon-192x192.png deleted file mode 100644 index 497d917..0000000 Binary files a/src/assets/icons/favicon-192x192.png and /dev/null differ diff --git a/src/assets/icons/favicon-32x32.png b/src/assets/icons/favicon-32x32.png old mode 100644 new mode 100755 index 279f765..38cbe1c Binary files a/src/assets/icons/favicon-32x32.png and b/src/assets/icons/favicon-32x32.png differ diff --git a/src/assets/icons/favicon-96x96.png b/src/assets/icons/favicon-96x96.png deleted file mode 100644 index f06a16f..0000000 Binary files a/src/assets/icons/favicon-96x96.png and /dev/null differ diff --git a/src/assets/icons/favicon.ico b/src/assets/icons/favicon.ico old mode 100644 new mode 100755 index 499abb8..59fc71b Binary files a/src/assets/icons/favicon.ico and b/src/assets/icons/favicon.ico differ diff --git a/src/assets/icons/mstile-144x144.png b/src/assets/icons/mstile-144x144.png deleted file mode 100644 index c36226f..0000000 Binary files a/src/assets/icons/mstile-144x144.png and /dev/null differ diff --git a/src/assets/icons/mstile-150x150.png b/src/assets/icons/mstile-150x150.png deleted file mode 100644 index dfdb50e..0000000 Binary files a/src/assets/icons/mstile-150x150.png and /dev/null differ diff --git a/src/assets/icons/mstile-310x150.png b/src/assets/icons/mstile-310x150.png deleted file mode 100644 index c357230..0000000 Binary files a/src/assets/icons/mstile-310x150.png and /dev/null differ diff --git a/src/assets/icons/mstile-310x310.png b/src/assets/icons/mstile-310x310.png deleted file mode 100644 index 8e8e10c..0000000 Binary files a/src/assets/icons/mstile-310x310.png and /dev/null differ diff --git a/src/assets/icons/mstile-70x70.png b/src/assets/icons/mstile-70x70.png deleted file mode 100644 index c79a020..0000000 Binary files a/src/assets/icons/mstile-70x70.png and /dev/null differ diff --git a/src/assets/icons/site.webmanifest b/src/assets/icons/site.webmanifest new file mode 100755 index 0000000..45dc8a2 --- /dev/null +++ b/src/assets/icons/site.webmanifest @@ -0,0 +1 @@ +{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file diff --git a/src/assets/images/logo-new.svg b/src/assets/images/logo-new.svg new file mode 100644 index 0000000..6ab6d36 --- /dev/null +++ b/src/assets/images/logo-new.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/index.jade b/src/index.jade index 01fb71c..5346f36 100644 --- a/src/index.jade +++ b/src/index.jade @@ -8,9 +8,9 @@ block header_content source(src='videos/jumbo.mp4', type='video/mp4') .header__container .header__nav - a(href='/') etusivu + a(href='/') + img(src="images/logo-new.svg", alt="Etusivu") .header__headline - .header__logo h1.header__title Yhteisö kaikille ohjelmoinnista ja ohjelmistoalasta kiinnostuneille harrastajille ja ammattilaisille. block content diff --git a/src/styles/_header.styl b/src/styles/_header.styl index a0057d9..7ed6c4b 100644 --- a/src/styles/_header.styl +++ b/src/styles/_header.styl @@ -30,38 +30,27 @@ headerHeight = 400px left 90px top 40px + @media screen and (max-width: 810px) + left auto + right auto + width: 100% + a - color white - font-size 16px - font-weight bold - margin-left 16px - text-shadow 0 2px 0 rgba(0,0,0,0.1) - position relative + display: block; + max-width: 180px; + + @media screen and (max-width: 810px) + margin-left auto + margin-right auto + + img + width: 100%; .header__headline display table-cell padding 0 1em vertical-align middle -.header__logo - background url('../images/logo.png') - background-size contain - display inline-block - height 180px - margin-right 2em - vertical-align middle - width 180px - - @media screen and (max-width: 1030px) - height 120px - margin-right 1.5em - width 120px - - @media screen and (max-width: 810px) - height 80px - margin 0 0 1.5em - width 80px - .header__title color #fff display inline-block @@ -70,7 +59,7 @@ headerHeight = 400px line-height 1.1 margin auto max-width 780px - text-align left + text-align center text-shadow 0 2px 0 rgba(#000, 0.1) vertical-align middle diff --git a/src/templates/head.jade b/src/templates/head.jade index 21724ba..d284d06 100644 --- a/src/templates/head.jade +++ b/src/templates/head.jade @@ -15,24 +15,10 @@ html if(location.hostname === 'koodiklinikka.fi' && location.protocol !== 'https:') { location.protocol = 'https'; } - link(rel='apple-touch-icon', sizes='57x57', href='icons/apple-touch-icon-57x57.png') - link(rel='apple-touch-icon', sizes='114x114', href='icons/apple-touch-icon-114x114.png') - link(rel='apple-touch-icon', sizes='72x72', href='icons/apple-touch-icon-72x72.png') - link(rel='apple-touch-icon', sizes='144x144', href='icons/apple-touch-icon-144x144.png') - link(rel='apple-touch-icon', sizes='60x60', href='icons/apple-touch-icon-60x60.png') - link(rel='apple-touch-icon', sizes='120x120', href='icons/apple-touch-icon-120x120.png') - link(rel='apple-touch-icon', sizes='76x76', href='icons/apple-touch-icon-76x76.png') - link(rel='apple-touch-icon', sizes='152x152', href='icons/apple-touch-icon-152x152.png') - link(rel='apple-touch-icon', sizes='180x180', href='icons/apple-touch-icon-180x180.png') - link(rel='icon', type='image/png', href='icons/favicon-192x192.png', sizes='192x192') - link(rel='icon', type='image/png', href='icons/favicon-160x160.png', sizes='160x160') - link(rel='icon', type='image/png', href='icons/favicon-96x96.png', sizes='96x96') - link(rel='icon', type='image/png', href='icons/favicon-16x16.png', sizes='16x16') - link(rel='icon', type='image/png', href='icons/favicon-32x32.png', sizes='32x32') - link(rel='shortcut icon', href='icons/favicon.ico') - link(rel='icon', href='icons/favicon.ico') - meta(name='msapplication-TileColor', content='#10558c') - meta(name='msapplication-TileImage', content='icons/mstile-144x144.png') + link(rel='apple-touch-icon', sizes='180x180', href='icons/apple-touch-icon.png') + link(rel='icon', type='image/png', sizes='32x32', href='icons/favicon-32x32.png') + link(rel='icon', type='image/png', sizes='16x16', href='icons/favicon-16x16.png') + link(rel='manifest', href='icons/site.webmanifest') meta(property='og:image', content='images/logo.png') script(src='https://js.stripe.com/v3/') script(src='//use.typekit.net/scb5xny.js')