Skip to content
Snippets Groups Projects
Commit a772de30 authored by maxime_senza's avatar maxime_senza
Browse files

Merge remote-tracking branch 'origin' into feature/job-board

parents dfac59ed 2d640609
No related branches found
No related tags found
2 merge requests!171Feature/job board,!162Release/job board
......@@ -22,8 +22,8 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
//- script(type="module" src="/lib/sib-job-board/index.js" defer)
if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer)
//- script(type="module" src="/lib/sib-directory/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.4" defer)
//- script(type="module" src="/lib/sib-directory/dist/index.js" defer)
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer)
......
......@@ -29,6 +29,8 @@ details#user-controls.notLoggedIn
sib-link(next='profile') Mon profil
li
sib-link(next='admin') Administration
li
sib-link(next='about') A propos
button(role='log out' onclick="document.querySelector('sib-auth').logout();") Se déconnecter
button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login();") Se connecter
......
......@@ -53,6 +53,9 @@ html(lang="en")
#admin(hidden).with-sidebar
include page-admin.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
......@@ -65,4 +68,4 @@ html(lang="en")
type=`${provider.type}`
url=`${provider.url}`
id=`${provider.id}`
)
\ No newline at end of file
)
......@@ -138,3 +138,4 @@ nav#main__menu.jsLeftMenu
sib-route(name='admin', hidden)
sib-route.menu(name='profile', hidden)
sib-route(name='about', hidden)
.views-container
h2 A propos
div.flex-content-white
div
div
h3 Cette application est développée par Startin'blox
p Startin’blox est une coopérative qui développe des outils libres pour construire facilement et à moindre coût des applications fédérées et interopérables basées sur les derniers standards du web poussés par le projet SOLID.
p Sa mission est de redonner le pouvoir aux utilisateurs en leur permettant de reprendre la main sur leur outil numérique et de bénéficier d’un effet de réseau au sein d’un écosystème choisi afin de s’émanciper des grandes plateformes.
div
a(href="https://startinblox.com/fr/" target="_blank") https://startinblox.com/fr/
div
div
h3 Contacte-nous
p Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ?
div
a(href="https://startinblox.com/fr/#home-contact" target="_blank").main-cta Contact
\ No newline at end of file
#about{
$main-color: rgb(236, 94, 92);
$second-color: white;
h2,h3{
text-transform: uppercase;
}
h2{
margin-left: 1.5em;
}
.flex-content-white{
display: flex;
@media only screen and (max-width: 768px) {
flex-direction: column;
}
>div{
padding: 2em 2.5em;
text-align: center;
margin: 0 1.5em 3em 1.5em;
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%;
}
}
a{
text-decoration: none;
}
}
.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: 1.1rem;
align-self: center;
padding: 0.5rem 1.5rem;
}
.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
......@@ -8,6 +8,7 @@
@import 'abstracts/mixins';
@import 'components/icons/index';
@import 'base/main';
@import 'base/about';
div#viewport {
display: flex;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment