diff --git a/src/Foundation.hs b/src/Foundation.hs index cdd887b07..149004f7d 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -519,7 +519,6 @@ instance Yesod UniWorX where addStylesheet $ StaticR css_flatpickr_css addStylesheet $ StaticR css_tabber_css addStylesheet $ StaticR css_fonts_css - addStylesheet $ StaticR css_icons_css addStylesheet $ StaticR css_fontawesome_css $(widgetFile "default-layout") $(widgetFile "standalone/modal") @@ -827,19 +826,19 @@ defaultLinks = -- Define the menu items of the header. } , NavbarRight $ MenuItem { menuItemLabel = "Profile" - , menuItemIcon = Just "profile" + , menuItemIcon = Just "cogs" , menuItemRoute = ProfileR , menuItemAccessCallback' = isJust <$> maybeAuthPair } , NavbarSecondary $ MenuItem { menuItemLabel = "Login" - , menuItemIcon = Just "login" + , menuItemIcon = Just "sign-in-alt" , menuItemRoute = AuthR LoginR , menuItemAccessCallback' = isNothing <$> maybeAuthPair } , NavbarSecondary $ MenuItem { menuItemLabel = "Logout" - , menuItemIcon = Just "logout" + , menuItemIcon = Just "sign-out-alt" , menuItemRoute = AuthR LogoutR , menuItemAccessCallback' = isJust <$> maybeAuthPair } diff --git a/static/css/fonts.css b/static/css/fonts.css index 6f409ec57..ae0be87be 100644 --- a/static/css/fonts.css +++ b/static/css/fonts.css @@ -1,13 +1,3 @@ -@font-face { - font-family: 'Glyphicons Halflings'; - src: url('../fonts/glyphicons/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), - url('../fonts/glyphicons/glyphicons-halflings-regular.woff2') format('woff2'), - url('../fonts/glyphicons/glyphicons-halflings-regular.woff') format('woff'), - url('../fonts/glyphicons/glyphicons-halflings-regular.ttf') format('truetype'), - url('../fonts/glyphicons/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); -} - /*! * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) diff --git a/static/css/icons.css b/static/css/icons.css deleted file mode 100644 index b92b25f65..000000000 --- a/static/css/icons.css +++ /dev/null @@ -1,44 +0,0 @@ -.glyphicon { - position: relative; - display: inline-block; - width: 40px; - height: 40px; -} -.glyphicon::before { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - font-family: 'Glyphicons Halflings'; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.glyphicon--home::before { - content: '\e021'; -} -.glyphicon--book::before { - content: '\e043'; -} -.glyphicon--profile::before { - content: '\e019'; -} -.glyphicon--user::before { - content: '\e008'; -} -.glyphicon--group::before { - /* TODO: get updated glyphicons for group-icon */ - content: '\e284'; -} -.glyphicon--education::before { - content: '\e233'; -} -.glyphicon--login::before { - content: '\e161'; -} -.glyphicon--logout::before { - content: '\e163'; -} -.glyphicon--none::before { - content: ''; -} diff --git a/static/fonts/glyphicons/glyphicons-halflings-regular.eot b/static/fonts/glyphicons/glyphicons-halflings-regular.eot deleted file mode 100644 index 4a4ca865d..000000000 Binary files a/static/fonts/glyphicons/glyphicons-halflings-regular.eot and /dev/null differ diff --git a/static/fonts/glyphicons/glyphicons-halflings-regular.svg b/static/fonts/glyphicons/glyphicons-halflings-regular.svg deleted file mode 100644 index e3e2dc739..000000000 --- a/static/fonts/glyphicons/glyphicons-halflings-regular.svg +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/static/fonts/glyphicons/glyphicons-halflings-regular.ttf b/static/fonts/glyphicons/glyphicons-halflings-regular.ttf deleted file mode 100644 index 67fa00bf8..000000000 Binary files a/static/fonts/glyphicons/glyphicons-halflings-regular.ttf and /dev/null differ diff --git a/static/fonts/glyphicons/glyphicons-halflings-regular.woff b/static/fonts/glyphicons/glyphicons-halflings-regular.woff deleted file mode 100644 index 8c54182aa..000000000 Binary files a/static/fonts/glyphicons/glyphicons-halflings-regular.woff and /dev/null differ diff --git a/static/fonts/glyphicons/glyphicons-halflings-regular.woff2 b/static/fonts/glyphicons/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b54c..000000000 Binary files a/static/fonts/glyphicons/glyphicons-halflings-regular.woff2 and /dev/null differ diff --git a/templates/standalone/modal.lucius b/templates/standalone/modal.lucius index 5ae624450..2ccec226b 100644 --- a/templates/standalone/modal.lucius +++ b/templates/standalone/modal.lucius @@ -76,8 +76,8 @@ z-index: 20; &::before { - content: '\e014'; - font-family: 'Glyphicons Halflings'; + content: '\f00d'; + font-family: 'Font Awesome 5 Free'; color: white; } } diff --git a/templates/submission.hamlet b/templates/submission.hamlet index 0529e94aa..4927749ba 100644 --- a/templates/submission.hamlet +++ b/templates/submission.hamlet @@ -28,7 +28,8 @@ Abgabe herunterladen
$# -