Skip to content

Commit

Permalink
Launched Version
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamescgarrett
jamescgarrett committed Sep 28, 2016
1 parent 2d95610 commit c23e614
Show file tree
Hide file tree
Showing 9 changed files with 307 additions and 719 deletions.
12 changes: 7 additions & 5 deletions _craftcms/templates/index.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<div class="page">

<div class="page-section page-section--full row row--middle row--center row--nomargin">

<div class="currentCode col--12 col--6sm">
<div class="page-currentCode page-currentCode--full row row--middle row--center row--nomargin">
<div class="col--12 col--7sm col--5md col--4lg">
<div class="col--7 col--5md col--4lg">
{% include '_includes/current-code' %}
</div>
</div>
</div>
<div class="col--12 col--6sm">

<div class="col--12 col--6sm col--first col--lastsm">
<div class="page-textColumn page-textColumn--full row row--middle row--center row--nomargin">
<div class="col--7">
<div class="page-textColumn-header">
Expand All @@ -26,7 +28,7 @@
{% cache unless not craft.config.cache %}
{% for post in craft.entries.section('work') %}
<div class="page-section page-section--middle row row--nomargin">
<div class="col--12 col--6sm{%if loop.index is even %} col--lastsm{% endif %}">
<div class="col--12 col--6sm{%if loop.index is even %} col--last{% endif %} page-textColumn-container">
<div class="page-textColumn page-textColumn--medium row row--middle row--center row--nomargin">
<div class="col--7">
<div class="page-textColumn-header">
Expand All @@ -40,9 +42,9 @@
</div>
</div>
</div>
<div class="col--12 col--6sm{%if loop.index is even %} col--firstsm{% endif %}">
<div class="col--12 col--6sm{%if loop.index is even %} col--first{% endif %} page-imageColumn-container">
<div class="page-imageColumn page-imageColumn--medium page-imageColumn--{{macros.lowercase_replace_space(post.title)}} row row--center row--middle row--nomargin">
<div class="col--12 col--8sm">
<div class="col--10 col--6xs col--8sm">
<div class="page-imageColumn-image">
{% set image = post.thumbnail.first() %}
{% if image %}
Expand Down
12 changes: 6 additions & 6 deletions _craftcms/templates/page/_entry.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
{% cache unless not craft.config.cache %}
<div class="page">
<div class="page-section page-section--small row row--middle row--center row--nomargin">
<div class="currentCode col--12 col--6sm">
<div class="currentCode currentCode--small col--12 col--6sm">
<div class="page-currentCode page-currentCode--small row row--middle row--center row--nomargin">
<div class="col--12 col--7sm col--5md col--4lg">
<div class="col--7 col--5md col--4lg">
{% include '_includes/current-code' %}
</div>
</div>
</div>
<div class="col--12 col--6sm">
<div class="col--12 col--6sm col--first col--lastsm">
<div class="page-textColumn page-textColumn--small row row--middle row--center row--nomargin">
<div class="col--7">
<div class="page-textColumn-header">
Expand All @@ -32,7 +32,7 @@

{% case 'blockBody' %}
<div class="page-textSection row row--center row--nomargin">
<div class="col--12 col--6sm">
<div class="col--10 col--6sm">
<div class="page-textSection-body">
{{block.body}}
{% if block.showSocial %}
Expand Down Expand Up @@ -75,10 +75,10 @@
<div class="page-resumeSection">
{% for section in entry.resumeSection %}
<div class="page-resumeSection-section row row--center row--nomargin">
<div class="col--3">
<div class="col--10 col--3md">
<p class="page-resumeSection-title">{{section.sectionTitle}}</p>
</div>
<div class="page-resumeSection-body col--6">
<div class="page-resumeSection-body col--10 col--6md">
{{section.body}}
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions _craftcms/templates/work/_entry.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% cache unless not craft.config.cache %}
<div class="page">
<div class="page-section page-section--full row row--nomargin">
<div class="col--12 col--6sm">
<div class="col--12 col--6sm page-imageColumn-container">
<div class="page-imageColumn page-imageColumn--full page-imageColumn--{{macros.lowercase_replace_space(entry.title)}} row row--middle row--center row--nomargin">
<div class="col--12 col--8sm">
<div class="page-imageColumn-image">
Expand Down Expand Up @@ -41,7 +41,7 @@

