fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lmu-cd' into 'master'

Browse Source 
LMU Corporate Design

Closes #75

See merge request !204
This commit is contained in:
Felix Hamann 2019-05-05 23:06:40 +02:00
commit 05f05f54a2
10 changed files with 92 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/lmu/logo.svg Normal file
View File

@ -0,0 +1,6 @@
<svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0" y="0" width="80" height="80" fill="white" stroke="currentColor" stroke-width="2" />
<path d="M6.28906 73.7111V46.4124H8.85405V71.6958H16.7322V73.7111H6.28906Z" fill="currentColor" />
<path d="M19.4804 73.7111V46.4124H28.0914L32.0305 67.8483H32.5801L36.6108 46.4124H45.3135V73.7111H40.0003V50.443H39.5422L34.8703 73.7111H29.5571L24.7936 50.443H24.2439V73.7111H19.4804Z" fill="currentColor" />
<path d="M48.7945 64.0008V46.4124H58.0468V65.0085C58.0468 66.9322 59.6452 67.872 61.3446 67.8483C63.0171 67.8249 64.5508 66.749 64.5508 65.0085V46.4124H73.8031V64.0008C73.8031 66.1078 73.6565 74.2412 61.3446 74.3523C49.0327 74.4635 48.7945 66.0161 48.7945 64.0008Z" fill="currentColor" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 804 B

19
assets/lmu/sigillum.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

4
assets/logo-o2.svg
View File

@ -1,4 +0,0 @@
<svg width="158" height="158" viewBox="0 0 158 158" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M31 16.2494C12.1534 30.6875 0 53.4245 0 79C0 122.63 35.3695 158 79 158C122.63 158 158 122.63 158 79C158 53.4245 145.847 30.6875 127 16.2494V39.7542C135.75 50.4433 141 64.1086 141 79C141 113.242 113.242 141 79 141C44.7583 141 17 113.242 17 79C17 64.1086 22.25 50.4433 31 39.7542V16.2494Z" fill="#0A9342"/>
<path d="M119.111 121H40.5371V107.597L79.4631 65.1392C85.0813 58.879 89.0675 53.6621 91.4218 49.4886C93.8296 45.2616 95.0335 41.0345 95.0335 36.8075C95.0335 31.2429 93.4551 26.7483 90.2982 23.3239C87.1948 19.8995 82.9945 18.1873 77.6974 18.1873C71.3836 18.1873 66.4878 20.1135 63.0099 23.966C59.5319 27.8184 57.793 33.0888 57.793 39.7771H38.2899C38.2899 32.6608 39.8951 26.2668 43.1055 20.5951C46.3693 14.8699 50.9977 10.4288 56.9904 7.27195C63.0366 4.11506 69.9925 2.53662 77.8579 2.53662C89.2013 2.53662 98.1369 5.39922 104.665 11.1244C111.246 16.7961 114.537 24.6616 114.537 34.7208C114.537 40.553 112.878 46.6795 109.561 53.1003C106.297 59.4675 100.919 66.7177 93.4283 74.8506L64.8558 105.43H119.111V121Z" fill="#0A9342"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.5 KiB

5
src/Foundation.hs
View File

@ -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

54
static/css/utils/asidenav.scss
View File

@ -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 {

1
static/img/lmu/sigillum.svg Symbolic link
View File

@ -0,0 +1 @@
../../../assets/lmu/sigillum.svg

9
templates/widgets/asidenav/asidenav.hamlet
View File

@ -2,8 +2,10 @@ $newline never
<aside .main__aside uw-asidenav>
<div .asidenav__logo>
<a href="/" .asidenav__logo-link>
<span .asidenav__logo-link-item.asidenav__logo-lmu>LMU
<span .asidenav__logo-link-item.asidenav__logo-uni2work>UNI2WORK
<div .asidenav__logo-lmu >
#{logo}
<span .asidenav__logo-uni2work>UNI2WORK
<div .asidenav>
$forall tid <- favouriteTerms
@ -24,3 +26,6 @@ $newline never
<li .asidenav__nested-list-item>
<a .asidenav__link-wrapper href=#{route}>_{menuItemLabel}
$of _
<div .asidenav__sigillum>
<img src=@{StaticR img_lmu_sigillum_svg}>

4
templates/widgets/navbar/item.hamlet
View File

@ -1,4 +1,6 @@
$newline never
<a .navbar__link-wrapper href=#{route} ##{menuIdent}>
<i .fas.fa-#{fromMaybe "none" menuItemIcon}>
$if isJust menuItemIcon
<div .navbar__link-icon>
<i .fas.fa-2x.fa-#{fromMaybe "none" menuItemIcon}>
<div .navbar__link-label>_{SomeMessage menuItemLabel}

37
templates/widgets/navbar/navbar.lucius
View File

@ -61,27 +61,38 @@
display: flex;
flex-direction: column;
justify-content: flex-end;
align-items: flex-start;
align-items: center;
height: 80px;
min-width: 90px;
color: var(--color-lightwhite);
transition: height .2s cubic-bezier(0.03, 0.43, 0.58, 1);
overflow: hidden;
&:hover {
color: var(--color-lightwhite);
.navbar__link-icon {
opacity: 1;
}
}
}
.navbar__link-icon {
opacity: 0.7;
transition: opacity 0.2s ease;
margin-bottom: 7px;
}
.navbar__link-label {
transition: opacity .2s ease;
padding: 4px 6px;
padding: 2px 4px;
text-transform: uppercase;
}
@media (min-width: 769px) {
.navbar__link-wrapper {
border: 1px solid var(--color-lmu-box-border);
border: 1px solid rgba(255, 255, 255, 0.7);
}
}
@ -97,6 +108,11 @@
.navbar__link-label {
padding: 0 7px;
}
.navbar__link-icon {
transform: scale(0.65);
margin-bottom: 0;
}
}
/* navbar list */
@ -133,21 +149,6 @@
&:not(.navbar__list-item--favorite) + .navbar__list-item {
margin-left: 12px;
}
.fas {
height: 20px;
margin-left: 8px;
}
}
@media (max-width: 768px) {
.navbar__list-item {
.fas {
margin-left: 0;
}
}
}
@media (max-width: 500px) {