diff --git a/assets/apple-icon-180x180.png b/assets/apple-icon-180x180.png new file mode 100644 index 000000000..7616ebd51 Binary files /dev/null and b/assets/apple-icon-180x180.png differ diff --git a/assets/favicon-0.png b/assets/favicon-0.png deleted file mode 100644 index 68830769b..000000000 Binary files a/assets/favicon-0.png and /dev/null differ diff --git a/assets/favicon-5.png b/assets/favicon-5.png deleted file mode 100644 index 5fb1fc327..000000000 Binary files a/assets/favicon-5.png and /dev/null differ diff --git a/assets/favicon.ico b/assets/favicon.ico new file mode 100644 index 000000000..8d3db0787 Binary files /dev/null and b/assets/favicon.ico differ 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/assets/manifest.webmanifest b/assets/manifest.webmanifest new file mode 100644 index 000000000..013d4a6a5 --- /dev/null +++ b/assets/manifest.webmanifest @@ -0,0 +1,41 @@ +{ + "name": "App", + "icons": [ + { + "src": "\/android-icon-36x36.png", + "sizes": "36x36", + "type": "image\/png", + "density": "0.75" + }, + { + "src": "\/android-icon-48x48.png", + "sizes": "48x48", + "type": "image\/png", + "density": "1.0" + }, + { + "src": "\/android-icon-72x72.png", + "sizes": "72x72", + "type": "image\/png", + "density": "1.5" + }, + { + "src": "\/android-icon-96x96.png", + "sizes": "96x96", + "type": "image\/png", + "density": "2.0" + }, + { + "src": "\/android-icon-144x144.png", + "sizes": "144x144", + "type": "image\/png", + "density": "3.0" + }, + { + "src": "\/android-icon-192x192.png", + "sizes": "192x192", + "type": "image\/png", + "density": "4.0" + } + ] +} \ No newline at end of file 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/Model/Types/Submission.hs b/src/Model/Types/Submission.hs index bb5399b82..3855ef5a9 100644 --- a/src/Model/Types/Submission.hs +++ b/src/Model/Types/Submission.hs @@ -149,7 +149,7 @@ data AuthorshipStatementSubmissionState deriving (Eq, Read, Show, Enum, Bounded, Generic, Typeable) deriving anyclass (Universe, Finite) -deriving stock instance Ord AuthorshipStatementSubmissionState +deriving stock instance Ord AuthorshipStatementSubmissionState -- Larger roughly encodes better; summaries are taken with max nullaryPathPiece ''AuthorshipStatementSubmissionState $ camelToPathPiece' 1 pathPieceCsv ''AuthorshipStatementSubmissionState 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) }),