{% case 'blockBody' %}
<div class="page-textSection row row--center row--nomargin">
<div class="col--12 col--6sm">
<div class="col--10 col--6sm">
<div class="page-textSection-body">
{{block.body}}
</div>
Expand All @@ -51,7 +51,7 @@
{% case 'blockHalfImages' %}
<div class="page-imagesSection row row--center row--nomargin">
{% for image in block.images %}
<div class="col--12 col--6sm">
<div class="col--12 col--6sm page-imagesSection-container">
<div class="page-imagesSection-image">
{{ macros.responsive_image(image, {transformMode: 'fit' }) }}
</div>
Expand Down
22 changes: 11 additions & 11 deletions _dev/src/css/base/_grid.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
margin-bottom: var(--grid-base-row-spacing);
}


.row:last-child{ margin-bottom: 0; }

.row--marginhalf{ margin-bottom: calc( var(--grid-base-row-spacing) / 2); }
.row--nomargin{ margin-bottom: 0; }
Expand Down Expand Up @@ -137,8 +137,8 @@
.col--12{ @mixin col-size 100%; }

.col--nogutter{ padding-left: 0; padding-right: 0; }
.col--paddingright{ padding-right: var(--grid-base-gutter--double); }
.col--paddingleft{ padding-left: var(--grid-base-gutter--double); }
.col--paddingright{ padding-right: var(--grid-base-gutter--triple); }
.col--paddingleft{ padding-left: var(--grid-base-gutter--triple); }
.col--first{ @mixin col-order 0, -1; }
.col--last{ @mixin col-order 2, 1; }

Expand Down Expand Up @@ -191,8 +191,8 @@
.col--12xs{ @mixin col-size 100%; }

.col--nogutterxs{ padding-left: 0; padding-right: 0; }
.col--paddingrightxs{ padding-right: var(--grid-base-gutter--double); }
.col--paddingleftxs{ padding-left: var(--grid-base-gutter--double); }
.col--paddingrightxs{ padding-right: var(--grid-base-gutter--triple); }
.col--paddingleftxs{ padding-left: var(--grid-base-gutter--triple); }
.col--firstxs{ @mixin col-order 0, -1; }
.col--lastxs{ @mixin col-order 2, 1; }
}
Expand Down Expand Up @@ -245,8 +245,8 @@
.col--12sm{ @mixin col-size 100%; }

.col--noguttersm{ padding-left: 0; padding-right: 0; }
.col--paddingrightsm{ padding-right: var(--grid-base-gutter--double); }
.col--paddingleftsm{ padding-left: var(--grid-base-gutter--double); }
.col--paddingrightsm{ padding-right: var(--grid-base-gutter--triple); }
.col--paddingleftsm{ padding-left: var(--grid-base-gutter--triple); }
.col--firstsm{ @mixin col-order 0, -1; }
.col--lastsm{ @mixin col-order 2, 1; }
}
Expand Down Expand Up @@ -299,8 +299,8 @@
.col--12md{ @mixin col-size 100%; }

.col--noguttermd{ padding-left: 0; padding-right: 0; }
.col--paddingrightmd{ padding-right: var(--grid-base-gutter--double); }
.col--paddingleftmd{ padding-left: var(--grid-base-gutter--double); }
.col--paddingrightmd{ padding-right: var(--grid-base-gutter--triple); }
.col--paddingleftmd{ padding-left: var(--grid-base-gutter--triple); }
.col--firstmd{ @mixin col-order 0, -1; }
.col--lastmd{ @mixin col-order 2, 1; }
}
Expand Down Expand Up @@ -353,8 +353,8 @@
.col--12lg{ @mixin col-size 100%; }

.col--nogutterlg{ padding-left: 0; padding-right: 0; }
.col--paddingrightlg{ padding-right: var(--grid-base-gutter--double); }
.col--paddingleftlg{ padding-left: var(--grid-base-gutter--double); }
.col--paddingrightlg{ padding-right: var(--grid-base-gutter--triple); }
.col--paddingleftlg{ padding-left: var(--grid-base-gutter--triple); }
.col--firstlg{ @mixin col-order 0, -1; }
.col--lastlg{ @mixin col-order 2, 1; }
}
14 changes: 13 additions & 1 deletion _dev/src/css/components/_current-code.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
background-image: url('https://source.unsplash.com/collection/134120/1200x1400');
}

.currentCode--small{
display: none;

@media (--screen-sm-min) {
display: block;
}
}

.currentCode p{
margin: 0;

Expand All @@ -25,5 +33,9 @@ p.currentCode-text{
p.currentCode-title{
margin-bottom: 10px;

font-size: 3.6rem;
font-size: 2.6rem;

@media (--screen-sm-min) {
font-size: 3.6rem;
}
}
Loading

0 comments on commit c23e614

Please sign in to comment.