bachir/materio-d9
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

blabla article display and nav

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2019-07-25 21:23:23 +02:00
parent f2d8c15c25
commit f5e18e9c20
12 changed files with 454 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
web/themes/custom/materiotheme/assets/dist/main.css vendored
View File

@@ -24,6 +24,27 @@ a, a:focus, a:active {
a:focus {
-moz-outline-style: none; }
ul {
margin: 0;
padding: 0; }
ul li {
margin: 0;
padding: 0;
list-style: none; }
h1, h2, h3, h4, h5, h6 {
margin: 0; }
p a {
position: relative; }
p a:after {
content: '';
position: absolute;
top: 1em;
left: 0;
width: 100%;
border-bottom: 1px dotted #000; }
.col-1, .small-col-1, .med-col-1, .large-col-1, .col-2, .small-col-2, .med-col-2, .large-col-2, .col-3, .small-col-3, .med-col-3, .large-col-3, .col-4, .small-col-4, .med-col-4, .large-col-4, .col-5, .small-col-5, .med-col-5, .large-col-5, .col-6, .small-col-6, .med-col-6, .large-col-6, .col-7, .small-col-7, .med-col-7, .large-col-7, .col-8, .small-col-8, .med-col-8, .large-col-8, .col-9, .small-col-9, .med-col-9, .large-col-9, .col-10, .small-col-10, .med-col-10, .large-col-10, .col-11, .small-col-11, .med-col-11, .large-col-11, .col-12, .small-col-12, .med-col-12, .large-col-12, .col-1-offset-1, .col-1-offset-2, .col-1-offset-3, .col-1-offset-4, .col-1-offset-5, .col-1-offset-6, .col-1-offset-7, .col-1-offset-8, .col-1-offset-9, .col-1-offset-10, .col-1-offset-11, .col-2-offset-1, .col-2-offset-2, .col-2-offset-3, .col-2-offset-4, .col-2-offset-5, .col-2-offset-6, .col-2-offset-7, .col-2-offset-8, .col-2-offset-9, .col-2-offset-10, .col-3-offset-1, .col-3-offset-2, .col-3-offset-3, .col-3-offset-4, .col-3-offset-5, .col-3-offset-6, .col-3-offset-7, .col-3-offset-8, .col-3-offset-9, .col-4-offset-1, .col-4-offset-2, .col-4-offset-3, .col-4-offset-4, .col-4-offset-5, .col-4-offset-6, .col-4-offset-7, .col-4-offset-8, .col-5-offset-1, .col-5-offset-2, .col-5-offset-3, .col-5-offset-4, .col-5-offset-5, .col-5-offset-6, .col-5-offset-7, .col-6-offset-1, .col-6-offset-2, .col-6-offset-3, .col-6-offset-4, .col-6-offset-5, .col-6-offset-6, .col-7-offset-1, .col-7-offset-2, .col-7-offset-3, .col-7-offset-4, .col-7-offset-5, .col-8-offset-1, .col-8-offset-2, .col-8-offset-3, .col-8-offset-4, .col-9-offset-1, .col-9-offset-2, .col-9-offset-3, .col-10-offset-1, .col-10-offset-2, .col-11-offset-1 {
width: 100%;
float: left;
@@ -1404,23 +1425,6 @@ article.node--type-frontpage .node__content > section.home-blabla {
font-size: 0.756em;
line-height: 0.9; }
#showrooms {
width: calc(100% + 15px); }
#showrooms article.showroom {
width: 435px;
display: inline-block;
vertical-align: top;
margin: 0 15px 15px 0; }
#showrooms article.showroom h1 {
margin: 0;
font-weight: 4; }
#showrooms article.showroom p {
margin: 0; }
#showrooms article.showroom figure {
margin: 0; }
#showrooms article.showroom figure img {
max-width: 100%; }
.infinite-loading-container .infinite-status-prompt i[class^="loading-"] {
width: 15px;
height: 15px; }
@@ -1463,7 +1467,7 @@ article.card {
article.card header h1 {
font-size: 1.3em;
font-weight: 700;
line-height: 0.8;
line-height: 0.85;
margin-bottom: 0.2em; }
article.card header h4 {
font-size: 0.882em;
@@ -1491,3 +1495,88 @@ article.card {
left: 0;
z-index: 20; }
#main-content > article.article section.taxonomy ul {
margin: 1em 0 0; }
#main-content > article.article section.taxonomy li {
display: inline-block;
padding: 0 0.5em 0 0; }
#main-content > article.article section.visuels {
width: calc(100% + 15px); }
#main-content > article.article section.visuels figure {
display: inline-block;
vertical-align: top;
width: 210px;
margin: 0 15px 0 0; }
#main-content > article.article section.visuels figure img {
width: 100%; }
#main-content > article.article aside.linked-materials ul {
width: calc(100% + 15px); }
#main-content > article.article aside.linked-materials ul li {
display: inline-block;
vertical-align: top;
width: 210px;
margin: 0 15px 0 0; }
#main-content > article.article aside.linked-materials h3.field__label {
font-size: 1em;
font-weight: 500;
margin: 2em 0 1em 0; }
#main-content > article.article aside.linked-materials h1.title {
font-size: 1em;
font-weight: 400; }
#main-content > article.article aside.linked-materials h3.ref {
font-size: 0.756em;
font-weight: 600; }
#main-content > article.article aside.linked-materials h2.description {
font-size: 0.756em;
font-weight: 400; }
#main-content > article.article nav.prevnext.bottom {
margin: 2em 0; }
#main-content > article.article nav.prevnext ul {
padding: 0;
margin: 0;
display: grid;
grid-template-columns: 1fr 1fr; }
#main-content > article.article nav.prevnext li {
padding: 0;
margin: 0;
list-style: none; }
#main-content > article.article nav.prevnext li a {
font-size: 0.756em;
font-weight: 700; }
#main-content > article.article nav.prevnext li:nth-child(1) {
grid-column: 1; }
#main-content > article.article nav.prevnext li:nth-child(1) a:before {
content: '< '; }
#main-content > article.article nav.prevnext li:nth-child(2) {
grid-column: 2;
text-align: right; }
#main-content > article.article nav.prevnext li:nth-child(2) a:after {
content: ' >'; }
#showrooms {
width: calc(100% + 15px); }
#showrooms article.showroom {
width: 435px;
display: inline-block;
vertical-align: top;
margin: 0 15px 15px 0; }
#showrooms article.showroom h1 {
margin: 0;
font-weight: 4; }
#showrooms article.showroom p {
margin: 0; }
#showrooms article.showroom figure {
margin: 0; }
#showrooms article.showroom figure img {
max-width: 100%; }

14
web/themes/custom/materiotheme/assets/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

15
web/themes/custom/materiotheme/assets/scripts/main.js
View File

@@ -59,7 +59,20 @@ import 'theme/assets/styles/main.scss'
router.beforeEach((to, from, next) => {
// console.log('router beforeEach to ', to);
// commit new title to store
store.commit('Common/setPagetitle', to.name != 'home' ? to.name : null)
let title = null;
switch (to.name) {
case 'home':
title = null
break;
case 'article':
title = false
break;
default:
title = to.name
}
if (title !== false) {
store.commit('Common/setPagetitle', title)
}
// remove all path related body classes
let body_classes = document.querySelector('body').classList;

25
web/themes/custom/materiotheme/assets/styles/base/_reset.scss
View File

@@ -8,3 +8,28 @@ a{
}
a, a:focus, a:active { outline: none; }
a:focus{ -moz-outline-style: none; }
ul{
margin:0;
padding:0;
li{
margin:0;
padding:0;
list-style: none;
}
}
h1,h2,h3,h4,h5,h6{
margin:0;
}
p a{
position: relative;
&:after{
content:'';
position: absolute;
top:1em; left:0;
width:100%;
border-bottom: 1px dotted #000;
}
}

159
web/themes/custom/materiotheme/assets/styles/main.scss
View File

@@ -209,8 +209,6 @@ header[role="banner"]{
text-transform: capitalize;
font-weight: 300;
body:not(.path-home) & {
padding:0.5em 1em;
}
@@ -229,7 +227,6 @@ header[role="banner"]{
}
}
#block-materiosapisearchblock{
float:right;
display:inline-block;
@@ -499,34 +496,6 @@ article.node--type-frontpage{
}
// ___ _
// / __| |_ _____ __ ___ _ ___ ___ _ __ ___
// \__ \ ' \/ _ \ V V / '_/ _ \/ _ \ ' \(_-<
// |___/_||_\___/\_/\_/|_| \___/\___/_|_|_/__/
#showrooms{
width: calc(100% + #{$column_goutiere});
article.showroom{
width: $column_width * 2 + $column_goutiere;
display: inline-block;
vertical-align: top;
margin: 0 $column_goutiere $column_goutiere 0;
h1{
margin:0;
font-weight: 4;
}
p{ margin:0; }
figure{
margin:0;
img{
max-width: 100%;
}
}
}
}
// ___ _
// / __|__ _ _ _ __| |___
// | (__/ _` | '_/ _` (_-<
@@ -572,6 +541,10 @@ article.card{
// }
// focused
// box-shadow: 0 0 7px rgba(0,0,0,0.9);
// &.article{
// width: $column_width * 2 + $column_goutiere;
//
// }
header{
position: absolute;
bottom:0;
@@ -585,7 +558,7 @@ article.card{
h1{
font-size: 1.3em;
font-weight: 700;
line-height: 0.8;
line-height: 0.85;
margin-bottom: 0.2em;
}
h4{
@@ -622,3 +595,125 @@ article.card{
}
}
}
// ___ _ _ _
// | _ ) |__ _| |__| |__ _
// | _ \ / _` | '_ \ / _` |
// |___/_\__,_|_.__/_\__,_|
#blabla{
}
#main-content > article.article{
section.taxonomy{
ul{
margin:1em 0 0;
}
li{
display:inline-block;
padding:0 0.5em 0 0;
}
}
section.visuels{
width:calc(100% + #{$column_goutiere});
figure{
display: inline-block;
vertical-align: top;
width:$column_width;
margin:0 $column_goutiere 0 0;
img{
width:100%;
}
}
}
aside.linked-materials{
ul{
width:calc(100% + #{$column_goutiere});
li{
display: inline-block;
vertical-align: top;
width:$column_width;
margin:0 $column_goutiere 0 0;
}
}
h3.field__label{
font-size: 1em;
font-weight: 500;
margin: 2em 0 1em 0;
}
h1.title{
font-size: 1em;
font-weight: 400;
}
h3.ref{
font-size: 0.756em;
font-weight: 600;
}
h2.description{
font-size: 0.756em;
font-weight: 400;
}
}
nav.prevnext{
&.bottom{
margin:2em 0;
}
ul{
padding:0;
margin:0;
display: grid;
grid-template-columns: 1fr 1fr;
}
li{
padding:0;
margin:0;
list-style: none;
a{
font-size: 0.756em;
font-weight: 700;
}
&:nth-child(1){
grid-column: 1;
a:before{
content:'< ';
}
}
&:nth-child(2){
grid-column: 2;
text-align: right;
a:after{
content:' >';
}
}
}
}
}
// ___ _
// / __| |_ _____ __ ___ _ ___ ___ _ __ ___
// \__ \ ' \/ _ \ V V / '_/ _ \/ _ \ ' \(_-<
// |___/_||_\___/\_/\_/|_| \___/\___/_|_|_/__/
#showrooms{
width: calc(100% + #{$column_goutiere});
article.showroom{
width: $column_width * 2 + $column_goutiere;
display: inline-block;
vertical-align: top;
margin: 0 $column_goutiere $column_goutiere 0;
h1{
margin:0;
font-weight: 4;
}
p{ margin:0; }
figure{
margin:0;
img{
max-width: 100%;
}
}
}
}