Skip to content
Snippets Groups Projects
Verified Commit 416ef9d7 authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Issue #3262156 by finnsky, kostyashupenko, ranjith_kumar_k_u, gauravvvv,... 

Issue #3262156 by finnsky, kostyashupenko, ranjith_kumar_k_u, gauravvvv, nayana_mvr, pradipmodh13, libbna: Olivero: Simplification of the grid layouts to use CSS grid (instead of Flexbox)

(cherry picked from commit 0ba8488d)
parent 9dd57075
Branches
Tags
5 merge requests!122353526426-warning-for-missing,!11958Issue #3490507 by alexpott, smustgrave: Fix bogus mocking in...,!11769Issue #3517987: Add option to contextual filters to encode slashes in query parameter.,!11185Issue #3477324 by andypost, alexpott: Fix usage of str_getcsv() and fgetcsv() for PHP 8.4,!9944Issue #3483353: Consider making the createCopy config action optionally fail...
Pipeline #304939 passed with warnings
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#304968

    Pipeline: drupal

    #304964

      Pipeline: drupal

      #304958

        +1
        Hide whitespace changes
        Inline Side-by-side
        Showing
        with 99 additions and 301 deletions
        core/themes/olivero/css/layout/layout-builder-fourcol-section.css
        + 7
        − 49
        View file @ 416ef9d7
        ...@@ -11,65 +11,23 @@ ...@@ -11,65 +11,23 @@
        */ */
        .layout--fourcol-section { .layout--fourcol-section {
        display: flex; display: grid;
        flex-wrap: wrap; gap: var(--grid-gap);
        } grid-template-columns: var(--layout-fourcol-grid);
        .layout--fourcol-section > .layout__region {
        flex: 1 0 100%;
        margin-block-end: var(--grid-gap);
        }
        @media (min-width: 43.75rem) {
        .layout--fourcol-section > .layout__region {
        flex-basis: calc(50% - (var(--grid-gap) * 0.5));
        flex-grow: 0;
        flex-shrink: 0;
        margin-block-end: 0;
        }
        } }
        /* Two column layout. */ /* Two column layout. */
        @media (min-width: 43.75rem) { @media (min-width: 43.75rem) {
        .layout--fourcol-section > .layout__region--first, .layout--fourcol-section {
        .layout--fourcol-section > .layout__region--second { --layout-fourcol-grid: repeat(2, minmax(0, 1fr));
        margin-block-end: var(--grid-gap);
        }
        .layout--fourcol-section > .layout__region--first,
        .layout--fourcol-section > .layout__region--third {
        margin-inline-end: calc(var(--grid-gap) * 0.5);
        }
        .layout--fourcol-section > .layout__region--second,
        .layout--fourcol-section > .layout__region--fourth {
        margin-inline-start: calc(var(--grid-gap) * 0.5);
        } }
        } }
        /* Four column layout. */ /* Four column layout. */
        @media (min-width: 62.5rem) { @media (min-width: 62.5rem) {
        .layout--fourcol-section > .layout__region { .layout--fourcol-section {
        flex-basis: calc(25% - (var(--grid-gap) * 0.75)); --layout-fourcol-grid: repeat(4, minmax(0, 1fr));
        }
        .layout--fourcol-section > .layout__region--first,
        .layout--fourcol-section > .layout__region--second {
        margin-block-end: 0;
        }
        .layout--fourcol-section > .layout__region--first {
        margin-inline-end: calc(var(--grid-gap) * 0.5);
        }
        .layout--fourcol-section > .layout__region--second,
        .layout--fourcol-section > .layout__region--third {
        margin-inline: calc(var(--grid-gap) * 0.5);
        }
        .layout--fourcol-section > .layout__region--fourth {
        margin-inline-start: calc(var(--grid-gap) * 0.5);
        } }
        } }
        core/themes/olivero/css/layout/layout-builder-fourcol-section.pcss.css
        + 13
        − 53
        View file @ 416ef9d7
        ...@@ -6,61 +6,21 @@ ...@@ -6,61 +6,21 @@
        @import "../base/media-queries.pcss.css"; @import "../base/media-queries.pcss.css";
        .layout--fourcol-section { .layout--fourcol-section {
        display: flex; display: grid;
        flex-wrap: wrap; gap: var(--grid-gap);
        grid-template-columns: var(--layout-fourcol-grid);
        & > .layout__region { }
        flex: 1 0 100%;
        margin-block-end: var(--grid-gap);
        @media (--md) {
        flex-basis: calc(50% - (var(--grid-gap) * 0.5));
        flex-grow: 0;
        flex-shrink: 0;
        margin-block-end: 0;
        }
        }
        /* Two column layout. */
        @media (--md) {
        & > .layout__region--first,
        & > .layout__region--second {
        margin-block-end: var(--grid-gap);
        }
        & > .layout__region--first,
        & > .layout__region--third {
        margin-inline-end: calc(var(--grid-gap) * 0.5);
        }
        & > .layout__region--second, /* Two column layout. */
        & > .layout__region--fourth { @media (--md) {
        margin-inline-start: calc(var(--grid-gap) * 0.5); .layout--fourcol-section {
        } --layout-fourcol-grid: repeat(2, minmax(0, 1fr));
        } }
        }
        /* Four column layout. */ /* Four column layout. */
        @media (--lg) { @media (--lg) {
        & > .layout__region { .layout--fourcol-section {
        flex-basis: calc(25% - (var(--grid-gap) * 0.75)); --layout-fourcol-grid: repeat(4, minmax(0, 1fr));
        }
        & > .layout__region--first,
        & > .layout__region--second {
        margin-block-end: 0;
        }
        & > .layout__region--first {
        margin-inline-end: calc(var(--grid-gap) * 0.5);
        }
        & > .layout__region--second,
        & > .layout__region--third {
        margin-inline: calc(var(--grid-gap) * 0.5);
        }
        & > .layout__region--fourth {
        margin-inline-start: calc(var(--grid-gap) * 0.5);
        }
        } }
        } }
        core/themes/olivero/css/layout/layout-builder-threecol-section.css
        + 22
        − 44
        View file @ 416ef9d7
        ...@@ -11,62 +11,40 @@ ...@@ -11,62 +11,40 @@
        */ */
        .layout--threecol-section { .layout--threecol-section {
        display: flex; display: grid;
        flex-wrap: wrap; gap: var(--grid-gap);
        grid-template-columns: var(--layout-threecol-grid);
        } }
        .layout--threecol-section > .layout__region { .layout--threecol-section > .layout__region--first {
        flex: 1 0 100%; grid-column: var(--layout-threecol-grid__first);
        margin-block-end: var(--grid-gap);
        } }
        @media (min-width: 62.5rem) { .layout--threecol-section > .layout__region--second {
        .layout--threecol-section > .layout__region { grid-column: var(--layout-threecol-grid__second);
        flex-grow: 0;
        flex-shrink: 0;
        margin-block-end: 0;
        }
        } }
        @media (min-width: 62.5rem) { .layout--threecol-section > .layout__region--third {
        .layout--threecol-section > .layout__region--first { grid-column: var(--layout-threecol-grid__third);
        margin-inline-end: calc(var(--grid-gap) * 0.5); }
        }
        .layout--threecol-section > .layout__region--second {
        margin-inline: calc(var(--grid-gap) * 0.5);
        }
        .layout--threecol-section > .layout__region--third { @media (min-width: 62.5rem) {
        margin-inline-start: calc(var(--grid-gap) * 0.5); .layout--threecol-section--25-50-25 {
        } --layout-threecol-grid: repeat(4, minmax(0, 1fr));
        .layout--threecol-section--25-50-25 > .layout__region--first, --layout-threecol-grid__second: span 2;
        .layout--threecol-section--25-50-25 > .layout__region--third {
        flex-basis: calc(25% - (var(--grid-gap) * 0.5));
        } }
        .layout--threecol-section--25-50-25 > .layout__region--second { .layout--threecol-section--25-25-50 {
        flex-basis: calc(50% - var(--grid-gap)); --layout-threecol-grid: repeat(4, minmax(0, 1fr));
        } --layout-threecol-grid__third: span 2;
        .layout--threecol-section--25-25-50 > .layout__region--first,
        .layout--threecol-section--25-25-50 > .layout__region--second {
        flex-basis: calc(25% - (var(--grid-gap) * 0.5));
        } }
        .layout--threecol-section--25-25-50 > .layout__region--third { .layout--threecol-section--50-25-25 {
        flex-basis: calc(50% - var(--grid-gap)); --layout-threecol-grid: repeat(4, minmax(0, 1fr));
        } --layout-threecol-grid__first: span 2;
        .layout--threecol-section--50-25-25 > .layout__region--first {
        flex-basis: calc(50% - var(--grid-gap));
        } }
        .layout--threecol-section--50-25-25 > .layout__region--second, .layout--threecol-section--33-34-33 {
        .layout--threecol-section--50-25-25 > .layout__region--third { --layout-threecol-grid: repeat(3, minmax(0, 1fr));
        flex-basis: calc(25% - (var(--grid-gap) * 0.5));
        }
        .layout--threecol-section--33-34-33 > .layout__region--first,
        .layout--threecol-section--33-34-33 > .layout__region--second,
        .layout--threecol-section--33-34-33 > .layout__region--third {
        flex-basis: calc(33.33% - (var(--grid-gap) * 0.667));
        } }
        } }
        core/themes/olivero/css/layout/layout-builder-threecol-section.pcss.css
        + 19
        − 53
        View file @ 416ef9d7
        ...@@ -6,74 +6,40 @@ ...@@ -6,74 +6,40 @@
        @import "../base/media-queries.pcss.css"; @import "../base/media-queries.pcss.css";
        .layout--threecol-section { .layout--threecol-section {
        display: flex; display: grid;
        flex-wrap: wrap; gap: var(--grid-gap);
        grid-template-columns: var(--layout-threecol-grid);
        & > .layout__region { & > .layout__region--first {
        flex: 1 0 100%; grid-column: var(--layout-threecol-grid__first);
        margin-block-end: var(--grid-gap);
        @media (--lg) {
        flex-grow: 0;
        flex-shrink: 0;
        margin-block-end: 0;
        }
        } }
        }
        @media (--lg) { & > .layout__region--second {
        .layout--threecol-section { grid-column: var(--layout-threecol-grid__second);
        & > .layout__region--first { }
        margin-inline-end: calc(var(--grid-gap) * 0.5);
        }
        & > .layout__region--second {
        margin-inline: calc(var(--grid-gap) * 0.5);
        }
        & > .layout__region--third { & > .layout__region--third {
        margin-inline-start: calc(var(--grid-gap) * 0.5); grid-column: var(--layout-threecol-grid__third);
        }
        } }
        }
        @media (--lg) {
        .layout--threecol-section--25-50-25 { .layout--threecol-section--25-50-25 {
        & > .layout__region--first, --layout-threecol-grid: repeat(4, minmax(0, 1fr));
        & > .layout__region--third { --layout-threecol-grid__second: span 2;
        flex-basis: calc(25% - (var(--grid-gap) * 0.5));
        }
        & > .layout__region--second {
        flex-basis: calc(50% - var(--grid-gap));
        }
        } }
        .layout--threecol-section--25-25-50 { .layout--threecol-section--25-25-50 {
        & > .layout__region--first, --layout-threecol-grid: repeat(4, minmax(0, 1fr));
        & > .layout__region--second { --layout-threecol-grid__third: span 2;
        flex-basis: calc(25% - (var(--grid-gap) * 0.5));
        }
        & > .layout__region--third {
        flex-basis: calc(50% - var(--grid-gap));
        }
        } }
        .layout--threecol-section--50-25-25 { .layout--threecol-section--50-25-25 {
        & > .layout__region--first { --layout-threecol-grid: repeat(4, minmax(0, 1fr));
        flex-basis: calc(50% - var(--grid-gap)); --layout-threecol-grid__first: span 2;
        }
        & > .layout__region--second,
        & > .layout__region--third {
        flex-basis: calc(25% - (var(--grid-gap) * 0.5));
        }
        } }
        .layout--threecol-section--33-34-33 { .layout--threecol-section--33-34-33 {
        & > .layout__region--first, --layout-threecol-grid: repeat(3, minmax(0, 1fr));
        & > .layout__region--second,
        & > .layout__region--third {
        flex-basis: calc(33.33% - (var(--grid-gap) * 0.667));
        }
        } }
        } }
        core/themes/olivero/css/layout/layout-builder-twocol-section.css
        + 21
        − 47
        View file @ 416ef9d7
        ...@@ -11,67 +11,41 @@ ...@@ -11,67 +11,41 @@
        */ */
        .layout--twocol-section { .layout--twocol-section {
        display: flex; display: grid;
        flex-wrap: wrap; gap: var(--grid-gap);
        grid-template-columns: var(--layout-twocol-grid);
        } }
        .layout--twocol-section > .layout__region { .layout--twocol-section > .layout__region--first {
        flex: 1 0 100%; grid-column: var(--layout-twocol-grid__first);
        margin-block-end: var(--grid-gap);
        } }
        @media (min-width: 43.75rem) { .layout--twocol-section > .layout__region--second {
        .layout--twocol-section > .layout__region { grid-column: var(--layout-twocol-grid__second);
        flex-grow: 0;
        flex-shrink: 0;
        margin-block-end: 0;
        }
        } }
        @media (min-width: 43.75rem) { @media (min-width: 43.75rem) {
        .layout--twocol-section--50-50 > .layout__region--first { .layout--twocol-section--50-50 {
        flex-basis: calc(50% - (var(--grid-gap) * 0.5)); --layout-twocol-grid: repeat(2, minmax(0, 1fr));
        margin-inline-end: calc(var(--grid-gap) * 0.5);
        }
        .layout--twocol-section--50-50 > .layout__region--second {
        flex-basis: calc(50% - (var(--grid-gap) * 0.5));
        margin-inline-start: calc(var(--grid-gap) * 0.5);
        }
        .layout--twocol-section--33-67 > .layout__region--first {
        flex-basis: calc(33.33% - (var(--grid-gap) * 0.3333));
        margin-inline-end: calc(var(--grid-gap) * 0.3333);
        } }
        .layout--twocol-section--33-67 > .layout__region--second { .layout--twocol-section--33-67 {
        flex-basis: calc(66.66% - (var(--grid-gap) * 0.6666)); --layout-twocol-grid: repeat(3, minmax(0, 1fr));
        margin-inline-start: calc(var(--grid-gap) * 0.6666); --layout-twocol-grid__second: span 2;
        }
        .layout--twocol-section--67-33 > .layout__region--first {
        flex-basis: calc(66.66% - (var(--grid-gap) * 0.6666));
        margin-inline-end: calc(var(--grid-gap) * 0.6666);
        } }
        .layout--twocol-section--67-33 > .layout__region--second { .layout--twocol-section--67-33 {
        flex-basis: calc(33.33% - (var(--grid-gap) * 0.3333)); --layout-twocol-grid: repeat(3, minmax(0, 1fr));
        margin-inline-start: calc(var(--grid-gap) * 0.3333); --layout-twocol-grid__first: span 2;
        }
        .layout--twocol-section--25-75 > .layout__region--first {
        flex-basis: calc(25% - (var(--grid-gap) * 0.25));
        margin-inline-end: calc(var(--grid-gap) * 0.25);
        } }
        .layout--twocol-section--25-75 > .layout__region--second { .layout--twocol-section--25-75 {
        flex-basis: calc(75% - (var(--grid-gap) * 0.75)); --layout-twocol-grid: repeat(4, minmax(0, 1fr));
        margin-inline-start: calc(var(--grid-gap) * 0.75); --layout-twocol-grid__second: span 3;
        }
        .layout--twocol-section--75-25 > .layout__region--first {
        flex-basis: calc(75% - (var(--grid-gap) * 0.75));
        margin-inline-end: calc(var(--grid-gap) * 0.75);
        } }
        .layout--twocol-section--75-25 > .layout__region--second { .layout--twocol-section--75-25 {
        flex-basis: calc(25% - (var(--grid-gap) * 0.25)); --layout-twocol-grid: repeat(4, minmax(0, 1fr));
        margin-inline-start: calc(var(--grid-gap) * 0.25); --layout-twocol-grid__first: span 3;
        } }
        } }
        core/themes/olivero/css/layout/layout-builder-twocol-section.pcss.css
        + 17
        − 55
        View file @ 416ef9d7
        ...@@ -6,79 +6,41 @@ ...@@ -6,79 +6,41 @@
        @import "../base/media-queries.pcss.css"; @import "../base/media-queries.pcss.css";
        .layout--twocol-section { .layout--twocol-section {
        display: flex; display: grid;
        flex-wrap: wrap; gap: var(--grid-gap);
        grid-template-columns: var(--layout-twocol-grid);
        & > .layout__region { & > .layout__region--first {
        flex: 1 0 100%; grid-column: var(--layout-twocol-grid__first);
        margin-block-end: var(--grid-gap); }
        @media (--md) { & > .layout__region--second {
        flex-grow: 0; grid-column: var(--layout-twocol-grid__second);
        flex-shrink: 0;
        margin-block-end: 0;
        }
        } }
        } }
        @media (--md) { @media (--md) {
        .layout--twocol-section--50-50 { .layout--twocol-section--50-50 {
        & > .layout__region--first { --layout-twocol-grid: repeat(2, minmax(0, 1fr));
        flex-basis: calc(50% - (var(--grid-gap) * 0.5));
        margin-inline-end: calc(var(--grid-gap) * 0.5);
        }
        & > .layout__region--second {
        flex-basis: calc(50% - (var(--grid-gap) * 0.5));
        margin-inline-start: calc(var(--grid-gap) * 0.5);
        }
        } }
        .layout--twocol-section--33-67 { .layout--twocol-section--33-67 {
        & > .layout__region--first { --layout-twocol-grid: repeat(3, minmax(0, 1fr));
        flex-basis: calc(33.33% - (var(--grid-gap) * 0.3333)); --layout-twocol-grid__second: span 2;
        margin-inline-end: calc(var(--grid-gap) * 0.3333);
        }
        & > .layout__region--second {
        flex-basis: calc(66.66% - (var(--grid-gap) * 0.6666));
        margin-inline-start: calc(var(--grid-gap) * 0.6666);
        }
        } }
        .layout--twocol-section--67-33 { .layout--twocol-section--67-33 {
        & > .layout__region--first { --layout-twocol-grid: repeat(3, minmax(0, 1fr));
        flex-basis: calc(66.66% - (var(--grid-gap) * 0.6666)); --layout-twocol-grid__first: span 2;
        margin-inline-end: calc(var(--grid-gap) * 0.6666);
        }
        & > .layout__region--second {
        flex-basis: calc(33.33% - (var(--grid-gap) * 0.3333));
        margin-inline-start: calc(var(--grid-gap) * 0.3333);
        }
        } }
        .layout--twocol-section--25-75 { .layout--twocol-section--25-75 {
        & > .layout__region--first { --layout-twocol-grid: repeat(4, minmax(0, 1fr));
        flex-basis: calc(25% - (var(--grid-gap) * 0.25)); --layout-twocol-grid__second: span 3;
        margin-inline-end: calc(var(--grid-gap) * 0.25);
        }
        & > .layout__region--second {
        flex-basis: calc(75% - (var(--grid-gap) * 0.75));
        margin-inline-start: calc(var(--grid-gap) * 0.75);
        }
        } }
        .layout--twocol-section--75-25 { .layout--twocol-section--75-25 {
        & > .layout__region--first { --layout-twocol-grid: repeat(4, minmax(0, 1fr));
        flex-basis: calc(75% - (var(--grid-gap) * 0.75)); --layout-twocol-grid__first: span 3;
        margin-inline-end: calc(var(--grid-gap) * 0.75);
        }
        & > .layout__region--second {
        flex-basis: calc(25% - (var(--grid-gap) * 0.25));
        margin-inline-start: calc(var(--grid-gap) * 0.25);
        }
        } }
        } }
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment