diff --git a/assets/lmu/logo.svg b/assets/lmu/logo.svg new file mode 100644 index 000000000..6b72bb7b9 --- /dev/null +++ b/assets/lmu/logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/lmu/sigillum.svg b/assets/lmu/sigillum.svg new file mode 100644 index 000000000..78538233a --- /dev/null +++ b/assets/lmu/sigillum.svg @@ -0,0 +1,19 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/assets/logo-o2.svg b/assets/logo-o2.svg deleted file mode 100644 index 80620673b..000000000 --- a/assets/logo-o2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/logo.png b/assets/logo.png deleted file mode 100644 index 4ef03212e..000000000 Binary files a/assets/logo.png and /dev/null differ diff --git a/src/Foundation.hs b/src/Foundation.hs index 71999df4a..6f090115b 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -4,7 +4,7 @@ module Foundation where -import Import.NoFoundation +import Import.NoFoundation hiding (embedFile) import Database.Persist.Sql (ConnectionPool, runSqlPool) import Text.Hamlet (hamletFile) @@ -85,6 +85,8 @@ import Data.Bits (Bits(zeroBits)) import Network.Wai.Parse (lbsBackEnd) +import Data.FileEmbed (embedFile) + instance DisplayAble b => DisplayAble (E.CryptoID a b) where display = display . ciphertext @@ -1267,6 +1269,7 @@ siteLayout' headingOverride widget = do navbar = $(widgetFile "widgets/navbar/navbar") asidenav :: Widget asidenav = $(widgetFile "widgets/asidenav/asidenav") + where logo = preEscapedToMarkup $ decodeUtf8 $(embedFile "assets/lmu/logo.svg") footer :: Widget footer = $(widgetFile "widgets/footer/footer") alerts :: Widget diff --git a/static/css/utils/asidenav.scss b/static/css/utils/asidenav.scss index 101bf5506..8af1074e8 100644 --- a/static/css/utils/asidenav.scss +++ b/static/css/utils/asidenav.scss @@ -120,41 +120,32 @@ flex-basis: var(--asidenav-width-xl, 250px); font-size: 16px; align-items: center; - color: var(--color-primary); + color: var(--color-dark); transform-origin: left; &:hover { - color: var(--color-lightwhite); - - .asidenav__logo-link-item { - background-color: var(--color-primary); - } + color: var(--color-primary); } } -.asidenav__logo-link-item { - font-weight: bold; - display: flex; - align-items: flex-end; - height: calc(100% - 4px); - padding: 0 6px 4px; - border: 1px solid var(--color-primary); - letter-spacing: 2px; - background-color: var(--color-lightwhite); - transition: background-color .3s ease; -} - .asidenav__logo-lmu { - font-family: var(--font-logo); - font-size: 30px; + width: 80px; + height: 100%; } .asidenav__logo-uni2work { + display: flex; + align-items: flex-end; min-width: 70px; margin-left: 12px; - font-weight: normal; text-transform: uppercase; width: 100%; + height: 100%; + padding: 2px 4px; + border: 1px solid currentColor; + letter-spacing: 2px; + background-color: white; + transition: background-color .3s ease; } @media (max-width: 1199px) { @@ -173,6 +164,27 @@ } } +/* SEAL */ + +.asidenav__sigillum { + position: absolute; + bottom: -40px; + right: 25px; + opacity: 0.2; + + > img { + width: 350px; + } +} + +@media (max-width: 768px) { + .asidenav__sigillum { + right: auto; + left: 50%; + transform: translateX(-50%); + } +} + /* LIST-ITEM */ .asidenav__list-item { diff --git a/static/img/lmu/sigillum.svg b/static/img/lmu/sigillum.svg new file mode 120000 index 000000000..bf7553917 --- /dev/null +++ b/static/img/lmu/sigillum.svg @@ -0,0 +1 @@ +../../../assets/lmu/sigillum.svg \ No newline at end of file diff --git a/templates/widgets/asidenav/asidenav.hamlet b/templates/widgets/asidenav/asidenav.hamlet index 1640e0953..39b5e6ec3 100644 --- a/templates/widgets/asidenav/asidenav.hamlet +++ b/templates/widgets/asidenav/asidenav.hamlet @@ -2,8 +2,10 @@ $newline never