opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core and composer updates

Browse source
This commit is contained in:
Rob Davies 2017-07-03 16:47:07 +01:00
parent a82634bb98
commit 62cac30480
1118 changed files with 21770 additions and 6306 deletions
Download patch file Download diff file Expand all files Collapse all files

15
web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig
View file

@ -11,14 +11,15 @@
*/
#}
{%
set classes = [
'layout--onecol',
]
set classes = [
'layout',
'layout--onecol',
]
%}
{% if content %}
<div{{ attributes.addClass(classes) }}>
<div class="layout-region layout-region--content">
{{ content.content }}
<div{{ attributes.addClass(classes) }}>
<div class="layout__region layout__region--content">
{{ content.content }}
</div>
</div>
</div>
{% endif %}

6
web/core/modules/layout_discovery/layouts/onecol/onecol.css
View file

@ -1,3 +1,7 @@
.layout--onecol .layout-region {
/*
* @file
* Provides the layout styles for layout_onecol.
*/
.layout--onecol .layout__region {
width: 100%;
}

59
web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig
View file

@ -14,34 +14,41 @@
*/
#}
{%
set classes = [
'layout--threecol',
]
set classes = [
'layout',
'layout--threecol-25-50-25',
]
%}
{% if content %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout-region layout-region--fullwidth">
{{ content.top }}
</div>
{% endif %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout__region layout__region--top">
{{ content.top }}
</div>
{% endif %}
<div class="layout-region layout-region--side">
{{ content.left }}
{% if content.first %}
<div class="layout__region layout__region--first">
{{ content.first }}
</div>
{% endif %}
{% if content.second %}
<div class="layout__region layout__region--second">
{{ content.second }}
</div>
{% endif %}
{% if content.third %}
<div class="layout__region layout__region--third">
{{ content.third }}
</div>
{% endif %}
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
{{ content.bottom }}
</div>
{% endif %}
</div>
<div class="layout-region layout-region--middle">
{{ content.middle }}
</div>
<div class="layout-region layout-region--side">
{{ content.right }}
</div>
{% if content.bottom %}
<div class="layout-region layout-region--fullwidth">
{{ content.bottom }}
</div>
{% endif %}
</div>
{% endif %}

27
web/core/modules/layout_discovery/layouts/threecol_25_50_25/threecol_25_50_25.css
View file

@ -1,17 +1,26 @@
.layout--threecol {
/*
* @file
* Provides the layout styles for layout_threecol_25_50_25.
*
* @todo Using display: flex requires https://www.drupal.org/node/2842298 to be
* in before this can be marked as stable.
*/
.layout--threecol-25-50-25 {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.layout--threecol > .layout-region {
flex: 0 1 25%;
}
.layout--threecol > .layout-region--fullwidth {
.layout--threecol-25-50-25 > .layout__region,
.layout--threecol-25-50-25 > .layout__region--second {
flex: 0 1 100%;
}
.layout--threecol > .layout-region--middle {
flex: 0 1 50%;
@media screen and (min-width: 40em) {
.layout--threecol-25-50-25 > .layout__region--first,
.layout--threecol-25-50-25 > .layout__region--third {
flex: 0 1 25%;
}
.layout--threecol-25-50-25 > .layout__region--second {
flex: 0 1 50%;
}
}

53
web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig
View file

@ -14,34 +14,41 @@
*/
#}
{%
set classes = [
'layout--threecol-33',
]
set classes = [
'layout',
'layout--threecol-33-34-33',
]
%}
{% if content %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout-region layout-region--fullwidth">
{{ content.top }}
</div>
{% endif %}
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout__region layout__region--top">
{{ content.top }}
</div>
{% endif %}
<div class="layout-region">
{{ content.left }}
</div>
{% if content.first %}
<div class="layout__region layout__region--first">
{{ content.first }}
</div>
{% endif %}
<div class="layout-region">
{{ content.middle }}
</div>
{% if content.second %}
<div class="layout__region layout__region--second">
{{ content.second }}
</div>
{% endif %}
<div class="layout-region">
{{ content.right }}
</div>
{% if content.third %}
<div class="layout__region layout__region--third">
{{ content.third }}
</div>
{% endif %}
{% if content.bottom %}
<div class="layout-region layout-region--fullwidth">
{{ content.bottom }}
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
{{ content.bottom }}
</div>
{% endif %}
</div>
{% endif %}
</div>
{% endif %}

25
web/core/modules/layout_discovery/layouts/threecol_33_34_33/threecol_33_34_33.css
View file

@ -1,13 +1,24 @@
.layout--threecol-33 {
/*
* @file
* Provides the layout styles for layout_threecol_33_34_33.
*
* @todo Using display: flex requires https://www.drupal.org/node/2842298 to be
* in before this can be marked as stable.
*/
.layout--threecol-33-34-33 {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.layout--threecol-33 > .layout-region {
flex: 0 1 33%;
}
.layout--threecol-33 > .layout-region--fullwidth {
.layout--threecol-33-34-33 > .layout__region {
flex: 0 1 100%;
}
@media screen and (min-width: 40em) {
.layout--threecol-33-34-33 > .layout__region--first,
.layout--threecol-33-34-33 > .layout__region--second,
.layout--threecol-33-34-33 > .layout__region--third {
flex: 0 1 33%;
}
}

39
web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig
View file

@ -11,26 +11,35 @@
*/
#}
{%
set classes = [
'layout--twocol',
]
set classes = [
'layout',
'layout--twocol',
]
%}
{% if content %}
<div{{ attributes.addClass(classes) }}>
<div class="layout-region layout-region--fullwidth">
{{ content.top }}
</div>
{% if content.top %}
<div class="layout__region layout__region--top">
{{ content.top }}
</div>
{% endif %}
<div class="layout-region layout-region--left">
{{ content.left }}
</div>
{% if content.first %}
<div class="layout__region layout__region--first">
{{ content.first }}
</div>
{% endif %}
<div class="layout-region layout-region--right">
{{ content.right }}
</div>
{% if content.second %}
<div class="layout__region layout__region--second">
{{ content.second }}
</div>
{% endif %}
<div class="layout-region layout-region--fullwidth">
{{ content.bottom }}
</div>
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
{{ content.bottom }}
</div>
{% endif %}
</div>
{% endif %}

22
web/core/modules/layout_discovery/layouts/twocol/twocol.css
View file

@ -1,13 +1,23 @@
/*
* @file
* Provides the layout styles for layout_twocol.
*
* @todo Using display: flex requires https://www.drupal.org/node/2842298 to be
* in before this can be marked as stable.
*/
.layout--twocol {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.layout--twocol > .layout-region {
flex: 0 1 50%;
}
.layout--twocol > .layout-region--fullwidth {
.layout--twocol > .layout__region {
flex: 0 1 100%;
}
@media screen and (min-width: 40em) {
.layout--twocol > .layout__region--first,
.layout--twocol > .layout__region--second {
flex: 0 1 50%;
}
}

65
web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig
View file

@ -14,38 +14,53 @@
*/
#}
{%
set classes = [
'layout--twocol-bricks',
]
set classes = [
'layout',
'layout--twocol-bricks',
]
%}
{% if content %}
<div{{ attributes.addClass(classes) }}>
<div class="layout-region layout-region--fullwidth">
{{ content.top }}
</div>
<div{{ attributes.addClass(classes) }}>
{% if content.top %}
<div class="layout__region layout__region--top">
{{ content.top }}
</div>
{% endif %}
<div class="layout-region layout-region--left_above">
{{ content.left_above }}
</div>
{% if content.first_above %}
<div class="layout__region layout__region--first-above">
{{ content.first_above }}
</div>
{% endif %}
<div class="layout-region layout-region--right_above">
{{ content.right_above }}
</div>
{% if content.second_above %}
<div class="layout__region layout__region--second-above">
{{ content.second_above }}
</div>
{% endif %}
<div class="layout-region layout-region--middle">
{{ content.middle }}
</div>
{% if content.middle %}
<div class="layout__region layout__region--middle">
{{ content.middle }}
</div>
{% endif %}
<div class="layout-region layout-region--left_below">
{{ content.left_below }}
</div>
{% if content.first_below %}
<div class="layout__region layout__region--first-below">
{{ content.first_below }}
</div>
{% endif %}
<div class="layout-region layout-region--right_below">
{{ content.right_below }}
</div>
{% if content.second_below %}
<div class="layout__region layout__region--second-below">
{{ content.second_below }}
</div>
{% endif %}
<div class="layout-region layout-region--fullwidth">
{{ content.bottom }}
{% if content.bottom %}
<div class="layout__region layout__region--bottom">
{{ content.bottom }}
</div>
{% endif %}
</div>
</div>
{% endif %}

24
web/core/modules/layout_discovery/layouts/twocol_bricks/twocol_bricks.css
View file

@ -1,13 +1,25 @@
/*
* @file
* Provides the layout styles for layout_twocol_bricks.
*
* @todo Using display: flex requires https://www.drupal.org/node/2842298 to be
* in before this can be marked as stable.
*/
.layout--twocol-bricks {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.layout--twocol-bricks > .layout-region {
flex: 0 1 50%;
}
.layout--twocol-bricks > .layout-region--fullwidth {
.layout--twocol-bricks > .layout__region {
flex: 0 1 100%;
}
@media screen and (min-width: 40em) {
.layout--twocol-bricks > .layout__region--first-above,
.layout--twocol-bricks > .layout__region--second-above,
.layout--twocol-bricks > .layout__region--first-below,
.layout--twocol-bricks > .layout__region--second-below {
flex: 0 1 50%;
}
}