diff --git a/client.sample.etuc.scss b/client.sample.etuc.scss index 55c2e64..e0f5a61 100644 --- a/client.sample.etuc.scss +++ b/client.sample.etuc.scss @@ -47,7 +47,7 @@ --color-menu-icon-background-active: var(--color-secondary); /* Right menu */ - --color-right-menu-background: #e8e8ee; + --color-right-menu-background: #e8e8e8; --color-right-menu-text: #3c3F57; --color-right-menu-link-border: #BDC2D7; --color-right-menu-active-text: var(--color-white); @@ -135,18 +135,22 @@ #main__menu .menu { font-size: 2rem; } +#main__menu .unread { + font-weight: bold; +} #main__menu .menu[active=""] { color: var(--color-complementary); } #main__menu .sub-menu.menu-notification { font-family: Facit; } +#main__menu solid-router sib-route.menu, #main__menu sib-router sib-route.menu { + padding: 1.2rem 0; +} #viewport .content-box { font-family: Facit; } #viewport #circle .content-box__header solid-display div { - display: flex; - flex-direction: column; text-align: center; } #viewport #circle .content-box__header .h1-like { @@ -158,9 +162,19 @@ margin: 10px 0; } -#viewport #circle .content-box__header solid-display div .h1-aside:not(:empty)::before { - content: none; -} #viewport .with-sidebar nav > solid-router { color: #3C3F57; +} +#viewport .with-sidebar nav > solid-router > ul > sib-route[active] { + background-color: var(--color-right-menu-active-background); + color: var(--color-right-menu-active-text); + display: inline-block; +} +@media (min-width: 992px) { + .content-box__height { + min-height: calc(100vh - 83px - 98px); + } + #viewport .chat-view { + height: calc(100vh - 84px - 98px); + } } \ No newline at end of file diff --git a/src/images/appointment.svg b/src/images/appointment.svg new file mode 100644 index 0000000..07ddc58 --- /dev/null +++ b/src/images/appointment.svg @@ -0,0 +1,23 @@ + + + 003-appointment + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/images/file.svg b/src/images/file.svg new file mode 100644 index 0000000..324269e --- /dev/null +++ b/src/images/file.svg @@ -0,0 +1,17 @@ + + + 003-file + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/images/vote.svg b/src/images/vote.svg new file mode 100644 index 0000000..8546a10 --- /dev/null +++ b/src/images/vote.svg @@ -0,0 +1,22 @@ + + + vote + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/menu-left.pug b/src/menu-left.pug index 52ae2f5..ae72576 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -72,7 +72,7 @@ solid-router#navbar-router(default-route='dashboard') if endpoints.resources || (endpoints.get && endpoints.get.resources) sib-route.menu(name='resources') div.menu-label Ressources - div.menu-icon.icon-text-box-multiple-outline + div.menu-icon.icon-docs div.divider if endpoints.projects || (endpoints.get && endpoints.get.projects) div diff --git a/src/styles/components/icons/icons.scss b/src/styles/components/icons/icons.scss index f85028c..1f5b34f 100644 --- a/src/styles/components/icons/icons.scss +++ b/src/styles/components/icons/icons.scss @@ -176,7 +176,7 @@ $icons: ( control-pause: '\e072', control-forward: '\e073', control-end: '\e074', - calender: '\e075', + calendar: '\e075', bulb: '\e076', chart: '\e077', arrow-up-circle: '\e078', diff --git a/src/styles/layout/events/events.scss b/src/styles/layout/events/events.scss index e8acab8..cda1224 100644 --- a/src/styles/layout/events/events.scss +++ b/src/styles/layout/events/events.scss @@ -81,8 +81,8 @@ font-family: "RefrigeratorDelxW01Bold"; font-size: 3.2rem; line-height: 3.8rem; - color: #063B5C; } + color: #063B5C; solid-display div .event-type { width: max-content; padding: 5px 20px; @@ -107,4 +107,19 @@ margin-top: 65px; } } +} +.with-sidebar nav > solid-router > ul [name="circle-events"]{ + li::before { + content: ''; + height: 40px; + width: 40px; + mask: url('/images/appointment.svg') center no-repeat; + mask-size: contain; + -webkit-mask: url('/images/appointment.svg') center no-repeat; + -webkit-mask-size: contain; + background-color: var(--color-right-menu-text); + } + &[active] li::before { + background-color: var(--color-right-menu-active-text); + } } \ No newline at end of file diff --git a/src/styles/layout/resources/resources.scss b/src/styles/layout/resources/resources.scss index cf03c16..0f603ee 100644 --- a/src/styles/layout/resources/resources.scss +++ b/src/styles/layout/resources/resources.scss @@ -54,4 +54,19 @@ margin-top: 65px; } } +} +.with-sidebar nav > solid-router > ul [name="circle-resources"]{ + li::before { + content: ''; + height: 40px; + width: 40px; + mask: url('/images/file.svg') center no-repeat; + mask-size: contain; + -webkit-mask: url('/images/file.svg') center no-repeat; + -webkit-mask-size: contain; + background-color: var(--color-right-menu-text); + } + &[active] li::before { + background-color: var(--color-right-menu-active-text); + } } \ No newline at end of file