futuro 0.7.9 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/html/overlay/wrap.liquid +1 -1
  3. data/_includes/html/page/layout/empty.liquid +2 -0
  4. data/_layouts/feed.html +14 -51
  5. data/_layouts/single.html +4 -77
  6. data/_sass/_site.scss +3 -7
  7. data/_sass/area/topbar.scss +3 -3
  8. data/_sass/helpers/extends/layout.scss +2 -2
  9. data/_sass/helpers/variables.scss +9 -0
  10. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 410ef74e5a33d26ad64ad9e1cebc8855e892c5fbcb103c818a86846b67cc433f
4
- data.tar.gz: 7b958de1aaebc86f7f42d2303f47064795a115d16c0f3dae05e908af07997de1
3
+ metadata.gz: 51c6f665359ff0c3a0cb6f4517ad61898b73a761ed46be6b5a1278fdc2687e2d
4
+ data.tar.gz: 6465e46e0dbda84dc039747bc7bb6591db3b7f8cf2bf974389c72cf2d3b5bea5
5
5
  SHA512:
6
- metadata.gz: f850ff91fd828d6292dbace7588d0067405905ff6a08d5be7c86535843bda4284e24387cde2f522a25bde9fb1a9a66110366aa0bd50e925278fbc962454c49ca
7
- data.tar.gz: 961cfe2a55ee316282bcbd48d9ed7b5fbd900253a938148252b52e7ca3b41ca076a50010685b1a65eae1df84fda5798be5080cd4f38b3d941ff1f379a8d01a93
6
+ metadata.gz: e4b9b4404d0e3115a4b43509401d1404a4871eaed8e52810ae6d701e2740d97cbfd9025bece7d67f0f16f432dd59dd0669c454e74cd2df2ab035b607db049a2e
7
+ data.tar.gz: cf3862c5e08c75de6967c325a0cc1b868fb6b9204f7912b7710cdbbece470e6dc34f88118e2a65bc4a8fb02e87c535cb3fc5ba71bd76ab53178ef78ff0de5f6f
data/_includes/html/overlay/wrap.liquid CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  {% assign IncludeTitle = include.title | downcase %}
3
3
 
4
- <div class="area {{ IncludeTitle | prepend : 'overlay-' }} {% if SiteIsLegacy %}legacy{% endif %}" {% if include.state %} style="display:{{ site.setup.display }};" {% endif %}>
4
+ <div class="area {{ IncludeTitle | prepend : 'overlay-' }} {% if SiteIsLegacy %}legacy{% endif %}" {% if include.init %} style="display:{{ site.setup.display }};" {% endif %}>
5
5
 
6
6
  {%- unless include.exit == "false" -%}
7
7
 
data/_includes/html/page/layout/empty.liquid ADDED
@@ -0,0 +1,2 @@
1
+
2
+ {{ page.content | markdownify }}
data/_layouts/feed.html CHANGED
@@ -2,67 +2,30 @@
2
2
  layout: mini
3
3
  ---
4
4
 
5
- {% include html/assign/site.liquid %}
5
+ {%- include html/assign/site.liquid -%}
6
6
 
7
- <!DOCTYPE html>
7
+ {%- include {{ SiteLayout | append : 'header.liquid' }} type="feed" -%}
8
8
 
9
- <html lang="{{ page.lang | default: site.lang | default: 'en' }}" class="no-js">
9
+ {%- if LayoutIsBook -%}
10
10
 
11
- {% include html/head/meta.liquid %}
11
+ {%- assign loop = site[page.collection] | sort: 'weight' -%}
12
12
 
13
- <body class="{% if site.setup.install %}{{ SiteInstall }}{% endif %}
14
- {% if site.setup.style %}{{ SiteStyle }}{% endif %}
15
- {% if page.collection %}{{ LayoutBook }}{% endif %}
16
- {% if page.chapter %}{{ LayoutChapter }}{% endif %}
17
- {% if page.topic %}{{ LayoutTopic | prepend : 'topic-' }}{% endif %}
18
- {{ LayoutLayout }}{{ LayoutType }}">
13
+ {%- include {{ Site | append : 'scroller.liquid' }} -%}
19
14
 
