24ee601 · urbit.org · git.iko.soy

git.iko.soy/urbit.org

Merge pull request #249 from urbit/chore/essay-grid

Simplify essay and UU grid

commit24ee601e1152723cabca7a0d85e0e4c6ebcb8ff5 authorMatilde Park <matilde@tlon.io> dateMon 21 Oct 2019, 10:50 (7 years ago) parent5df5e28 96049f2

9 files changed+27−45

compare with master

unifiedsplit

sass/_main.scss−4 sass/_responsive.scss−9 templates/doc.html+1−1 templates/essays/post.html+17−17 templates/sections/docs.html+1−1 templates/sections/docs/chapters.html+1−1 templates/shortcodes/full.html−3 templates/shortcodes/oversize.html−3 templates/understanding-urbit/post.html+7−6

sass/_main.scss−4

@@ -189,10 +189,6 @@ body.essay {

189189 display: block;

190190 // margin: 0 auto;

191191 }

192− article > *:not(figure):not(picture) {

193− grid-area: auto / 4 / auto / 10;

194− @extend .measure-wide;

195− }

196192}

197193

198194// components

sass/_responsive.scss−9

@@ -11,15 +11,6 @@

1111 }

1212}

1313

14−// scaling below desktop

15−@media all and (max-width: 60em) {

16− body.essay {

17− article > *:not(figure):not(picture) {

18− grid-area: auto / 1 / auto / 12;

19− }

20− }

21−}

22−

2314// custom L breakpoint classes

2415@media screen and (min-width: 46.875em) and (max-width: 60em) {

2516 .white-l {

templates/doc.html+1−1

@@ -5,7 +5,7 @@

55

66

77{% include "partials/navigation-docs.html" %}

8−<article class="mt4 mb6 c1-12 c5-10-md c4-10-lg">

8+<article class="mt4 mb6 full c5-10-md c4-10-lg">

99

1010 <h1>{{ page.title }}</h1>

1111

templates/essays/post.html+17−17

@@ -25,25 +25,25 @@

2525

2626 {% include "partials/navigation-search.html" %}

2727</nav>

28−<section class="full c4-12-lg">

29−<h1 class="mb2 mt4 fw6">{{ page.title }}</h1>

30−{% if page.extra.author %}

31−<span class="dib" rel="author"> {{ page.extra.author }}

32− {% if page.extra.ship %}

33− <address class="dib fw4 ml2 mono">{{ page.extra.ship }}</address>

34−{% endif %}

35−</span>

36−{% if page.date %}

37− <time class="mono db mv2 gray0 f5">{{page.date | date(format="~%Y.%-m.%-d") }}</time>

38−{% endif %}

39−{% endif %}

40−{% if page.extra.readtime %}

41−<span class="dib mono {% if page.date %} ml2{% endif %} gray2 f5">{{ page.reading_time }}m read</span>

42−{% endif %}

43−</section>

4428

45−<article class="mb4 full grid12">

29+<article class="mb4 measure-wide full c4-12-lg">

30+ <h1 class="mb2 mt4 fw6">{{ page.title }}</h1>

31+ {% if page.extra.author %}

32+ <span class="dib" rel="author"> {{ page.extra.author }}

33+ {% if page.extra.ship %}

34+ <address class="dib fw4 ml2 mono">{{ page.extra.ship }}</address>

35+ {% endif %}

36+ </span>

37+ {% if page.date %}

38+ <time class="mono db gray0 f5">{{page.date | date(format="~%Y.%-m.%-d") }}</time>

39+ {% endif %}

40+ {% endif %}

41+ {% if page.extra.readtime %}

42+ <span class="dib mono {% if page.date %} ml2{% endif %} gray2 f5">{{ page.reading_time }}m read</span>

43+ {% endif %}

44+

4645 {{ page.content | safe }}

46+

4747 {% include "partials/pagination.html" %}

4848</article>

4949{% endblock content %}

templates/sections/docs.html+1−1

@@ -5,7 +5,7 @@

55

66

77{% include "partials/navigation-docs.html" %}

8−<article class="mt4 mb6 c1-12 c5-10-md c4-10-lg">

8+<article class="mt4 mb6 full c5-10-md c4-10-lg">

99

1010 <h1>{{ section.title }}</h1>

1111

templates/sections/docs/chapters.html+1−1

@@ -4,7 +4,7 @@

44

55

66{% include "partials/navigation-docs.html" %}

7−<article class="mt4 mb6 c1-12 c5-10-md c4-10-lg">

7+<article class="mt4 mb6 full c5-10-md c4-10-lg">

88

99<h1>{{ section.title }}</h1>

1010

templates/shortcodes/full.htmldeleted−3

@@ -1,3 +0,0 @@

1−<figure class="full full-bleed">

2− <img src="{{url}}"/>

3−</figure>

templates/shortcodes/oversize.htmldeleted−3

@@ -1,3 +0,0 @@

1−<figure class="c1-12 mt4 mb4 c3-11-lg">

2− <img src="{{url}}"/>

3−</figure>

templates/understanding-urbit/post.html+7−6

@@ -34,22 +34,23 @@

3434 {% endif %}

3535 {% endfor %}

3636</nav>

37− <h1 class="mb4 full mt4 c4-12-lg">{{ page.title }}</h1>

37+

38+ <article class="mb4 full c4-12-lg measure-wide">

39+ <h1 class="mb4 mt4">{{ page.title }}</h1>

3840 {% if page.extra.author %}

39− <span class="dib full c4-12-lg" rel="author"> {{ page.extra.author }}

41+ <span class="dib" rel="author"> {{ page.extra.author }}

4042 {% if page.extra.ship %}

4143 <address class="dib fw4 ml2 mono">{{ page.extra.ship }}</address>

4244 {% endif %}

4345 </span>

4446 {% if page.date %}

45− <time class="mono full c4-12-lg db mv2 gray0 f5">{{page.date | date(format="~%Y.%-m.%-d") }}</time>

47+ <time class="mono db mv0 gray0 f5">{{page.date | date(format="~%Y.%-m.%-d") }}</time>

4648 {% endif %}

4749{% endif %}

4850 {% if page.extra.readtime %}

49− <span class="dib mono full c4-12-lg{% if page.date %} ml2{% endif %} gray2 f5">{{ page.reading_time }}m read</span>

51+ <span class="dib mono{% if page.date %} ml2{% endif %} gray2 f5">{{ page.reading_time }}m read</span>

5052 {% endif %}

51−

52− <article class="mb4 full grid12">

53+

5354 {{ page.content | safe }}

5455

5556 {% include "partials/pagination.html" %}