From e4b44457b0a5734c39078d7bf7e938eef7a47483 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Fri, 20 Sep 2019 10:48:35 +0200
Subject: [PATCH 1/7] work dashboard mentor
---
src/includes/components/widgets.pug | 7 +-
src/includes/entrepreneur/resources/list.pug | 500 ++++++++++---------
src/includes/mentor/resources/detail.pug | 2 +-
src/scripts/coopstarter.js | 2 +-
src/styles/index.scss | 153 +++++-
5 files changed, 405 insertions(+), 259 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index b8de6880..e12cccc8 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -118,12 +118,15 @@ sib-widget(name='cs-section_introduction')
sib-widget(name='cs-account-picture')
template
figure.avatar
- img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Coopstarter")
+ img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Profile picture")
sib-widget(name='cs-profile-picture')
template
- img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Coopstarter")
+ img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Profile picture")
+sib-widget(name='cs-preview-picture')
+ template
+ img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Preview of the resource")
sib-widget(name="hidden-widget")
template
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 5cfc26f5..06f5572d 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -15,7 +15,7 @@ container.block_list.flex.flex_espace
div
h2.title_form Search for a resource
div#resources-loader
- hidden Loading resources, please wait...
+ hidden <i class="fas fa-cog fa-spin"></i>
sib-form#search-by-keyword(
data-src=`${endpoints.resources}`,
@@ -42,7 +42,7 @@ container.block_list.flex.flex_espace
naked
)
- sib-form#more_criterias(
+ sib-form#more_criterias.flex.flex_espace(
data-src=`${endpoints.resources}`,
fields='header_criterias, format, publication_year, country, language, fields'
label-header_criterias='More criterias'
@@ -98,256 +98,264 @@ container.block_list.flex.flex_espace
div.block_log.block_list
//Step 1
- sib-display#circles-list(
- loader-id="resources-loader"
- data-src=`${endpoints.steps}1/`,
- fields='name'
-
- label-name ='Step 1 '
- label-resources=''
-
- widget-name='cs-steps-header'
- )
-
- sib-display.resource_by_step(
- data-src=`${endpoints.steps}1/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
- search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
- search-range-fields=`${endpoints.fields}`
- search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
- search-widget-more_criterias_hidden="hidden-widget"
- search-multiple-type='sib-form-dropdown'
- search-widget-type='sib-form-auto-completion'
- search-multiple-format='sib-form-dropdown'
- search-widget-format='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
- search-multiple-fields='sib-form-dropdown'
- search-widget-fields='sib-form-auto-completion'
-
-
- widget-name='cs-display-property'
- widget-country='cs-display-property'
- widget-publication_year='cs-display-property'
- widget-description='cs-display-property'
- widget-fields='hidden-widget'
- widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
- label-language=''
- multiple-language
- label-fields=''
- multiple-fields
-
- paginate-by="5"
- )
+ div.step
+ sib-display#circles-list(
+ loader-id="resources-loader"
+ data-src=`${endpoints.steps}1/`,
+ fields='name'
+
+ label-name ='Step 1 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}1/resources/`,
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+
+ widget-name='cs-display-property'
+ widget-country='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="cs-display-property"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+
+ paginate-by="5"
+ )
//Step 2
- sib-display#circles-list(
- data-src=`${endpoints.steps}2/`,
- fields='name'
-
- label-name ='Step 2 '
- label-resources=''
-
- widget-name='cs-steps-header'
- )
-
- sib-display.resource_by_step(
- data-src=`${endpoints.steps}2/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
- search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
- search-range-fields=`${endpoints.fields}`
- search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
- search-widget-more_criterias_hidden="hidden-widget"
- search-multiple-type='sib-form-dropdown'
- search-widget-type='sib-form-auto-completion'
- search-multiple-format='sib-form-dropdown'
- search-widget-format='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
- search-multiple-fields='sib-form-dropdown'
- search-widget-fields='sib-form-auto-completion'
-
-
- widget-name='cs-display-property'
- widget-country='cs-display-property'
- widget-publication_year='cs-display-property'
- widget-description='cs-display-property'
- widget-fields='hidden-widget'
- widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
- label-language=''
- multiple-language
- label-fields=''
- multiple-fields
-
- paginate-by="5"
- )
+ div.step
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}2/`,
+ fields='name'
+
+ label-name ='Step 2 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}2/resources/`,
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+
+ widget-name='cs-display-property'
+ widget-country='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="cs-display-property"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+
+ paginate-by="5"
+ )
//Step 3
- sib-display#circles-list(
- data-src=`${endpoints.steps}3/`,
- fields='name'
- label-name ='Step 3 '
- label-resources=''
- widget-name='cs-steps-header'
- )
-
- sib-display.resource_by_step(
- data-src=`${endpoints.steps}3/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
- search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
- search-range-fields=`${endpoints.fields}`
- search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
- search-widget-more_criterias_hidden="hidden-widget"
- search-multiple-type='sib-form-dropdown'
- search-widget-type='sib-form-auto-completion'
- search-multiple-format='sib-form-dropdown'
- search-widget-format='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
- search-multiple-fields='sib-form-dropdown'
- search-widget-fields='sib-form-auto-completion'
-
- widget-name='cs-display-property'
- widget-country='cs-display-property'
- widget-publication_year='cs-display-property'
- widget-description='cs-display-property'
- widget-fields='hidden-widget'
- widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
- label-language=''
- multiple-language
- label-fields=''
- multiple-fields
-
- paginate-by="5"
- )
+ div.step
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}3/`,
+ fields='name'
+
+ label-name ='Step 3 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}3/resources/`,
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+ widget-name='cs-display-property'
+ widget-country='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="cs-display-property"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+
+ paginate-by="5"
+ )
//Step 4
- sib-display#circles-list(
- data-src=`${endpoints.steps}4/`,
- fields='name'
-
- label-name ='Step 4 '
- label-resources=''
-
- widget-name='cs-steps-header'
-
- )
-
- sib-display.resource_by_step(
- data-src=`${endpoints.steps}4/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
- search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
- search-range-fields=`${endpoints.fields}`
- search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
- search-widget-more_criterias_hidden="hidden-widget"
- search-multiple-type='sib-form-dropdown'
- search-widget-type='sib-form-auto-completion'
- search-multiple-format='sib-form-dropdown'
- search-widget-format='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
- search-multiple-fields='sib-form-dropdown'
- search-widget-fields='sib-form-auto-completion'
-
-
- widget-name='cs-display-property'
- widget-country='cs-display-property'
- widget-publication_year='cs-display-property'
- widget-description='cs-display-property'
- widget-fields='hidden-widget'
- widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
- label-language=''
- multiple-language
- label-fields=''
- multiple-fields
-
- paginate-by="5"
- )
+ div.step
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}4/`,
+ fields='name'
+
+ label-name ='Step 4 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}4/resources/`,
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+
+ widget-name='cs-display-property'
+ widget-country='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="cs-display-property"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+
+ paginate-by="5"
+ )
//Step 5
- sib-display#circles-list(
- data-src=`${endpoints.steps}5/`,
- fields='name'
-
- label-name ='Step 5 '
- label-resources=''
-
- widget-name='cs-steps-header'
- )
+ div.step
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}5/`,
+ fields='name'
+
+ label-name ='Step 5 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}5/resources/`,
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
+ search-range-format=`${endpoints.formats}`
+ search-range-language=`${endpoints.languages}`
+ search-range-fields=`${endpoints.fields}`
+ search-range-type=`${endpoints.types}`
+
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-more_criterias_hidden="hidden-widget"
+ search-multiple-type='sib-form-dropdown'
+ search-widget-type='sib-form-auto-completion'
+ search-multiple-format='sib-form-dropdown'
+ search-widget-format='sib-form-auto-completion'
+ search-multiple-language='sib-form-dropdown'
+ search-widget-language='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
+
+
+ widget-name='cs-display-property'
+ widget-country='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-fields='hidden-widget'
+ widget-language="hidden-widget"
+ widget-author="cs-display-property"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+ label-language=''
+ multiple-language
+ label-fields=''
+ multiple-fields
+
+ paginate-by="5"
+ )
- sib-display.resource_by_step(
- data-src=`${endpoints.steps}5/resources/`,
- fields='name, author, format, publication_year, description, country, language, fields',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)',
- search-range-format=`${endpoints.formats}`
- search-range-language=`${endpoints.languages}`
- search-range-fields=`${endpoints.fields}`
- search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
- search-widget-more_criterias_hidden="hidden-widget"
- search-multiple-type='sib-form-dropdown'
- search-widget-type='sib-form-auto-completion'
- search-multiple-format='sib-form-dropdown'
- search-widget-format='sib-form-auto-completion'
- search-multiple-language='sib-form-dropdown'
- search-widget-language='sib-form-auto-completion'
- search-multiple-fields='sib-form-dropdown'
- search-widget-fields='sib-form-auto-completion'
-
-
- widget-name='cs-display-property'
- widget-country='cs-display-property'
- widget-publication_year='cs-display-property'
- widget-description='cs-display-property'
- widget-fields='hidden-widget'
- widget-language="hidden-widget"
- widget-author="cs-display-property"
- widget-format='cs-display-multiple-property'
- label-format=''
- multiple-format
- label-language=''
- multiple-language
- label-fields=''
- multiple-fields
-
- paginate-by="5"
- )
-
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 4dd59199..08f39417 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -35,7 +35,7 @@ include ../../components/widgets
widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
- widget-preview_image='cs-profile-picture'
+ widget-preview_image='cs-preview-picture'
widget-review.reviewer.account.picture='cs-account-picture'
widget-review.reviewer.name='cs-resource-reviewer'
class-review.reviewer.name="validator_ressource"
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 910ba261..7e419a94 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -129,7 +129,7 @@ function selectHiddenManagementForType(tab, form) {
jQuery(document).ready(function($) {
//Refresh pagination
refreshPagination();
-
+ console.log('toto');
// Get the element with id="defaultOpen" and click on it
document.getElementById("defaultOpen").click();
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 4681eb3a..68d777e0 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -346,7 +346,7 @@ p{
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXX ICONES XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
-.ico_gauche, #mentor-resource-detail a{
+.ico_gauche, #mentor-resource-detail a, #entrepreneur-resource-list cs-display-property[name="name"] p{
padding-left: 3.5rem;
position: relative;
}
@@ -355,7 +355,7 @@ p{
position: relative;
}
-.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before{
+.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before,#entrepreneur-resource-list cs-display-property[name="name"] p:before{
font-family: "Font Awesome 5 pro";
font-weight: 900;
position : absolute;
@@ -385,6 +385,13 @@ ico_droite:before{
.ico_arrow:before{
content: "\f061";
}
+#entrepreneur-resource-list cs-display-property[name="name"] p:before{
+ content:"\f005";
+ left: 0.4rem;
+ top: 0.2rem;
+ font-size: 1.1rem;
+ color: #5DC6F2;
+}
/*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx FIN ICONE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
@@ -546,12 +553,19 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
color: #818998;
font-weight: lighter;
}
-.ss-list.checkbox .ss-option, .ss-list.checkbox input{
+.ss-list.checkbox .ss-option, .ss-list.checkbox label{
position: relative;
font-weight: lighter;
}
-.ss-list.checkbox .ss-option:before, , .ss-list.checkbox input:before {
+.ss-list.checkbox label{
+ font-family: "var(--typo-btn)";
+ font-size: 1.5rem;
+ top: 2rem;
+ left: .5rem;
+
+}
+.ss-list.checkbox .ss-option:before, .ss-list.checkbox label:before {
content: "";
position : absolute;
display: block;
@@ -561,8 +575,9 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
border-radius: 3px;
left: -2.5rem;
top: .9rem;
+ cursor: pointer;
}
-.ss-list.checkbox .ss-option.active:after, , .ss-list.checkbox input:after {
+.ss-list.checkbox .ss-option.active:after, .ss-list.checkbox label:focus:after {
font-family: "Font Awesome 5 pro";
font-weight: 900;
content: "\f00C";
@@ -573,6 +588,19 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
left: -1.95rem;
top: .9rem;
}
+.ss-list.checkbox label:before{
+ left: -3rem;
+ top: 0;
+}
+.ss-list.checkbox label:focus:after{
+ left: -2.6rem;
+ top: 0;
+}
+.ss-list.checkbox label:not(:focus):after
+.ss-list.checkbox label+input[type="checkbox"]{
+ position: absolute;
+ left: -10000rem;
+}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -725,13 +753,88 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
padding-top: 3.5rem;
input[name="keyword"]{
float: left;
- width: 80%;
+ width: 76%;
}
- #keyword_submit{
+ #keyword_submit div{
float: right;
margin-top: 0;
width: 20%;
+ top: -1rem;
}
+ cs-section_header[name="header_criterias"] h2.title_form{
+ font-family: 'var(--typo-btn)';
+ font-size: 1.4rem;
+ color: var(--clr-typo-base);
+ border-bottom: 1px solid #DBE2ED;
+ margin: 5rem 0 2rem 0;
+ padding-bottom: .5rem;
+ }
+ .tablink{
+ width: 50%;
+ }
+ .tablink+.block_log{
+ background: none;
+ padding: var(--marge-base) 0;
+ }
+ .step{
+ background: white;
+ -webkit-box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.13);
+ -moz-box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.13);
+ box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.13);
+ padding: 2rem;
+ margin-bottom: 1.5rem;
+ cs-display-property[name="publication_year"] p{
+ font-size: 1.4rem;
+ font-weight: bold;
+ margin-bottom: 1rem;
+ }
+ cs-display-property p{
+ margin-bottom: 0;
+ }
+ cs-display-multiple-property[name="format"] p{
+ border-radius: 5px;
+ background-color: #5DC6F2;
+ padding: .5rem;
+ font-family: 'var(--typo-btn)';
+ color: var(--bg-block);
+ text-decoration: none;
+ text-align: center;
+ font-size: 1.4rem;
+ border:2px solid #5DC6F2;
+ cursor: pointer;
+ display: inline-block;
+ margin: .5rem;
+ transition: .4s all ease-in;
+ }
+ cs-display-multiple-property[name="format"] p:hover{
+ background-color: var(--bg-block);
+ color: #5DC6F2;
+ }
+ div sib-display div{
+ padding: 1.5rem;
+ }
+ div sib-display:nth-child(odd) div{
+ background: #F7F9FE;
+ }
+ div sib-display:nth-child(even) div{
+ background: white;
+ }
+ cs-steps-header p{
+ margin-bottom: 1.5rem;
+ b{
+ text-transform: uppercase;
+ }
+ }
+
+ }
+}
+#entrepreneur-resource-list cs-display-property[name="name"] p{
+ font-size: 1.6rem;
+ color: var(--clr-roll-black);
+ padding-left: 2.5rem;
+}
+#more_criterias.flex.flex_espace{
+ width: 100%;
}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -835,7 +938,25 @@ div .tit_element_list{
color: var(--clr-roll-black);
font-size: 1.6rem;
}
-
+#resources-history {
+ sib-set-default{
+ margin-bottom: 4rem;
+ }
+ hidden-widget{
+ display: none;
+ }
+ cs-section_header[name="header_criterias"] h2.title_form{
+ font-family: 'var(--typo-btn)';
+ font-size: 1.4rem;
+ color: var(--clr-typo-base);
+ border-bottom: 1px solid #DBE2ED;
+ margin: 5rem 0 2rem 0;
+ padding-bottom: .5rem;
+}
+}
+sib-display#pending-resources div{
+ clear: both;
+}
.contenu_list{
height: 0;
}
@@ -890,7 +1011,9 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{
display:flex;
justify-content: space-between;
}
-
+#reviews .backlink{
+ margin: 0;
+}
#pending-resources {
sib-set-default[name="content"] sib-display-value{
font-size: 1.6rem;
@@ -928,6 +1051,18 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{
position: relative;
top: 35%;
}
+#requests sib-multiple{
+ margin-right: 7rem;
+ label, cs-display-multiple-property[name="fields"] p{
+ color: var(--clr-typo-base);
+ font-size: 1.4rem;
+ margin: 0 1rem 0 0;
+ font-family: 'var(--typo-btn)';
+ }
+ cs-display-multiple-property[name="fields"]{
+ float: left;
+ }
+}
/*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
cs-display-step-property[label="Step"] p{
--
GitLab
From 9586c213e7573c5834f1dce14c56f8209d899d62 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 24 Sep 2019 15:04:20 +0200
Subject: [PATCH 2/7] c la taff du jour de fred
---
src/includes/components/widgets.pug | 2 +-
src/includes/entrepreneur/resources/list.pug | 4 +-
.../resources/confirmation-deletion.pug | 5 +-
src/includes/mentor/resources/detail.pug | 1 +
src/includes/mentor/resources/list.pug | 9 +-
src/includes/mentor/validation-process.pug | 40 ++--
src/styles/index.scss | 171 ++++++++++++++++--
7 files changed, 188 insertions(+), 44 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 7a6dc601..ea4e2161 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -142,7 +142,7 @@ sib-widget(name="fake-like")
sib-widget(name="fake-dislike")
template
- p 18 <i class="fas fa-thumbs-up"></i>
+ p 18 <i class="fas fa-thumbs-down"></i>
sib-widget(name="accordion-request-resource" )
template
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 79760e2b..60711e4f 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -15,8 +15,8 @@ container.block_list.flex.flex_espace
div
h2.title_form Search for a resource
div#resources-loader
- hidden <i class="fas fa-cog fa-spin"></i>
-
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-loader"
diff --git a/src/includes/mentor/resources/confirmation-deletion.pug b/src/includes/mentor/resources/confirmation-deletion.pug
index d6013dce..4a34b19c 100644
--- a/src/includes/mentor/resources/confirmation-deletion.pug
+++ b/src/includes/mentor/resources/confirmation-deletion.pug
@@ -1,8 +1,9 @@
div
div
- sib-link(class="backlink pull-right", next="mentor-resource-list") X
+ sib-link(class="backlink pull-right", next="mentor-resource-list")
+ i.fas.fa-times
div
- h1 Delete a resource
+ h1.title_form Delete a resource
p Are you sure you want to delete this resource ?
sib-delete(data-label="Yes I am sure, delete " bind-resources)
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 8eb75dd7..73ecde03 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -26,6 +26,7 @@ include ../../components/widgets
class-submitter.name="autor_ressource"
class-broken="broken"
widget-format='cs-display-multiple-property'
+ class-format='format_type'
widget-uri='cs-display-link'
class-uri="pull-left"
widget-skills='cs-display-resource-property'
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index a6a0962d..0353d06d 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -33,7 +33,8 @@ div.block_list
div#reviews.tabcontent
div#loader-review-mentor
- hidden Loading, please wait...
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-link(class="backlink pull-right", next="resource-validation-process") What is a validation process ?
sib-display#pending-resources(
loader-id="loader-review-mentor"
@@ -55,7 +56,8 @@ div.block_list
div(id='requests', class="tabcontent")
div#loader-requests-mentor
- hidden Loading, please wait...
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display.request_accordeon(
loader-id="loader-requests-mentor"
data-src=`${endpoints.requests}`
@@ -79,7 +81,8 @@ div.block_list
div(id='history', class="tabcontent")
div#loader-history-mentor
- hidden Loading, please wait...
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#resources-history(
loader-id="loader-history-mentor"
bind-user
diff --git a/src/includes/mentor/validation-process.pug b/src/includes/mentor/validation-process.pug
index 174fc17a..a64debf4 100644
--- a/src/includes/mentor/validation-process.pug
+++ b/src/includes/mentor/validation-process.pug
@@ -1,33 +1,31 @@
div.block_log.block_creat_count.no_shadow
- sib-link(class="backlink pull-right", next="mentor-resource-list") X
+ sib-link(class="backlink pull-right", next="mentor-resource-list")
+ i.fas.fa-times
div#validation-process
h2 What is a validation process ?
- div
- figure
- img( src="http://placekitten.com/g/150/150"
+ div.flex.w_100
+ figure.w_50
+ img( src="../images/valid_1.png"
alt="")
- figcaption Mentor upload a resource to the database
+ figcaption.w_75 Mentor upload a resource to the database
- figure(
- img src="http://placekitten.com/1/300"
- alt=""
- )
- figcaption Resource is sent to qualified peers for validation
+ figure.w_50
+ img( src="../images/valid_2.png"
+ alt="")
+ figcaption.w_75 Resource is sent to qualified peers for validation
-
- div
- figure
- img( src="http://placekitten.com/g/150/150"
+ figure.w_33
+ img( src="../images/valid_3.png"
alt="")
- figcaption Resource is validated and becomes available in the database
+ figcaption.w_75 Resource is validated and becomes available in the database
- figure
- img( src="http://placekitten.com/g/150/150"
+ figure.w_33
+ img( src="../images/valid_4.png"
alt="")
- figcaption Resource is not validated and improvement is siggested. You get a list of improvement, can edit ans re-load the resource. It goes to validation process again.L0
+ figcaption.w_75 Resource is not validated and improvement is siggested. You get a list of improvement, can edit ans re-load the resource. It goes to validation process again.L0
- figure
- img( src="http://placekitten.com/g/150/150"
+ figure.w_33
+ img( src="../images/valid_5.png"
alt="")
- figcaption Resource is reported inapropriate. You get a notification with a message from your peer explaning why.
+ figcaption.w_75 Resource is reported inapropriate. You get a notification with a message from your peer explaning why.
\ No newline at end of file
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 9612022a..5ffac29f 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -246,7 +246,7 @@ body{
color: var(--bg-btn-base);
}
-.button_dark{
+.button_dark, #confirm_suppress button{
transition: all .3s ease-in-out;
background-color: #444C4D;
color: var(--bg-block);
@@ -260,7 +260,7 @@ body{
width: auto;
cursor: pointer;
}
-.button_dark:hover{
+.button_dark:hover, , #confirm_suppress button:hover{
background-color: var(--bg-block);
color: #444C4D;
}
@@ -350,12 +350,12 @@ p{
padding-left: 3.5rem;
position: relative;
}
-.ico_droite{
- padding-left: 3.5rem;
+.ico_droite, #confirm_suppress button{
+ padding-right: 3.5rem;
position: relative;
}
-.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before,#entrepreneur-resource-list cs-display-property[name="name"] p:before{
+.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before,#entrepreneur-resource-list cs-display-property[name="name"] p:before,#confirm_suppress button:before{
font-family: "Font Awesome 5 pro";
font-weight: 900;
position : absolute;
@@ -392,7 +392,13 @@ ico_droite:before{
font-size: 1.1rem;
color: #5DC6F2;
}
-
+#confirm_suppress button:before{
+ content:"\f061";
+ right: 1.1rem;
+ top: 1.4rem;
+ left: auto;
+
+}
/*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx FIN ICONE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
/* XXXXXXXXXXXXXXXXXXXXXXXX formulaires XXXXXXXXXXXXXXXXXXXXXX */
@@ -552,6 +558,10 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
padding-left: 2.5rem;
color: #818998;
font-weight: lighter;
+ input[type="checkbox"]{
+ position: absolute;
+ left: -1000rem;
+ }
}
.ss-list.checkbox .ss-option, .ss-list.checkbox label{
position: relative;
@@ -589,8 +599,8 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
top: .9rem;
}
.ss-list.checkbox label:before{
- left: -3rem;
- top: 0;
+ left: -2.2rem;
+ top: 0.2rem;
}
.ss-list.checkbox label:focus:after{
left: -2.6rem;
@@ -694,7 +704,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
#header .flex .dropdownPanel {
position: absolute;
- min-width: 150px;
+ min-width: 20rem;
background-color: #444C4D;
right: 59%;
top: 5px;
@@ -709,15 +719,17 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
a {
margin: 0;
}
- sib-link, a{
+ sib-link, p,a {
display: block;
padding: 10px 20px;
text-decoration: none;
color: white;
transition: .5s all ease-in;
cursor: pointer;
+ text-align: center;
p {
margin: 0;
+ padding: 0;
}
}
sib-link:hover, a:hover{
@@ -836,6 +848,9 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.13);
padding: 2rem;
margin-bottom: 1.5rem;
+ cs-steps-header div{
+ cursor: pointer;
+ }
cs-display-property[name="publication_year"] p{
font-size: 1.4rem;
font-weight: bold;
@@ -844,6 +859,15 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
cs-display-property p{
margin-bottom: 0;
}
+ cs-display-property[name="name"] p{
+ float: left;
+ }
+ sib-multiple[name="format"]{
+ float: right;
+ }
+ cs-display-property[name="publication_year"] p{
+ clear: both;
+ }
cs-display-multiple-property[name="format"] p{
border-radius: 5px;
background-color: #5DC6F2;
@@ -881,6 +905,26 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
}
}
+#entrepreneur-resource-list .step div div{
+ position: relative;
+ fake-like, fake-dislike{
+ position: absolute;
+ top: 2.7rem;
+ right: 20%;
+ cursor: pointer;
+ p{
+ color: #444C4D;
+ font-size: 1.5rem;
+ transition: .3s all ease-in;
+ }
+ p:hover{
+ color: #5DC6F2;
+ }
+ }
+ fake-dislike{
+ right: 15%;
+ }
+}
#entrepreneur-resource-list cs-display-property[name="name"] p,
#public-resource-list cs-display-property[name="name"] p,
#mentor-database cs-display-property[name="name"] p{
@@ -895,7 +939,10 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX LISTE RESSOURCE XXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
-
+.fas.fa-spinner.fa-spin{
+ font-size: 3rem;
+ color: var(--bg-btn-base);
+}
.fd_bleu{
width: 100%;
background: var(--bg-btn-base);
@@ -909,6 +956,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
.tabs {
margin-top: 20px;
overflow: hidden;
+ width: 100%;
}
.tablink {
@@ -1151,7 +1199,26 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{
}
}
/*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
-
+.format_type p{
+ border-radius: 5px;
+ background-color: #5DC6F2;
+ padding: .5rem;
+ font-family: 'var(--typo-btn)';
+ color: var(--bg-block);
+ text-decoration: none;
+ text-align: center;
+ font-size: 1.4rem;
+ border:2px solid #5DC6F2;
+ cursor: pointer;
+ display: inline-block;
+ margin: .5rem;
+ transition: .4s all ease-in;
+ float: right;
+ &:hover{
+ background-color: var(--bg-block);
+ color: #5DC6F2;
+ }
+}
cs-display-step-property[label="Step"] p{
font-weight: bold;
border-bottom: #5DC6F2 solid 3px;
@@ -1172,21 +1239,92 @@ sib-set-default[name="submitter_info"]{
cs-display-resource-property:first-child b{
display: block;
}
+ cs-display-resource-property[name="skills"] p{
+ margin-bottom: 2rem;
+ }
p{
font-size: 1.4rem;
margin-bottom: 1rem;
}
}
-
+/* XXXXXXXXXXXXXXXXXXXXXXXXX Modal XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+#confirm_suppress, #resource-validation-process{
+ border: none;
+ top: 0;
+ padding: 0;
+ width: 100%;
+ height: auto;
+ padding-bottom: 70%;
+ background: rgba(0,0,0,0.7);
+ &>div{
+ margin: 25% auto 25% auto;
+ width: 50rem;
+ background: white;
+ padding: 2rem;
+ text-align: center;
+ position: relative;
+ .fas.fa-times:before{
+ top: 2rem;
+
+ }
+}
+ h1{
+ font-family: var(--typo);
+ font-size: 2.2rem;
+ margin: 0 0 2rem 0;
+ font-weight: normal;
+ padding-top: 2rem;
+ color: #444C4D;
+ border-bottom: 1px solid #DBE2ED;
+ }
+ p{
+ text-align: center;
+ }
+}
+#resource-validation-process{
+ padding-bottom: 30%;
+ &> div{
+ width: 75%;
+ margin: 0 auto 25% auto;
+ }
+ h2{
+ width: 100%;
+ text-align: center;
+ font-family: "var(--typo)";
+ font-size: 2rem;
+ margin-top: 5rem;
+ color: var(--clr-roll-black);
+ }
+ div{
+ background: url("../images/valid_fd.png") no-repeat center 43% white;
+ figure{
+ margin: 5rem 0;
+ figcaption{
+ font-family: "var(--typo-btn)";
+ margin: 2rem auto 0 auto;
+ color: var(--clr-typo-base);
+ font-size: 1.6rem;
+ }
+ }
+ }
+}
#mentor-resource-detail{
border: none;
top: 0;
padding: 0;
width: 100%;
height: auto;
+ padding-bottom: 30%;
background: rgba(0,0,0,0.7);
.block_creat_count{
margin: 0 0 0 auto;
+ img[name="preview_image"]{
+ margin-top: 3rem;
+ }
+
+ }
+ h2.title_form{
+ margin-top: 3rem;
}
.title_form{
font-size: 1.6rem;
@@ -1194,14 +1332,16 @@ sib-set-default[name="submitter_info"]{
font-family: 'var(--typo-btn)';
text-align: left;
border: none;
- font-weight: bold;
+ font-weight: normal;
margin: 0 0 1.5rem 0;
padding: 0;
p {
font-size: 2.2rem;
margin: 0 0 2rem 0;
font-weight: normal;
+ padding-top: 0;
}
+
}
cs-display-multiple-property[name="format"] p{
text-align: right;
@@ -1213,7 +1353,7 @@ sib-set-default[name="submitter_info"]{
.steps{
cs-display-step-property p{
color: #3D424A;
- font-size: 2.2rem;
+ font-size: 1.6rem;
}
}
.like{
@@ -1230,6 +1370,7 @@ sib-set-default[name="submitter_info"]{
p{
color: var(--clr-typo-base);
font-size: 1.4rem;
+ margin-bottom: 2.5rem;
}
b{
display: block;
--
GitLab
From 9834df9e3aad45d94e042d95a8ee7d62c5d08c17 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 24 Sep 2019 15:07:00 +0200
Subject: [PATCH 3/7] c la taff du jour de fred
---
src/images/valid_1.png | Bin 0 -> 2512 bytes
src/images/valid_2.png | Bin 0 -> 2663 bytes
src/images/valid_3.png | Bin 0 -> 2484 bytes
src/images/valid_4.png | Bin 0 -> 2109 bytes
src/images/valid_5.png | Bin 0 -> 2324 bytes
src/images/valid_fd.png | Bin 0 -> 2835 bytes
6 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 src/images/valid_1.png
create mode 100644 src/images/valid_2.png
create mode 100644 src/images/valid_3.png
create mode 100644 src/images/valid_4.png
create mode 100644 src/images/valid_5.png
create mode 100644 src/images/valid_fd.png
diff --git a/src/images/valid_1.png b/src/images/valid_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb575cf4cd053712f926078d259352fac175875f
GIT binary patch
literal 2512
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
ZP-{3S&R&~ezW9%2k8`rQzxPzkzX2g<l6C+9
literal 0
HcmV?d00001
diff --git a/src/images/valid_2.png b/src/images/valid_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c88101d63b597cf8cb8943b2317777d02e45120
GIT binary patch
literal 2663
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
U9I%qCxAg1hWao;zZR>a9FV^MKIRF3v
literal 0
HcmV?d00001
diff --git a/src/images/valid_3.png b/src/images/valid_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0637254cca41c3435fd8f06541e301ea8880a55
GIT binary patch
literal 2484
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
AbpQYW
literal 0
HcmV?d00001
diff --git a/src/images/valid_4.png b/src/images/valid_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d6eac83d231cf24399818e0a03e51af1e2aadf
GIT binary patch
literal 2109
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
literal 0
HcmV?d00001
diff --git a/src/images/valid_5.png b/src/images/valid_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..26060ae9a7c235d59504940c088241d664b2017b
GIT binary patch
literal 2324
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
literal 0
HcmV?d00001
diff --git a/src/images/valid_fd.png b/src/images/valid_fd.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a5b12a56517bd4465b65578b65c37e46af584df
GIT binary patch
literal 2835
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
M5*-M+mY%2o1N~P#9{>OV
literal 0
HcmV?d00001
--
GitLab
From 0adceac248fde5b9908dd20e1614c52f8f72d2d1 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 25 Sep 2019 11:57:35 +0200
Subject: [PATCH 4/7] Quick fixes on JS
---
src/scripts/coopstarter.js | 77 +++++++++++++++++++++-----------------
1 file changed, 43 insertions(+), 34 deletions(-)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index f94904ad..d73b5105 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -201,15 +201,17 @@ function addProperFilterToSearchComponents(targetId) {
);
//TODO: The first time the event is not call.
- format_field_search.onchange = function() {
- let option_selected = format_field_search.querySelector(
- "option:checked"
- );
-
- format_hidden_field.forEach(function(select_hidden) {
- selectHiddenManagement(select_hidden, option_selected);
- });
- };
+ if (format_field_search) {
+ format_field_search.onchange = function() {
+ let option_selected = format_field_search.querySelector(
+ "option:checked"
+ );
+
+ format_hidden_field.forEach(function(select_hidden) {
+ selectHiddenManagement(select_hidden, option_selected);
+ });
+ };
+ }
//To retrieve language
let language_field_search = more_criterias_form.querySelector(
@@ -219,15 +221,17 @@ function addProperFilterToSearchComponents(targetId) {
'hidden-widget[name="more_criterias_hidden"] select[name="language"]'
);
- language_field_search.onchange = function() {
- let option_selected = language_field_search.querySelector(
- "option:checked"
- );
+ if (language_field_search) {
+ language_field_search.onchange = function() {
+ let option_selected = language_field_search.querySelector(
+ "option:checked"
+ );
- language_hidden_field.forEach(function(select_hidden) {
- selectHiddenManagement(select_hidden, option_selected);
- });
- };
+ language_hidden_field.forEach(function(select_hidden) {
+ selectHiddenManagement(select_hidden, option_selected);
+ });
+ };
+ }
//To retrieve field
let field_field_search = more_criterias_form.querySelector(
@@ -237,15 +241,17 @@ function addProperFilterToSearchComponents(targetId) {
'hidden-widget[name="more_criterias_hidden"] select[name="fields"]'
);
- field_field_search.onchange = function() {
- let option_selected = field_field_search.querySelector(
- "option:checked"
- );
+ if (language_field_search) {
+ field_field_search.onchange = function() {
+ let option_selected = field_field_search.querySelector(
+ "option:checked"
+ );
- field_hidden_field.forEach(function(select_hidden) {
- selectHiddenManagement(select_hidden, option_selected);
- });
- };
+ field_hidden_field.forEach(function(select_hidden) {
+ selectHiddenManagement(select_hidden, option_selected);
+ });
+ };
+ }
//To retrieve year of publication
//WARNING: If the user want to select "20" to get 21century made, he will get no result.
@@ -257,11 +263,13 @@ function addProperFilterToSearchComponents(targetId) {
'hidden-widget[name="more_criterias_hidden"] input[name="publication_year"]'
);
- year_field_search.addEventListener("input", function() {
- year_hidden_fields.forEach(field => {
- inputHiddenManagement(field, year_field_search, form);
+ if (year_field_search) {
+ year_field_search.addEventListener("input", function() {
+ year_hidden_fields.forEach(field => {
+ inputHiddenManagement(field, year_field_search, form);
+ });
});
- });
+ }
//To retrieve the country
let country_field_search = more_criterias_form.querySelector(
@@ -271,11 +279,13 @@ function addProperFilterToSearchComponents(targetId) {
'hidden-widget[name="more_criterias_hidden"] input[name="country"]'
);
- country_field_search.addEventListener("input", function() {
- country_hidden_fields.forEach(field => {
- inputHiddenManagement(field, country_field_search, form);
+ if (year_field_search) {
+ country_field_search.addEventListener("input", function() {
+ country_hidden_fields.forEach(field => {
+ inputHiddenManagement(field, country_field_search, form);
+ });
});
- });
+ }
}, 1000);
});
});
@@ -396,7 +406,6 @@ jQuery(document).ready(function($) {
//Accordion by step
var acc = document.getElementsByClassName("accordion");
var i;
- console.log(acc)
for (i = 0; i < acc.length; i++) {
acc[i].addEventListener("click", function() {
--
GitLab
From b558c5f739bf0b88b0a64a4f65202aae5fef1896 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 25 Sep 2019 11:58:16 +0200
Subject: [PATCH 5/7] Removing the nvm install shell file
---
install_nvm.sh | 400 -------------------------------------------------
1 file changed, 400 deletions(-)
delete mode 100644 install_nvm.sh
diff --git a/install_nvm.sh b/install_nvm.sh
deleted file mode 100644
index 77f7f31c..00000000
--- a/install_nvm.sh
+++ /dev/null
@@ -1,400 +0,0 @@
-#!/usr/bin/env bash
-
-{ # this ensures the entire script is downloaded #
-
-nvm_has() {
- type "$1" > /dev/null 2>&1
-}
-
-nvm_install_dir() {
- command printf %s "${NVM_DIR:-"$HOME/.nvm"}"
-}
-
-nvm_latest_version() {
- echo "v0.33.11"
-}
-
-nvm_profile_is_bash_or_zsh() {
- local TEST_PROFILE
- TEST_PROFILE="${1-}"
- case "${TEST_PROFILE-}" in
- *"/.bashrc" | *"/.bash_profile" | *"/.zshrc")
- return
- ;;
- *)
- return 1
- ;;
- esac
-}
-
-#
-# Outputs the location to NVM depending on:
-# * The availability of $NVM_SOURCE
-# * The method used ("script" or "git" in the script, defaults to "git")
-# NVM_SOURCE always takes precedence unless the method is "script-nvm-exec"
-#
-nvm_source() {
- local NVM_METHOD
- NVM_METHOD="$1"
- local NVM_SOURCE_URL
- NVM_SOURCE_URL="$NVM_SOURCE"
- if [ "_$NVM_METHOD" = "_script-nvm-exec" ]; then
- NVM_SOURCE_URL="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm-exec"
- elif [ "_$NVM_METHOD" = "_script-nvm-bash-completion" ]; then
- NVM_SOURCE_URL="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/bash_completion"
- elif [ -z "$NVM_SOURCE_URL" ]; then
- if [ "_$NVM_METHOD" = "_script" ]; then
- NVM_SOURCE_URL="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm.sh"
- elif [ "_$NVM_METHOD" = "_git" ] || [ -z "$NVM_METHOD" ]; then
- NVM_SOURCE_URL="https://github.com/creationix/nvm.git"
- else
- echo >&2 "Unexpected value \"$NVM_METHOD\" for \$NVM_METHOD"
- return 1
- fi
- fi
- echo "$NVM_SOURCE_URL"
-}
-
-#
-# Node.js version to install
-#
-nvm_node_version() {
- echo "$NODE_VERSION"
-}
-
-nvm_download() {
- if nvm_has "curl"; then
- curl --compressed -q "$@"
- elif nvm_has "wget"; then
- # Emulate curl with wget
- ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
- -e 's/-L //' \
- -e 's/--compressed //' \
- -e 's/-I /--server-response /' \
- -e 's/-s /-q /' \
- -e 's/-o /-O /' \
- -e 's/-C - /-c /')
- # shellcheck disable=SC2086
- eval wget $ARGS
- fi
-}
-
-install_nvm_from_git() {
- local INSTALL_DIR
- INSTALL_DIR="$(nvm_install_dir)"
-
- if [ -d "$INSTALL_DIR/.git" ]; then
- echo "=> nvm is already installed in $INSTALL_DIR, trying to update using git"
- command printf '\r=> '
- command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" fetch origin tag "$(nvm_latest_version)" --depth=1 2> /dev/null || {
- echo >&2 "Failed to update nvm, run 'git fetch' in $INSTALL_DIR yourself."
- exit 1
- }
- else
- # Cloning to $INSTALL_DIR
- echo "=> Downloading nvm from git to '$INSTALL_DIR'"
- command printf '\r=> '
- mkdir -p "${INSTALL_DIR}"
- if [ "$(ls -A "${INSTALL_DIR}")" ]; then
- command git init "${INSTALL_DIR}" || {
- echo >&2 'Failed to initialize nvm repo. Please report this!'
- exit 2
- }
- command git --git-dir="${INSTALL_DIR}/.git" remote add origin "$(nvm_source)" 2> /dev/null \
- || command git --git-dir="${INSTALL_DIR}/.git" remote set-url origin "$(nvm_source)" || {
- echo >&2 'Failed to add remote "origin" (or set the URL). Please report this!'
- exit 2
- }
- command git --git-dir="${INSTALL_DIR}/.git" fetch origin tag "$(nvm_latest_version)" --depth=1 || {
- echo >&2 'Failed to fetch origin with tags. Please report this!'
- exit 2
- }
- else
- command git -c advice.detachedHead=false clone "$(nvm_source)" -b "$(nvm_latest_version)" --depth=1 "${INSTALL_DIR}" || {
- echo >&2 'Failed to clone nvm repo. Please report this!'
- exit 2
- }
- fi
- fi
- command git -c advice.detachedHead=false --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" checkout -f --quiet "$(nvm_latest_version)"
- if [ ! -z "$(command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" show-ref refs/heads/master)" ]; then
- if command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" branch --quiet 2>/dev/null; then
- command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" branch --quiet -D master >/dev/null 2>&1
- else
- echo >&2 "Your version of git is out of date. Please update it!"
- command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" branch -D master >/dev/null 2>&1
- fi
- fi
-
- echo "=> Compressing and cleaning up git repository"
- if ! command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" reflog expire --expire=now --all; then
- echo >&2 "Your version of git is out of date. Please update it!"
- fi
- if ! command git --git-dir="$INSTALL_DIR"/.git --work-tree="$INSTALL_DIR" gc --auto --aggressive --prune=now ; then
- echo >&2 "Your version of git is out of date. Please update it!"
- fi
- return
-}
-
-#
-# Automatically install Node.js
-#
-nvm_install_node() {
- local NODE_VERSION_LOCAL
- NODE_VERSION_LOCAL="$(nvm_node_version)"
-
- if [ -z "$NODE_VERSION_LOCAL" ]; then
- return 0
- fi
-
- echo "=> Installing Node.js version $NODE_VERSION_LOCAL"
- nvm install "$NODE_VERSION_LOCAL"
- local CURRENT_NVM_NODE
-
- CURRENT_NVM_NODE="$(nvm_version current)"
- if [ "$(nvm_version "$NODE_VERSION_LOCAL")" == "$CURRENT_NVM_NODE" ]; then
- echo "=> Node.js version $NODE_VERSION_LOCAL has been successfully installed"
- else
- echo >&2 "Failed to install Node.js $NODE_VERSION_LOCAL"
- fi
-}
-
-install_nvm_as_script() {
- local INSTALL_DIR
- INSTALL_DIR="$(nvm_install_dir)"
- local NVM_SOURCE_LOCAL
- NVM_SOURCE_LOCAL="$(nvm_source script)"
- local NVM_EXEC_SOURCE
- NVM_EXEC_SOURCE="$(nvm_source script-nvm-exec)"
- local NVM_BASH_COMPLETION_SOURCE
- NVM_BASH_COMPLETION_SOURCE="$(nvm_source script-nvm-bash-completion)"
-
- # Downloading to $INSTALL_DIR
- mkdir -p "$INSTALL_DIR"
- if [ -f "$INSTALL_DIR/nvm.sh" ]; then
- echo "=> nvm is already installed in $INSTALL_DIR, trying to update the script"
- else
- echo "=> Downloading nvm as script to '$INSTALL_DIR'"
- fi
- nvm_download -s "$NVM_SOURCE_LOCAL" -o "$INSTALL_DIR/nvm.sh" || {
- echo >&2 "Failed to download '$NVM_SOURCE_LOCAL'"
- return 1
- } &
- nvm_download -s "$NVM_EXEC_SOURCE" -o "$INSTALL_DIR/nvm-exec" || {
- echo >&2 "Failed to download '$NVM_EXEC_SOURCE'"
- return 2
- } &
- nvm_download -s "$NVM_BASH_COMPLETION_SOURCE" -o "$INSTALL_DIR/bash_completion" || {
- echo >&2 "Failed to download '$NVM_BASH_COMPLETION_SOURCE'"
- return 2
- } &
- for job in $(jobs -p | command sort)
- do
- wait "$job" || return $?
- done
- chmod a+x "$INSTALL_DIR/nvm-exec" || {
- echo >&2 "Failed to mark '$INSTALL_DIR/nvm-exec' as executable"
- return 3
- }
-}
-
-nvm_try_profile() {
- if [ -z "${1-}" ] || [ ! -f "${1}" ]; then
- return 1
- fi
- echo "${1}"
-}
-
-#
-# Detect profile file if not specified as environment variable
-# (eg: PROFILE=~/.myprofile)
-# The echo'ed path is guaranteed to be an existing file
-# Otherwise, an empty string is returned
-#
-nvm_detect_profile() {
- if [ -n "${PROFILE}" ] && [ -f "${PROFILE}" ]; then
- echo "${PROFILE}"
- return
- fi
-
- local DETECTED_PROFILE
- DETECTED_PROFILE=''
-
- if [ -n "${BASH_VERSION-}" ]; then
- if [ -f "$HOME/.bashrc" ]; then
- DETECTED_PROFILE="$HOME/.bashrc"
- elif [ -f "$HOME/.bash_profile" ]; then
- DETECTED_PROFILE="$HOME/.bash_profile"
- fi
- elif [ -n "${ZSH_VERSION-}" ]; then
- DETECTED_PROFILE="$HOME/.zshrc"
- fi
-
- if [ -z "$DETECTED_PROFILE" ]; then
- for EACH_PROFILE in ".profile" ".bashrc" ".bash_profile" ".zshrc"
- do
- if DETECTED_PROFILE="$(nvm_try_profile "${HOME}/${EACH_PROFILE}")"; then
- break
- fi
- done
- fi
-
- if [ ! -z "$DETECTED_PROFILE" ]; then
- echo "$DETECTED_PROFILE"
- fi
-}
-
-#
-# Check whether the user has any globally-installed npm modules in their system
-# Node, and warn them if so.
-#
-nvm_check_global_modules() {
- command -v npm >/dev/null 2>&1 || return 0
-
- local NPM_VERSION
- NPM_VERSION="$(npm --version)"
- NPM_VERSION="${NPM_VERSION:--1}"
- [ "${NPM_VERSION%%[!-0-9]*}" -gt 0 ] || return 0
-
- local NPM_GLOBAL_MODULES
- NPM_GLOBAL_MODULES="$(
- npm list -g --depth=0 |
- command sed -e '/ npm@/d' -e '/ (empty)$/d'
- )"
-
- local MODULE_COUNT
- MODULE_COUNT="$(
- command printf %s\\n "$NPM_GLOBAL_MODULES" |
- command sed -ne '1!p' | # Remove the first line
- wc -l | command tr -d ' ' # Count entries
- )"
-
- if [ "${MODULE_COUNT}" != '0' ]; then
- # shellcheck disable=SC2016
- echo '=> You currently have modules installed globally with `npm`. These will no'
- # shellcheck disable=SC2016
- echo '=> longer be linked to the active version of Node when you install a new node'
- # shellcheck disable=SC2016
- echo '=> with `nvm`; and they may (depending on how you construct your `$PATH`)'
- # shellcheck disable=SC2016
- echo '=> override the binaries of modules installed with `nvm`:'
- echo
-
- command printf %s\\n "$NPM_GLOBAL_MODULES"
- echo '=> If you wish to uninstall them at a later point (or re-install them under your'
- # shellcheck disable=SC2016
- echo '=> `nvm` Nodes), you can remove them from the system Node as follows:'
- echo
- echo ' $ nvm use system'
- echo ' $ npm uninstall -g a_module'
- echo
- fi
-}
-
-nvm_do_install() {
- if [ -n "${NVM_DIR-}" ] && ! [ -d "${NVM_DIR}" ]; then
- echo >&2 "You have \$NVM_DIR set to \"${NVM_DIR}\", but that directory does not exist. Check your profile files and environment."
- exit 1
- fi
- if [ -z "${METHOD}" ]; then
- # Autodetect install method
- if nvm_has git; then
- install_nvm_from_git
- elif nvm_has nvm_download; then
- install_nvm_as_script
- else
- echo >&2 'You need git, curl, or wget to install nvm'
- exit 1
- fi
- elif [ "${METHOD}" = 'git' ]; then
- if ! nvm_has git; then
- echo >&2 "You need git to install nvm"
- exit 1
- fi
- install_nvm_from_git
- elif [ "${METHOD}" = 'script' ]; then
- if ! nvm_has nvm_download; then
- echo >&2 "You need curl or wget to install nvm"
- exit 1
- fi
- install_nvm_as_script
- fi
-
- echo
-
- local NVM_PROFILE
- NVM_PROFILE="$(nvm_detect_profile)"
- local PROFILE_INSTALL_DIR
- PROFILE_INSTALL_DIR="$(nvm_install_dir | command sed "s:^$HOME:\$HOME:")"
-
- SOURCE_STR="\\nexport NVM_DIR=\"${PROFILE_INSTALL_DIR}\"\\n[ -s \"\$NVM_DIR/nvm.sh\" ] && \\. \"\$NVM_DIR/nvm.sh\" # This loads nvm\\n"
-
- # shellcheck disable=SC2016
- COMPLETION_STR='[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion\n'
- BASH_OR_ZSH=false
-
- if [ -z "${NVM_PROFILE-}" ] ; then
- local TRIED_PROFILE
- if [ -n "${PROFILE}" ]; then
- TRIED_PROFILE="${NVM_PROFILE} (as defined in \$PROFILE), "
- fi
- echo "=> Profile not found. Tried ${TRIED_PROFILE-}~/.bashrc, ~/.bash_profile, ~/.zshrc, and ~/.profile."
- echo "=> Create one of them and run this script again"
- echo " OR"
- echo "=> Append the following lines to the correct file yourself:"
- command printf "${SOURCE_STR}"
- echo
- else
- if nvm_profile_is_bash_or_zsh "${NVM_PROFILE-}"; then
- BASH_OR_ZSH=true
- fi
- if ! command grep -qc '/nvm.sh' "$NVM_PROFILE"; then
- echo "=> Appending nvm source string to $NVM_PROFILE"
- command printf "${SOURCE_STR}" >> "$NVM_PROFILE"
- else
- echo "=> nvm source string already in ${NVM_PROFILE}"
- fi
- # shellcheck disable=SC2016
- if ${BASH_OR_ZSH} && ! command grep -qc '$NVM_DIR/bash_completion' "$NVM_PROFILE"; then
- echo "=> Appending bash_completion source string to $NVM_PROFILE"
- command printf "$COMPLETION_STR" >> "$NVM_PROFILE"
- else
- echo "=> bash_completion source string already in ${NVM_PROFILE}"
- fi
- fi
- if ${BASH_OR_ZSH} && [ -z "${NVM_PROFILE-}" ] ; then
- echo "=> Please also append the following lines to the if you are using bash/zsh shell:"
- command printf "${COMPLETION_STR}"
- fi
-
- # Source nvm
- # shellcheck source=/dev/null
- \. "$(nvm_install_dir)/nvm.sh"
-
- nvm_check_global_modules
-
- nvm_install_node
-
- nvm_reset
-
- echo "=> Close and reopen your terminal to start using nvm or run the following to use it now:"
- command printf "${SOURCE_STR}"
- if ${BASH_OR_ZSH} ; then
- command printf "${COMPLETION_STR}"
- fi
-}
-
-#
-# Unsets the various functions defined
-# during the execution of the install script
-#
-nvm_reset() {
- unset -f nvm_has nvm_install_dir nvm_latest_version nvm_profile_is_bash_or_zsh \
- nvm_source nvm_node_version nvm_download install_nvm_from_git nvm_install_node \
- install_nvm_as_script nvm_try_profile nvm_detect_profile nvm_check_global_modules \
- nvm_do_install nvm_reset
-}
-
-[ "_$NVM_ENV" = "_testing" ] || nvm_do_install
-
-} # this ensures the entire script is downloaded #
--
GitLab
From def13d685809539854eb8332f77f9dc202aee4d0 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 25 Sep 2019 12:10:30 +0200
Subject: [PATCH 6/7] CSS quickfix
---
src/styles/index.scss | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 80bcd07e..bd78d579 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1303,14 +1303,17 @@ sib-set-default[name="submitter_info"]{
}
div{
background: url("../images/valid_fd.png") no-repeat center 43% white;
- figure{
- margin: 5rem 0;
- figcaption{
- font-family: "var(--typo-btn)";
- margin: 2rem auto 0 auto;
- color: var(--clr-typo-base);
- font-size: 1.6rem;
+ .like{
+ background: none;
}
+ figure{
+ margin: 5rem 0;
+ figcaption{
+ font-family: "var(--typo-btn)";
+ margin: 2rem auto 0 auto;
+ color: var(--clr-typo-base);
+ font-size: 1.6rem;
+ }
}
}
}
--
GitLab
From 0d3eaf58c0ed5977a2450109ba971ca27f36e03c Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 25 Sep 2019 12:44:56 +0200
Subject: [PATCH 7/7] CSS quickfix
---
.../resources/confirmation-deletion.pug | 2 +-
src/includes/mentor/validation-process.pug | 6 ++---
src/styles/index.scss | 23 +++++++++++--------
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/includes/mentor/resources/confirmation-deletion.pug b/src/includes/mentor/resources/confirmation-deletion.pug
index f6ee8ac9..93cfb47c 100644
--- a/src/includes/mentor/resources/confirmation-deletion.pug
+++ b/src/includes/mentor/resources/confirmation-deletion.pug
@@ -1,7 +1,7 @@
.block_log.block_creat_count.no_shadow
sib-link(class="backlink", next="mentor-resource-list")
.like
- p.backlink
+ p
i.fas.fa-times
h2.title_lead_avenir Delete a resource
diff --git a/src/includes/mentor/validation-process.pug b/src/includes/mentor/validation-process.pug
index af3fa37a..14e4b4b3 100644
--- a/src/includes/mentor/validation-process.pug
+++ b/src/includes/mentor/validation-process.pug
@@ -1,8 +1,8 @@
div.block_log.block_creat_count.no_shadow
sib-link(class="backlink", next="mentor-resource-list")
- .like
- p.backlink
- i.fas.fa-times
+ .like
+ p
+ i.fas.fa-times
div#validation-process
h2 What is a validation process ?
div.flex.w_100
diff --git a/src/styles/index.scss b/src/styles/index.scss
index bd78d579..610a0e4d 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1272,17 +1272,20 @@ sib-set-default[name="submitter_info"]{
.fas.fa-times:before{
top: 2rem;
- }
-}
- h1{
- font-family: var(--typo);
- font-size: 2.2rem;
- margin: 0 0 2rem 0;
- font-weight: normal;
- padding-top: 2rem;
- color: #444C4D;
- border-bottom: 1px solid #DBE2ED;
}
+ }
+ sib-link.backlink {
+ margin: 0;
+ }
+ h1{
+ font-family: var(--typo);
+ font-size: 2.2rem;
+ margin: 0 0 2rem 0;
+ font-weight: normal;
+ padding-top: 2rem;
+ color: #444C4D;
+ border-bottom: 1px solid #DBE2ED;
+ }
p{
text-align: center;
}
--
GitLab