20
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='load' exit='false' init=true %}
15
+ {%- include {{ SiteLayout | append : 'loop.liquid' }} type='book' -%}
21
16
 
22
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='mobile' exit='false' %}
17
+ {%- elsif LayoutIsChapter -%}
23
18
 
24
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='about' %}
19
+ {%- assign loop = site[page.collection] | where: 'chapter', page.chapter | sort: 'weight' -%}
25
20
 
26
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='browse' %}
21
+ {%- include {{ SiteLayout | append : 'loop.liquid' }} type='chapter' -%}
27
22
 
28
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='search' %}
23
+ {%- elsif LayoutIsTopic -%}
29
24
 
30
- <div class="site feed">
25
+ {%- assign loop = site[page.collection] | where: 'topic', page.topic | sort: 'weight' -%}
31
26
 
32
- {% include {{ Site | append : 'header.liquid' }} %}
27
+ {%- include {{ SiteLayout | append : 'loop.liquid' }} type='topic' chapter=page.chapter -%}
33
28
 
34
- {% include {{ SitePage | append : 'topbar.liquid' }} %}
29
+ {%- endif -%}
35
30
 
36
- {% if LayoutIsBook %}
37
-
38
- {% assign loop = site[page.collection] | sort: 'weight' %}
39
-
40
- {% include {{ Site | append : 'scroller.liquid' }} %}
41
-
42
- {% include {{ SiteLayout | append : 'loop.liquid' }} type='book' %}
43
-
44
- {% elsif LayoutIsChapter %}
45
-
46
- {% assign loop = site[page.collection] | where: 'chapter', page.chapter | sort: 'weight' %}
47
-
48
- {% include {{ SiteLayout | append : 'loop.liquid' }} type='chapter' %}
49
-
50
- {% elsif LayoutIsTopic %}
51
-
52
- {% assign loop = site[page.collection] | where: 'topic', page.topic | sort: 'weight' %}
53
-
54
- {% include {{ SiteLayout | append : 'loop.liquid' }} type='topic' chapter=page.chapter %}
55
-
56
- {% endif %}
57
-
58
- {% include {{ SitePage | append : 'clippies.liquid' }} %}
59
-
60
- {% include {{ Site | append : 'footer.liquid' }} %}
61
-
62
- </div>
63
-
64
- </body>
65
-
66
- {% include html/footer/scripts.liquid %}
67
-
68
- </html>
31
+ {%- include {{ SiteLayout | append : 'footer.liquid' }} -%}
data/_layouts/single.html CHANGED
@@ -2,83 +2,10 @@
2
2
  layout: mini
3
3
  ---
4
4
 
5
- {% include html/assign/site.liquid %}
5
+ {%- include html/assign/site.liquid -%}
6
6
 
7
- <!DOCTYPE html>
7
+ {%- include {{ SiteLayout | append : 'header.liquid' }} type="single" -%}
8
8
 
9
- <html lang="{{ page.lang | default: site.lang | default: 'en' }}" class="no-js">
9
+ {%- include {{ SiteLayout | append : 'type.liquid' }} -%}
10
10
 
