From 5c361bdef9f24785b56621bc31393433833331c9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 1 Jun 2020 12:42:35 +0200 Subject: [PATCH] small fixes, remove tabs --- src/header.pug | 3 -- src/index.pug | 5 +- src/menu-left.pug | 2 +- src/page-about.pug | 24 +++++----- src/styles/base/about.scss | 93 +++++++++++++++++++------------------- 5 files changed, 61 insertions(+), 66 deletions(-) diff --git a/src/header.pug b/src/header.pug index baa32e2..6ed556d 100644 --- a/src/header.pug +++ b/src/header.pug @@ -27,9 +27,6 @@ details#user-controls.notLoggedIn if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) li sib-link(next='my-profile') Mon profil - //-li - sib-link(next='user-settings') Settings - sib-link(next='profile') Mon profil li sib-link(next='admin') Administration li diff --git a/src/index.pug b/src/index.pug index 911e51b..fd04427 100644 --- a/src/index.pug +++ b/src/index.pug @@ -17,7 +17,6 @@ html(lang="en") header#header(role='banner') include header.pug - main.notLoggedIn include menu-left.pug div#viewport @@ -52,7 +51,9 @@ html(lang="en") #admin(hidden).with-sidebar include page-admin.pug - include page-about.pug + + #about.no-sidebar.with-padding + include page-about.pug if (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.uploads || (endpoints.post && endpoints.post.uploads)) && (endpoints.users || (endpoints.post && endpoints.post.users)) #profile(hidden).no-sidebar diff --git a/src/menu-left.pug b/src/menu-left.pug index 4ccc378..d3b4edf 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -54,7 +54,6 @@ nav#main__menu.jsLeftMenu div.menu-label Tableau de bord div.menu-icon.icon-home div.divider - sib-route(name='about', hidden) if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) sib-route.menu(name='members') div.menu-label Annuaire des membres @@ -139,3 +138,4 @@ nav#main__menu.jsLeftMenu sib-route(name='admin', hidden) sib-route.menu(name='profile', hidden) + sib-route(name='about', hidden) diff --git a/src/page-about.pug b/src/page-about.pug index ab6f285..3ec5af0 100644 --- a/src/page-about.pug +++ b/src/page-about.pug @@ -1,16 +1,14 @@ -#about.no-sidebar.with-padding - .views-container - h2 A propos - div.flex-content-white - div - h3 Cette application est développé par Startin'blox - p Ici un paragraphe qui explique ce qu'est SIB +.views-container + h2 A propos + div.flex-content-white + div + h3 Cette application est développé par Startin'blox + p Ici un paragraphe qui explique ce qu'est SIB - a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr + a(href="https://startinblox.com/fr" target="_blank") https://startinblox.com/fr - div - h3 Contacte-nous - p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? + div + h3 Contacte-nous + p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ? - sib-link.main-cta - p Contact \ No newline at end of file + a(href="https://startinblox.com/fr" target="_blank").main-cta Contact \ No newline at end of file diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index 2b0c81b..8df00cb 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -1,51 +1,50 @@ #about{ - $main-color: rgb(236, 94, 92); - $second-color: white; - h2,h3{ - text-transform: uppercase; - } - .flex-content-white{ - display: flex; - @media only screen and (max-width: 768px) { - flex-direction: column; - } - >div{ - padding: 4.2em 4.7em; - text-align: center; - margin: 0 3em 3em 0; - background: white; - box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.11); - display: flex; - flex-direction: column; - justify-content: space-between; + $main-color: rgb(236, 94, 92); + $second-color: white; + h2,h3{ + text-transform: uppercase; + } + .flex-content-white{ + display: flex; + @media only screen and (max-width: 768px) { + flex-direction: column; + } + >div{ + padding: 4.2em 4.7em; + text-align: center; + margin: 0 3em 3em 0; + background: white; + box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.11); + display: flex; + flex-direction: column; + justify-content: space-between; + } + >div:first-child{ + width: 60%; + } + >div:last-child{ + width: 35%; + @media only screen and (max-width: 768px) { + width: 60%; + } + } + } - } - >div:first-child{ - width: 60%; - } - >div:last-child{ - width: 35%; - @media only screen and (max-width: 768px) { - width: 60%; - } - } - } + .main-cta{ + background: $second-color none repeat scroll 0% 0%; + border: 1px solid $main-color; + border-radius: 55px; + color: $main-color; + cursor: pointer; + font-weight: bold; + text-transform: uppercase; + width: 25%; + font-size: 1rem; + } - .main-cta{ - background: $second-color none repeat scroll 0% 0%; - border: 1px solid $main-color; - border-radius: 55px; - color: $main-color; - cursor: pointer; - font-weight: bold; - text-transform: uppercase; - width: 25%; - font-size: 1rem; - } - - .main-cta:hover{ - background: $main-color none repeat scroll 0% 0%; - border : 1px solid $second-color; - color: $second-color; - } + .main-cta:hover{ + background: $main-color none repeat scroll 0% 0%; + border : 1px solid $second-color; + color: $second-color; + } } \ No newline at end of file