autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update: conflict resolved

Browse Source
This commit is contained in:
gaelle morin 2020-05-23 14:53:38 +02:00
parent 4cee695906
commit caaf843126
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dependencies.pug
View File

@ -24,8 +24,8 @@ if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
//- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer)
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) if publicDirectory && (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="/lib/sib-directory/index.js" defer) //- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3" defer)
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer) script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1" defer)

3
src/styles/base/main.scss
View File

@ -153,7 +153,8 @@ h5 {
} }
%padding-main { %padding-main {
padding: 5rem; /*padding: 5rem;*/
padding: 1.3rem;
} }
%padding-block { %padding-block {

6
src/styles/base/menu-left.scss
View File

@ -247,14 +247,15 @@
&.jsLeftMenu { &.jsLeftMenu {
@include breakpoint(sm) {
display: none; display: none;
@include breakpoint(lg) {
display: block;
} }
} }
&.jsLeftMenu[open] { &.jsLeftMenu[open] {
@include breakpoint(sm) {
display: block; display: block;
bottom: 0; bottom: 0;
box-shadow: 0 2px 8px 0 rgba(65, 69, 73, 0.5); box-shadow: 0 2px 8px 0 rgba(65, 69, 73, 0.5);
@ -265,7 +266,6 @@
z-index: 1; z-index: 1;
} }
} }
}
// Temporary fix for badges // Temporary fix for badges
sib-fix-badge { sib-fix-badge {