11
- {% include html/head/meta.liquid %}
12
-
13
- <body class="{% if site.setup.install %}{{ SiteInstall }}{% endif %}
14
- {% if site.setup.style %}{{ SiteStyle }}{% endif %}
15
- {% if page.collection %}{{ LayoutBook }}{% endif %}
16
- {% if page.chapter %}{{ LayoutChapter }}{% endif %}
17
- {{ LayoutLayout }}{{ LayoutType }}{{ LayoutTitle }}">
18
-
19
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='load' exit='false' state='open' %}
20
-
21
- {%- unless SiteIsResponsive -%}
22
-
23
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='mobile' exit='false' %}
24
-
25
- {%- endunless -%}
26
-
27
- {% if LayoutIsOverlay %}
28
-
29
- {% assign DynamicTitle = page.title | downcase %}
30
-
31
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title=DynamicTitle exit='false' %}
32
-
33
- {% endif %}
34
-
35
- {% unless LayoutIsOverlay %}
36
-
37
- {% unless LayoutIsHome %}
38
-
39
- {%- unless SiteIsTheme -%}
40
-
41
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='about' %}
42
-
43
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='browse' %}
44
-
45
- {% include {{ SiteOverlay | append : 'wrap.liquid' }} title='search' %}
46
-
47
- {%- endunless -%}
48
-
49
- {% endunless %}
50
-
51
- <div class="site {{ LayoutType }}
52
- {% if LayoutIsHome %}full{% else %}single{% endif %}">
53
-
54
- {% include {{ Site | append : 'header.liquid' }} %}
55
-
56
- {% unless LayoutIsHome %}
57
-
58
- {%- unless SiteIsTheme -%}
59
-
60
- {% include {{ SitePage | append : 'topbar.liquid' }} %}
61
-
62
- {%- endunless -%}
63
-
64
- {% endunless %}
65
-
66
- {% include {{ SiteLayout | append : 'type.liquid' }} %}
67
-
68
- {%- unless SiteIsTheme -%}
69
-
70
- {% include {{ SitePage | append : 'clippies.liquid' }} %}
71
-
72
- {%- endunless -%}
73
-
74
- {% include {{ Site | append : 'footer.liquid' }} %}
75
-
76
- </div>
77
-
78
- {% endunless %}
79
-
80
- </body>
81
-
82
- {% include html/footer/scripts.liquid %}
83
-
84
- </html>
11
+ {%- include {{ SiteLayout | append : 'footer.liquid' }} -%}
data/_sass/_site.scss CHANGED
@@ -6,19 +6,15 @@
6
6
  z-index: 1;
7
7
  }
8
8
 
9
- .site.full {
9
+ .site.home {
10
10
  @include zeros(absolute);
11
11
  height: 100%;
12
12
  }
13
13
 
14
- .site.feed {
14
+ .site.not-home {
15
15
  @extend %SiteSetup;
16
16
  }
17
17
 
18
- .site.single {
19
- @extend %SiteSetup;
20
- }
21
-
22
- .site.single.type-empty {
18
+ .site.not-home.type-empty {
23
19
  padding: 0;
24
20
  }
data/_sass/area/topbar.scss CHANGED
@@ -1,14 +1,14 @@
1
1
 
2
2
  .area.topbar {
3
3
  @include zeros;
4
+ padding-right: map-get($topbar,padding);
5
+ padding-left: map-get($topbar,padding);
6
+ height: map-get($topbar,height);
4
7
  border-bottom: $NavBorder;
5
8
  background-color: white;
6
9
  grid-auto-flow: column;
7
- padding-right: 14px;
8
- padding-left: 14px;
9
10
  display: grid;
10
11
  bottom: auto;
11
- height: 60px;
12
12
  z-index: 4;
13
13
 
14
14
  @media#{map-get($query,min768)} {
data/_sass/helpers/extends/layout.scss CHANGED
@@ -1,9 +1,9 @@
1
1
 
2
2
  %SiteSetup {
3
3
  @extend %GridDefault;
4
+ padding-top: map-get($topbar,height) + map-get($site,padding);
5
+ padding-bottom: map-get($site,padding);
4
6
  justify-content: center;
5
- padding-bottom: 50px;
6
- padding-top: 100px;
7
7
  }
8
8
 
9
9
  %PagePosition {
data/_sass/helpers/variables.scss CHANGED
@@ -1,4 +1,13 @@
1
1
 
2
+ $site : (
3
+ padding : 50px
4
+ );
5
+
6
+ $topbar : (
7
+ height : 60px,
8
+ padding : 15px
9
+ );
10
+
2
11
  $color : (
3
12
  system : #6e46a0,
4
13
  brand : #ff8200,
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: futuro
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.9
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Paul Heading
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-18 00:00:00.000000000 Z
11
+ date: 2020-04-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -159,6 +159,7 @@ files:
159
159
  - _includes/html/page/footnote.liquid
160
160
  - _includes/html/page/header.liquid
161
161
  - _includes/html/page/info.liquid
162
+ - _includes/html/page/layout/empty.liquid
162
163
  - _includes/html/page/layout/home.liquid
163
164
  - _includes/html/page/layout/page.liquid
164
165
  - _includes/html/page/subtitle.liquid