From 4c0357410f5cbcc5b5ea534021bdb8b90742c213 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 27 Aug 2021 16:59:35 +0200 Subject: [PATCH] chore(ui): change favicon and logo --- assets/favicon-0.png | Bin 1027 -> 0 bytes assets/favicon-16x16.png | Bin 1064 -> 0 bytes assets/favicon-32x32.png | Bin 1537 -> 0 bytes assets/favicon-5.png | Bin 557 -> 0 bytes assets/favicon-96x96.png | Bin 5111 -> 0 bytes assets/favicon.svg | 30 +---------------- assets/fraport_logo_2016_text.svg | 18 ++++++++++ assets/fraport_logo_notext.svg | 37 +++++++++++++++++++++ assets/fraport_logo_text.svg | 3 ++ assets/lmu/logo.svg | 6 ---- assets/lmu/sigillum.svg | 19 ----------- frontend/src/utils/asidenav/asidenav.sass | 2 +- src/Foundation/SiteLayout.hs | 2 +- src/Settings/StaticFiles.hs | 3 +- templates/widgets/asidenav/asidenav.hamlet | 8 ++--- webpack.config.js | 7 +--- 16 files changed, 65 insertions(+), 70 deletions(-) delete mode 100644 assets/favicon-0.png delete mode 100644 assets/favicon-16x16.png delete mode 100644 assets/favicon-32x32.png delete mode 100644 assets/favicon-5.png delete mode 100644 assets/favicon-96x96.png create mode 100644 assets/fraport_logo_2016_text.svg create mode 100755 assets/fraport_logo_notext.svg create mode 100644 assets/fraport_logo_text.svg delete mode 100644 assets/lmu/logo.svg delete mode 100644 assets/lmu/sigillum.svg diff --git a/assets/favicon-0.png b/assets/favicon-0.png deleted file mode 100644 index 68830769b8363c1ee3c0cfc7b9fc2e6b82ab5527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1027 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(kgt&J z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2IRQQ)u0Wb|vLokY zXU@qETvMF5raEy>a^jxo!~tYab`t1!;O=+e0&*uia8GjL0J0}Lb4_vts^OaA%r)78 z10)C*2dQ`D1dkB5x zzZWoQa7b_nxPSkAKth7T{qy%1Y*3ic-@l+>FY9NZYQ`jQcNb-?q#P>-2Bu0+7srr_ zTW{~44GMM?X}#zY@KZ2AS);3=@_&2Eztn@;HC8ScB$osI}XzP6T^L^MgqSpUKSHf^l zegSX!Kj%yL>(wqZRXaXn0VN<5P*LBYx8QTVYX8Z!6L}{vN`P^T=*1t6@O{Mi0R}i zhKKP+xhqWeKG?_|vv&f9f`SR=)-za+tT)}~4>Vo1#5JNMC9x#cD!C{XNHG{07+UHY z80i|Ch8S2_85mg^T4);>S{WF)gsG>aXvob^$xN$6XfO#eG_*1`urjoSXb94oBoA`G Mr>mdKI;Vst0OQ>(-2eap diff --git a/assets/favicon-16x16.png b/assets/favicon-16x16.png deleted file mode 100644 index 2dcbf454a2305d79bdc84ed8fa386cb877999b04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1064 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l=v3l z6XMFiFp+^_f`GtuKECOkoKv{CrZO>2Vq~1az|hacG*MrFX>#&zS=qV4!CU$HXD~BQ z($ZR#le0fNdw*No>5h&w%E}8|T-ME*bA^|88YAN*7M96@fm@uM);Tz=jf>l5YrC3< zXPUhHyonPpG&P-!irQggvszJcJ_AGFq)8VDt4`51d%Jdf{;nlaTudE}XdG(&!j`?8=###)$_HT{?AVmY_y*a&~(D%Lgmo zJ$ZA8V_Wm_(6eXn9(K5Uxtlpj(>_45eXV(WzrOM$+CT;}NPtWX$tcZDva)i?PcF?( z%`3683IHlCW-wg-f44rG8nB&KRvD?8=@}&qhL%SB3`MO#HR4F-K-Gk2rj%rWlw4k; z$N^L$iKN6gGdH!QvLKZK>?-|&ymb3bVSZ@l_=W&gF&LU!0E5xO$k3uBe$OkQ5`H9e zf-|d984R49rYy311C$Cwk_rv-WJt@*Ndj2sm5l8dO#g|K=&CHt?&fez~JfX=d#Wzp$P!B CAZP^u diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png deleted file mode 100644 index 8741c62bd311716569c2b0a951827615f9849693..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1537 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 gB>+JP2t)XQ5q!YpF diff --git a/assets/favicon.svg b/assets/favicon.svg index 3ac8d6f3f..fa5b2449a 100644 --- a/assets/favicon.svg +++ b/assets/favicon.svg @@ -1,29 +1 @@ - - - - - - image/svg+xml - - - - - - - - + \ No newline at end of file diff --git a/assets/fraport_logo_2016_text.svg b/assets/fraport_logo_2016_text.svg new file mode 100644 index 000000000..88b756641 --- /dev/null +++ b/assets/fraport_logo_2016_text.svg @@ -0,0 +1,18 @@ + + + + + + image/svg+xml + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/fraport_logo_notext.svg b/assets/fraport_logo_notext.svg new file mode 100755 index 000000000..1572ba45a --- /dev/null +++ b/assets/fraport_logo_notext.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + diff --git a/assets/fraport_logo_text.svg b/assets/fraport_logo_text.svg new file mode 100644 index 000000000..27a9b6d8d --- /dev/null +++ b/assets/fraport_logo_text.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/lmu/logo.svg b/assets/lmu/logo.svg deleted file mode 100644 index 6b72bb7b9..000000000 --- a/assets/lmu/logo.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/assets/lmu/sigillum.svg b/assets/lmu/sigillum.svg deleted file mode 100644 index 78538233a..000000000 --- a/assets/lmu/sigillum.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/frontend/src/utils/asidenav/asidenav.sass b/frontend/src/utils/asidenav/asidenav.sass index 5bca8b347..56f1647c7 100644 --- a/frontend/src/utils/asidenav/asidenav.sass +++ b/frontend/src/utils/asidenav/asidenav.sass @@ -134,7 +134,7 @@ .asidenav__logo-lmu width: 80px - height: 100% + height: 80% .asidenav__logo-uni2work display: flex diff --git a/src/Foundation/SiteLayout.hs b/src/Foundation/SiteLayout.hs index ebec84d65..278314986 100644 --- a/src/Foundation/SiteLayout.hs +++ b/src/Foundation/SiteLayout.hs @@ -457,7 +457,7 @@ siteLayout' overrideHeading widget = do asidenav :: WidgetFor UniWorX () asidenav = $(widgetFile "widgets/asidenav/asidenav") where - logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/lmu/logo.svg") + logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/fraport_logo_notext.svg") footer :: WidgetFor UniWorX () footer = $(widgetFile "widgets/footer/footer") where isNavFooter = has $ _1 . _NavFooter diff --git a/src/Settings/StaticFiles.hs b/src/Settings/StaticFiles.hs index a4138d193..475573948 100644 --- a/src/Settings/StaticFiles.hs +++ b/src/Settings/StaticFiles.hs @@ -3,8 +3,7 @@ -- prevents rebuilds if files change, that are not directly used (like -- webpack bundles) module Settings.StaticFiles - ( img_lmu_sigillum_svg - , webpackLinks_main + ( webpackLinks_main , embeddedStatic , module Yesod.EmbeddedStatic ) where diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet index 67f6d890e..e3a63c379 100644 --- a/templates/widgets/asidenav/asidenav.hamlet +++ b/templates/widgets/asidenav/asidenav.hamlet @@ -4,9 +4,7 @@ $newline never
#{logo} - - - _{MsgLogo} +
$if null favouriteTerms && is _Just muid @@ -49,6 +47,4 @@ $newline never $if anyFavToggle
_{MsgFavouritesToggleTip} - -
- + \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 7203cb659..6e71b96dc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -145,12 +145,7 @@ async function webpackConfig() { path.resolve(__dirname, 'well-known'), ] }), - new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), - new CopyPlugin({ - patterns: [ - { from: 'assets/lmu/sigillum.svg', to: path.resolve(__dirname, 'static', 'img/lmu/sigillum.svg') }, - ] - }), + new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/), new webpack.DefinePlugin({ VERSION: JSON.stringify(packageVersion) }),