Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

the grid.hbs file needed to be updated #608 #748

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 65 additions & 65 deletions components/base/news/news-landing-page/news-landing-page.hbs
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
<div class="b b--fw">
<div class="b-c">
{{> @section_header }}
<div class="g">
{{#each news as |new|}}
<div class="g--12 news-card m-t500">
<div class="g">
<div class="g--7 news-column">
<div class="thumb-and-title">
<div class="thumb-and-flag">
<svg
class="svg-date-flag n--a-date-flag"
id="Layer_1"
data-name="Layer 1"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 34.08 44.31"
>
<title>{{new.date}}</title>
<path
d="M32.26,42.16l-15.3-7-15.3,7v-40h30.6Z"
fill="#ffffff"
stroke="#ECECEC"
stroke-miterlimit="10"
/>
</svg>
<div class="b-c">
{{> @section_header }}
<div class="g">
{{#each news as |new|}}
<div class="g--12 news-card m-t500">
<div class="g">
<div class="g--7 news-column">
<div class="thumb-and-title">
<div class="thumb-and-flag">
<svg
class="svg-date-flag n--a-date-flag"
id="Layer_1"
data-name="Layer 1"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 34.08 44.31"
>
<title>{{new.date}}</title>
<path
d="M32.26,42.16l-15.3-7-15.3,7v-40h30.6Z"
fill="#ffffff"
stroke="#ECECEC"
stroke-miterlimit="10"
/>
</svg>

<p
class="svg-date-flag n--a-date-flag-text date-flag-text"
>
{{new.date}}
</p>
<p
class="svg-date-flag n--a-date-flag-text date-flag-text"
>
{{new.date}}
</p>

<div class="g--12">
<div class="news-card--thumb-wrapper">
<img
src="{{new.image.url}}"
alt="{{new.title}}"
typeof="foaf:Image"
/>
</div>
<div class="g--12">
<div class="news-card--thumb-wrapper">
<img
src="{{new.image.url}}"
alt="{{new.title}}"
typeof="foaf:Image"
/>
</div>
</div>
</div>

<div class="news-column--left">
<h3 class="title">
<a href="{{new.href}}">{{new.title}}</a>
<span class="news_positon">{{new.position}}</span>
</h3>
</div>
<div class="news-column--left">
<h3 class="title">
<a href="{{new.href}}">{{new.title}}</a>
<span class="news_positon">{{new.position}}</span>
</h3>
</div>
</div>
</div>

<div class="g--5 news-column--right">
<div class="g">
<div class="g--12 optional-news-layout">
<div class="intro-text">
<p>{{new.description}}</p>
</div>
<div class="g--5 news-column--right">
<div class="g">
<div class="g--12 optional-news-layout">
<div class="intro-text">
<p>{{new.description}}</p>
</div>

<div class="icon-wrapper">
<div class="di">
<div class="di-ic">
<a
href="/departments/innovation-and-technology" title="Innovation and Technology" class="di-a di-tt"
>
<img
typeof="foaf:Image"
src="/images/b-dark.svg" alt="Innovation and Technology" class="di-i"
/>
</a>
</div>
<div class="icon-wrapper">
<div class="di">
<div class="di-ic">
<a
href="/departments/innovation-and-technology" title="Innovation and Technology" class="di-a di-tt"
>
<img
typeof="foaf:Image"
src="/images/b-dark.svg" alt="Innovation and Technology" class="di-i"
/>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{{/each}}
</div>
</div>
</div>
</div>
{{/each}}
</div>
</div>
</div>
32 changes: 16 additions & 16 deletions components/layout/grid/grid.hbs
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<div class="g{{#if variant}} {{variant}}{{/if}}">
<div class="g--12 m-b300">12 Columns</div>
<div class="g--12 m-b100 m--full">12 Columns</div>
</div>

<div class="g{{#if variant}} {{variant}}{{/if}}">
<div class="g--9 m-b300">1: 9 Columns</div>
<div class="g--3 m-b300">2: 3 Columns</div>
<div class="g--9 m-b100 m--full m--half">1: 9 Columns</div>
<div class="g--3 m-b100 m--full m--half">2: 3 Columns</div>
</div>

<div class="g{{#if variant}} {{variant}}{{/if}}">
<div class="g--8 m-b300">1: 8 Columns</div>
<div class="g--4 m-b300">2: 4 Columns</div>
<div class="g--8 m-b100 m--full m--half">1: 8 Columns</div>
<div class="g--4 m-b100 m--full m--half">2: 4 Columns</div>
</div>

<div class="g{{#if variant}} {{variant}}{{/if}}">
<div class="g--7 m-b300">1: 7 Columns</div>
<div class="g--5 m-b300">2: 5 Columns</div>
<div class="g--7 m-b100 m--full m--half">1: 7 Columns</div>
<div class="g--5 m-b100 m--full m--half">2: 5 Columns</div>
</div>

<div class="g{{#if variant}} {{variant}}{{/if}}">
<div class="g--6 m-b300">1: 6 Columns</div>
<div class="g--6 m-b300">2: 6 Columns</div>
<div class="g--6 m-b100 m--full m--half">1: 6 Columns</div>
<div class="g--6 m-b100 m--full m--half">2: 6 Columns</div>
</div>

<div class="g{{#if variant}} {{variant}}{{/if}}">
<div class="g--4 m-b300">1: 4 Columns</div>
<div class="g--4 m-b300">2: 4 Columns</div>
<div class="g--4 m-b300">3: 4 Columns</div>
<div class="g--4 m-b100 m--full m--half">1: 4 Columns</div>
<div class="g--4 m-b100 m--full m--half">2: 4 Columns</div>
<div class="g--4 m-b100 m--full m--half">3: 4 Columns</div>
</div>

<div class="g{{#if variant}} {{variant}}{{/if}}">
<div class="g--3 m-b300">1: 3 Columns</div>
<div class="g--3 m-b300">2: 3 Columns</div>
<div class="g--3 m-b300">3: 3 Columns</div>
<div class="g--3 m-b300">4: 3 Columns</div>
<div class="g--3 m-b100 m--full m--half">1: 3 Columns</div>
<div class="g--3 m-b100 m--full m--half">2: 3 Columns</div>
<div class="g--3 m-b100 m--full m--half">3: 3 Columns</div>
<div class="g--3 m-b100 m--full m--half">4: 3 Columns</div>
</div>
Loading