Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidhellmann
davidhellmann committed Jan 14, 2018
1 parent 152f99e commit 10a00bd
Show file tree
Hide file tree
Showing 28 changed files with 711 additions and 334 deletions.
18 changes: 9 additions & 9 deletions generators/app/templates/___src/_imports/craft3.sql
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions generators/app/templates/___src/assets/css/____elements/_elements.headings.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,40 +20,40 @@ h6 {
}


.m-headline--mega {
.a-headline--mega {
@include ms-respond(font-size, 6);
}

.m-headline--super {
.a-headline--super {
@include ms-respond(font-size, 5);
}

h1,
.m-headline--h1 {
.a-headline--h1 {
@include ms-respond(font-size, 4);
}

h2,
.m-headline--h2 {
.a-headline--h2 {
@include ms-respond(font-size, 3);
}

h3,
.m-headline--h3 {
.a-headline--h3 {
@include ms-respond(font-size, 2);
}

h4,
.m-headline--h4 {
.a-headline--h4 {
@include ms-respond(font-size, 1);
}

h5,
.m-headline--h5 {
.a-headline--h5 {
@include ms-respond(font-size, 0);
}

h6,
.m-headline--h6 {
.a-headline--h6 {
@include ms-respond(font-size, 0);
}
41 changes: 24 additions & 17 deletions generators/app/templates/___src/assets/css/__modules/_module.paginationSimple.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,40 @@
*/

.m-paginationSimple {
@include make-col-flex(12);
@include make-vr();
$root: &;
margin: 0;
padding: 0;
list-style: none;

&__inner {
@include make-row-flex();
}
width: 100%;
@include make-vr();

&__item {
@include make-col-flex(6);
@include make-col(6);

@include media('>=s') {
@include make-col(12);
}

&--next {
margin-left: auto;
@include col-pos(7);

@include media('>=s') {
@include col-pos(13);
}
}
}

&__link {
display: block;
position: relative;
color: c('black', '90');
color: c('black', '50');
border: 1px solid c('black', '10');
padding-top: s(2);
padding-bottom: s(2);

&:hover {
border-color: c('black', '90');
border-color: c('black', '25');
color: c('black', '90');

.m-svgSprite {
fill: c('white');
#{$root}__icon svg path {
fill: c('black', '50');
}
}

Expand All @@ -55,11 +56,18 @@
&__icon {
width: 24px;
height: 24px;
display: inline-block;
position: absolute;
top: 50%;

svg {
width: 24px;
height: 24px;
}

svg path {
fill: c('black', '90');
fill: c('black', '25');
transition: all 0.25s ease('out-cubic');
}

&--prev {
Expand All @@ -84,7 +92,6 @@
}

&__title {
font-weight: 500;
display: none;

@include media('>=s') {
Expand Down
39 changes: 23 additions & 16 deletions generators/app/templates/___src/assets/css/__modules/_module.postNav.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,40 @@
*/

.m-postNav {
@include make-col-flex(12);
@include make-vr();
$root: &;
margin: 0;
padding: 0;
list-style: none;

&__inner {
@include make-row-flex();
}
width: 100%;
@include make-vr();

&__item {
@include make-col-flex(6);
@include make-col(6);

@include media('>=s') {
@include make-col(12);
}

&--next {
margin-left: auto;
@include col-pos(7);

@include media('>=s') {
@include col-pos(13);
}
}
}

&__link {
display: block;
position: relative;
color: c('black', '90');
color: c('black', '50');
border: 1px solid c('black', '10');
padding-top: s(4);
padding-bottom: s(2);

&:hover {
border-color: c('black', '90');
border-color: c('black', '25');
color: c('black', '90');

.m-svgSprite {
fill: c('white');
#{$root}__icon svg path {
fill: c('black', '50');
}

#{$root}__label {
Expand All @@ -62,8 +63,14 @@
position: absolute;
top: 50%;

svg {
width: 24px;
height: 24px;
}

svg path {
fill: c('black', 90);
fill: c('black', '25');
transition: all 0.25s ease('out-cubic');
}

&--prev {
Expand Down
38 changes: 27 additions & 11 deletions generators/app/templates/___src/assets/css/__modules/_module.socialNetworks.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,43 @@

.m-socialNetworks {
$root: &;
@include make-col-flex(12);
width: 100%;
display: flex;
flex-direction: row;
justify-content: center;
@include make-vr();

&__inner {
justify-content: center;
&__link {
flex: 1 1 auto;
display: inline-block;
text-align: center;
color: c('black', '50');

&:hover {
color: c('black', '50');

#{$root}__icon {
fill: darken(c('red'), 10%);
}
}
}

&__link {
&__icon {
max-width: 24px;
max-height: 24px;
display: inline-block;
@include make-vr(2);
@include make-col-padding();
}
fill: c('blue');
transition: fill 0.25s ease('out-cubic');

&__svg {
max-width: 32px;
max-height: 32px;
fill: c('red');
svg {
max-width: 24px;
max-height: 24px;
}
}

&__label {
width: 100%;
color: inherit;
@include ms-respond(font-size, -2);
}
}
52 changes: 8 additions & 44 deletions generators/app/templates/___src/assets/css/_modules.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,6 @@
|--------------------------------------------------------------------------
*/

// Modules
/* @import '../../templates/_templates/accordion/style';
@import '../../templates/_modules/appContent/style';
@import '../../templates/_modules/appFooter/style';
@import '../../templates/_modules/appHeader/style';
@import '../../templates/_modules/appWrapper/style';
@import '../../templates/_modules/button/style';
@import '../../templates/_modules/buttonGroup/style';
@import '../../templates/_modules/caption/style';
@import '../../templates/_modules/checkbox/style';
@import '../../templates/_modules/cookiebar/style';
@import '../../templates/_modules/definitionList/style';
@import '../../templates/_modules/dropdown/style';
@import '../../templates/_modules/embed/style';
@import '../../templates/_modules/figure/style';
@import '../../templates/_modules/headline/style';
@import '../../templates/_modules/imageCover/style';
@import '../../templates/_modules/imageGallery/style';
@import '../../templates/_modules/imageGrid/style';
@import '../../templates/_modules/imageSingle/style';
@import '../../templates/_modules/imageSlider/style';
@import '../../templates/_modules/input/style';
@import '../../templates/_modules/logo/style';
@import '../../templates/_modules/link/style';
@import '../../templates/_modules/newsList/style';
@import '../../templates/_modules/newsListItem/style';
@import '../../templates/_modules/navCategories/style';
@import '../../templates/_modules/pageTitle/style';
@import '../../templates/_modules/preloader/style';
@import '../../templates/_modules/quote/style';
@import '../../templates/_modules/radio/style';
@import '../../templates/_modules/richText/style';
@import '../../templates/_modules/richTextMarginals/style';
@import '../../templates/_modules/svgSprite/style';
@import '../../templates/_modules/separator/style';
@import '../../templates/_modules/textarea/style';
@import '../../templates/_modules/video/style';
@import '__modules/module.pagination';
@import '__modules/module.paginationSimple';
@import '__modules/module.postNav';
@import '__modules/module.socialNetworks'; */

// Embeds
@import '../../templates/_embeds/home/style';
@import '../../templates/_embeds/oneColumn/style';
Expand All @@ -72,6 +30,7 @@

// Molecules
@import '../../templates/_molecules/caption/style';
@import '../../templates/_molecules/card/style';
@import '../../templates/_molecules/definitionList/style';
@import '../../templates/_molecules/figure/style';
@import '../../templates/_molecules/quote/style';
Expand All @@ -82,6 +41,7 @@
@import '../../templates/_organisms/appFooter/style';
@import '../../templates/_organisms/appContent/style';
@import '../../templates/_organisms/appWrapper/style';
@import '../../templates/_organisms/cards/style';
@import '../../templates/_organisms/contactForm/style';
@import '../../templates/_organisms/section/style';
@import '../../templates/_organisms/imageCover/style';
Expand All @@ -91,5 +51,9 @@
@import '../../templates/_organisms/imageSlider/style';
@import '../../templates/_organisms/richTextMarginals/style';


// @import '__modules/module.languageSwitcher';
// Global Modules
@import '__modules/module.languageSwitcher';
@import '__modules/module.pagination';
@import '__modules/module.paginationSimple';
@import '__modules/module.postNav';
@import '__modules/module.socialNetworks';
7 changes: 6 additions & 1 deletion generators/app/templates/___src/templates/craftcms/_atoms/image/_template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@

{# -- Ratio Switch -- #}
{% if opt.ratio ?? null %}
{% switch opt.ratio.value %}
{% set ratio = opt.ratio %}
{% if opt.ratio.value ?? null %}
{% set ratio = opt.ratio.value %}
{% endif %}

{% switch ratio %}
{% case "landscape" %}
{% set imageSrc = opt.image.pluginOptimizedImagesLandscape.srcset() %}
{% set imageSrcset = opt.image.pluginOptimizedImagesLandscape.srcset() %}
Expand Down
23 changes: 23 additions & 0 deletions generators/app/templates/___src/templates/craftcms/_molecules/card/_script.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Description of what this file is for
*
* @package craft3
* @author David Hellmann [david@hellmann.io]
* card
*/

const card = {
cfg: {
name: 'card'
},

log(msg) {
console.log(msg);
},

init() {
this.log(`Init: ${this.cfg.name}`);
}
};

export default card;
Loading

0 comments on commit 10a00bd

Please sign in to comment.