futuro 0.9.6 → 0.9.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (68) hide show
  1. checksums.yaml +4 -4
  2. data/_includes/html/assign/page.liquid +1 -1
  3. data/_includes/html/assign/site.liquid +4 -3
  4. data/_includes/html/head/meta.liquid +1 -1
  5. data/_includes/html/page/content.liquid +11 -6
  6. data/_includes/html/page/content/loop/button/example.liquid +0 -4
  7. data/_includes/html/page/header.liquid +1 -1
  8. data/_includes/html/page/info.liquid +1 -1
  9. data/_includes/html/page/layout/home.liquid +13 -24
  10. data/_includes/html/page/layout/page.liquid +7 -7
  11. data/_includes/html/page/title.liquid +27 -13
  12. data/_includes/html/page/util.liquid +3 -3
  13. data/_includes/html/page/util/share.liquid +10 -10
  14. data/_includes/html/search/loop.liquid +1 -1
  15. data/_includes/svg/site/icon.liquid +8 -0
  16. data/_sass/_bar.scss +1 -1
  17. data/_sass/_base.scss +1 -1
  18. data/_sass/_box.scss +1 -1
  19. data/_sass/_button.scss +3 -3
  20. data/_sass/_col.scss +2 -2
  21. data/_sass/_item.scss +1 -1
  22. data/_sass/_link.scss +21 -1
  23. data/_sass/_site.scss +6 -2
  24. data/_sass/area/overlay.scss +3 -3
  25. data/_sass/block/access.scss +2 -3
  26. data/_sass/block/alert.scss +1 -1
  27. data/_sass/block/form/checkbox.scss +5 -5
  28. data/_sass/block/form/header.scss +1 -1
  29. data/_sass/block/form/item.scss +1 -1
  30. data/_sass/block/form/legend.scss +2 -2
  31. data/_sass/block/form/password.scss +1 -1
  32. data/_sass/block/form/select.scss +0 -34
  33. data/_sass/block/form/title.scss +1 -1
  34. data/_sass/block/navigation.scss +1 -1
  35. data/_sass/block/page.scss +4 -4
  36. data/_sass/block/results.scss +1 -1
  37. data/_sass/block/util.scss +17 -12
  38. data/_sass/futuro.core.scss +27 -1
  39. data/_sass/helpers/extends.scss +19 -19
  40. data/_sass/helpers/extends/layout.scss +1 -1
  41. data/_sass/helpers/mixins/items.scss +11 -11
  42. data/_sass/helpers/mixins/patterns.scss +4 -4
  43. data/_sass/helpers/mixins/theme.scss +21 -18
  44. data/_sass/helpers/variables.scss +139 -69
  45. data/_sass/title/docs.scss +1 -1
  46. data/_sass/title/overlay.scss +2 -2
  47. data/_sass/title/page.scss +1 -1
  48. data/_sass/title/type.scss +14 -11
  49. data/_sass/wrap/book.scss +0 -19
  50. data/_sass/wrap/browse.scss +1 -1
  51. data/_sass/wrap/chapter.scss +4 -2
  52. data/_sass/wrap/home.scss +8 -9
  53. data/_sass/wrap/page.scss +3 -3
  54. data/assets/js/footer/custom/SetupHome.js +26 -32
  55. data/assets/js/footer/custom/SiteFunc.js +12 -31
  56. data/assets/js/footer/custom/UtilShare.js +60 -31
  57. data/assets/js/footer/custom/WhatsOn.js +45 -0
  58. data/assets/js/futuro.footer.custom.js +1 -1
  59. data/assets/js/futuro.footer.vendor.js +0 -19
  60. data/assets/js/futuro.header.custom.js +1 -1
  61. data/assets/js/header/custom/Config.js +1 -1
  62. metadata +3 -8
  63. data/_includes/artwork/orwell/animal/flob.scss +0 -5
  64. data/_includes/artwork/orwell/animal/waldo.scss +0 -45
  65. data/_includes/svg/site/btn/share/chapter.svg +0 -1
  66. data/_includes/svg/site/btn/share/page.svg +0 -1
  67. data/_sass/_slick.scss +0 -133
  68. data/assets/js/footer/vendor/slick.js +0 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2ccd3b9aa362da93c902faeae62425e47abdd0b4804b39afb286c3c3a3a6f566
4
- data.tar.gz: 7156ab1b25ef5f078736a058a3b938502edba470ac48d4cd2230c03d9552b5ec
3
+ metadata.gz: 871ee4e24bab413c379b9a2e88a7349a119ff012c3950d7d29e29bb844a8f8b4
4
+ data.tar.gz: 2301f18a8dd225e68e9732bef05fdd832f92a35e5c53609a29ff606773353479
5
5
  SHA512:
6
- metadata.gz: d79f269d796a3bec9af0cad7b083c1ebbcc5f99e52300c3654ee116a648c08c8a8cf9d2cc55647d22ffb49276633951309c806b0a83e78a14c42de6aaea12297
7
- data.tar.gz: 02cfa8954c44a2a8d152d554e3e0bd8952331b539b24287dd902e6126a11c76a2af5b5c9ae96c18bedda0884c7b8dddb81ea2c2912575d0ee56234477c3af231
6
+ metadata.gz: 96d8b9de7f2e8d1ab0d4da3ad06cd9ec012c93b604a080e00de50b9bf1f75579422977ed3139bce706e879d7e8ae8ef751d0c64e5e659c88546cf018aab8e4ef
7
+ data.tar.gz: 8530e6446ddd5814f92c4c24ac890eda60b404e0d9fbdc8c3c8ae374c5eef4cfd431b437990b37345ba46969ff43615f9a3ada8130d0ae0b5c7718f9ca95596b
@@ -13,7 +13,7 @@
13
13
  {% assign PageImage = page.url | prepend : '/assets/img' | replace : '.html','' %}
14
14
  {% assign PageVideo = page.url | prepend : '/assets/vid' | replace : '.html','' %}
15
15
 
16
- {% assign PageType = page.type | prepend : ' type-' %}
16
+ {% assign PageType = page.type | prepend : 'type-' %}
17
17
  {% assign PageSplit = page.type | prepend : 'split-' %}
18
18
  {% assign PageInfo = page.type | append : '-info' %}
19
19
  {% assign TypeChapter = page.type | append : '-chapter' %}
@@ -21,6 +21,7 @@
21
21
 
22
22
  {% assign SiteSvg = 'svg/site/' %}
23
23
  {% assign SvgLoad = SiteSvg | append : 'load/' %}
24
+ {% assign SvgBook = SiteSvg | append : 'book/' %}
24
25
  {% assign SvgBtn = SiteSvg | append : 'btn/' %}
25
26
  {% assign SvgIcon = SiteSvg | append : 'icon.liquid' %}
26
27
 
@@ -37,9 +38,9 @@
37
38
  {%- endif -%}
38
39
 
39
40
  {%- if site.setup.style == 'docs' -%}
40
- {% assign SiteIsDoc = true %}
41
+ {% assign SiteIsDocs = true %}
41
42
  {%- else -%}
42
- {% assign SiteIsDoc = false %}
43
+ {% assign SiteIsDocs = false %}
43
44
  {%- endif -%}
44
45
 
45
46
  {%- if site.setup.install == 'theme' -%}
@@ -60,7 +61,7 @@
60
61
  {% assign SiteIsBook = false %}
61
62
  {%- endif -%}
62
63
 
63
- {%- if site.setup.shareable == true -%}
64
+ {%- if site.setup.share -%}
64
65
  {% assign SiteIsShare = true %}
65
66
  {%- else -%}
66
67
  {% assign SiteIsShare = false %}
@@ -9,7 +9,7 @@
9
9
  {% feed_meta %}
10
10
  {% include html/head/analytics.liquid %}
11
11
  <script type="text/javascript">
12
- let Config = {{ site.setup | jsonify }};
12
+ const Config = {{ site.setup | jsonify }};
13
13
  </script>
14
14
  {%- include html/head/scripts.liquid -%}
15
15
  </head>
@@ -4,7 +4,7 @@
4
4
  <div class="area {{ PageBook | prepend : 'book-' }} {{ PageType }} {{ PageChapter | prepend : 'chapter-' }}
5
5
  {% if site.setup.style %}{{ SiteStyle }}{% endif %}">
6
6
 
7
- {%- unless SiteIsDoc -%}
7
+ {%- unless SiteIsDocs -%}
8
8
 
9
9
  <h2>{{ page.weight | slice: 0,3 }}</h2>
10
10
 
@@ -12,13 +12,13 @@
12
12
 
13
13
  {% else %}
14
14
 
15
- {%- unless SiteIsDoc -%}
15
+ {%- unless SiteIsDocs -%}
16
16
 
17
17
  {%- include {{ SitePage | append : 'subtitle.liquid' }} -%}
18
18
 
19
19
  {%- endunless -%}
20
20
 
21
- <div class="area {{ PageTitle | prepend : 'title-' }} {{ PageType }}
21
+ <div class="area this? {{ PageTitle | prepend : 'title-' }} {{ PageType }}
22
22
  {% if site.setup.style %}{{ SiteStyle }}{% endif %}
23
23
  {% unless NoSubtitle %}has-subtitle{% endunless %}
24
24
  {% if page.row %} has-row {% endif %}
@@ -26,7 +26,7 @@
26
26
 
27
27
  {% endif %}
28
28
 
29
- {%- unless SiteIsDoc -%}
29
+ {%- unless SiteIsDocs -%}
30
30
 
31
31
  {{ page.content | markdownify }}
32
32
 
@@ -36,7 +36,12 @@
36
36
 
37
37
  {%- include {{ SiteContent | append : 'more.liquid' }} -%}
38
38
 
39
- {% include {{ SitePage | append : 'util.liquid' }} %}
39
+ {% unless SiteIsDocs %}
40
+
41
+ {% include {{ SitePage | append : 'util.liquid' }} %}
42
+
43
+ {% endunless %}
44
+
40
45
 
41
46
  {%- if page.break -%}
42
47
 
@@ -146,7 +151,7 @@
146
151
 
147
152
  {%- endif -%}
148
153
 
149
- {%- if SiteIsDoc -%}
154
+ {%- if SiteIsDocs -%}
150
155
 
151
156
  {%- if page.content -%}
152
157
 
@@ -3,8 +3,6 @@
3
3
 
4
4
  <div class="button-version">
5
5
 
6
- <div class="title button-version">Heavy</div>
7
-
8
6
  {%- include {{ LoopButton | append : 'build.liquid' }}
9
7
  context = "example"
10
8
  type = page.button.type
@@ -16,8 +14,6 @@
16
14
 
17
15
  <div class="button-version">
18
16
 
19
- <div class="title button-version">Slim</div>
20
-
21
17
  {%- include {{ LoopButton | append : 'build.liquid' }}
22
18
  context = "example"
23
19
  type = page.button.type
@@ -1,5 +1,5 @@
1
1
 
2
- <div class="wrap {{ PageType }}
2
+ <div class="wrap page-wrap {{ PageType }}
3
3
  {% if site.setup.style %}{{ SiteStyle }}{% endif %}
4
4
  {% if page.collection %}{{ PageBook | prepend : 'book-' }}{% endif %}
5
5
  {% if page.chapter %}{{ PageChapter | prepend : 'chapter-' }}{% endif %}
@@ -7,7 +7,7 @@
7
7
 
8
8
  </h5>
9
9
 
10
- {%- unless SiteIsDoc -%}
10
+ {%- unless SiteIsDocs -%}
11
11
 
12
12
  {%- if page.icon -%}
13
13
 
@@ -1,36 +1,25 @@
1
1
 
2
2
  {% assign loop = site.collections | sort: 'weight' %}
3
3
 
4
- <div class="wrap home">
5
-
6
4
  {% for book in loop %}
7
5
 
8
- {% assign title = book.label %}
9
- {% assign url = title | prepend: '/' | append: '/' %}
10
- {% assign svg = title | prepend: '/svg/site/book/' | append: '.svg' %}
6
+ {% assign label = book.label %}
7
+ {% assign url = label | prepend: '/' | append: '/' %}
8
+ {% assign svg = label | append: '.svg' %}
11
9
 
12
- {% if book.live == true %}
10
+ {% unless label == 'posts' %}
13
11
 
14
- <div class="area book">
15
- <div class="wrap book {{ title }}">
16
- <a class="lnk book" href="{{ url }}">
17
- {% include {{ svg }} %}
18
- </a>
19
- </div>
20
- </div>
12
+ <div class="wrap book">
21
13
 
22
- {% elsif book.live == false %}
14
+ <a class="link book {% if book.live %}{{ label }}{% else %}draft{% endif %}"
15
+ href="{% if book.live %}{{ url }}{% else %}#{% endif %}">
23
16
 
24
- <div class="area book">
25
- <div class="wrap book draft">
26
- <div class="lnk book">
27
- {% include {{ svg }} %}
28
- </div>
29
- </div>
30
- </div>
17
+ {% include {{ SvgBook | append : svg }} %}
31
18
 
32
- {% endif %}
19
+ </a>
20
+
21
+ </div>
33
22
 
34
- {% endfor %}
23
+ {% endunless %}
35
24
 
36
- </div>
25
+ {% endfor %}
@@ -15,18 +15,18 @@
15
15
 
16
16
  {%- include {{ SitePage | append : 'footnote.liquid' }} -%}
17
17
 
18
- {%- if PageIsChapter -%}
18
+ {% unless SiteIsDocs %}
19
19
 
20
- {%- include {{ SitePage | append : 'util.liquid' }} -%}
20
+ {%- if PageIsChapter -%}
21
21
 
22
- {%- else -%}
22
+ {%- include {{ SitePage | append : 'util.liquid' }} -%}
23
23
 
24
- {%- unless SiteIsDoc -%}
24
+ {%- else -%}
25
25
 
26
26
  {%- include {{ SitePage | append : 'info.liquid' }} -%}
27
27
 
28
- {%- endunless -%}
29
-
30
- {%- endif -%}
28
+ {%- endif -%}
29
+
30
+ {% endunless %}
31
31
 
32
32
  </div>
@@ -1,31 +1,45 @@
1
1
 
2
2
  {% unless PageInTopic %}
3
3
 
4
- {%- if SiteIsDoc -%}
4
+ {%- if SiteIsDocs -%}
5
5
 
6
- {% if PageIsChapter %}
6
+ <div class="wrap title-wrap {{ PageType }} {{ SiteStyle }} {% if SiteIsShare %}is-shareable{% endif %}">
7
7
 
8
- <h5 class="title {{ PageType }} {{ SiteStyle }}">
9
- {{ ChapterSplit }}
10
- </h5>
8
+ <h5 class="title {{ PageType }} {{ SiteStyle }} {% if SiteIsShare %}is-shareable{% endif %}">
9
+
10
+ {% if PageIsChapter %}
11
+
12
+ {{ ChapterSplit }}
13
+
14
+ {% else %}
15
+
16
+ {{ page.title }}
11
17
 
12
- {% else %}
18
+ {% endif %}
13
19
 
14
- <h5 class="title {{ PageType }} {{ SiteStyle }}">
20
+ {% if SiteIsShare %}
15
21
 
16
- <div class="title docs-title">{{ page.title }}</div>
22
+ {% include {{ SiteUtil | append : 'share.liquid' }} %}
23
+
24
+ {% endif %}
17
25
 
18
- {%- if page.accessible -%}
26
+ </h5>
27
+
28
+ {% unless PageIsChapter %}
29
+
30
+ {%- if page.score -%}
19
31
 
20
32
  <div class="block access-wrap">
33
+
21
34
  <div class="block access-ratio">ratio</div>
22
- </div>
23
35
 
24
- {%- endif -%}
36
+ </div>
25
37
 
26
- </h5>
38
+ {%- endif -%}
27
39
 
28
- {% endif %}
40
+ {% endunless %}
41
+
42
+ </div>
29
43
 
30
44
  {%- else -%}
31
45
 
@@ -1,13 +1,13 @@
1
1
 
2
- {%- unless SiteIsDoc or page.error -%}
2
+ {%- unless page.error -%}
3
3
 
4
4
  {%- if SiteIsShare or
5
5
  page.update or
6
6
  page.author -%}
7
7
 
8
- <div class="block util {{ PageType }}">
8
+ <div class="block util {{ PageType }} {% if SiteIsDocs %}style-docs{% else %}style-page{% endif %}">
9
9
 
10
- {%- if SiteIsShare -%}
10
+ {%- if SiteIsShare -%}
11
11
 
12
12
  {% include {{ SiteUtil | append : 'share.liquid' }} %}
13
13
 
@@ -1,21 +1,21 @@
1
1
 
2
2
  {%- if SiteIsShare -%}
3
3
 
4
- <div class="block util-share {{ PageType }}">
4
+ <div class="block util-share {{ PageType }} {% if SiteIsDocs %}style-docs{% else %}style-page{% endif %}">
5
5
 
6
- {% assign DynamicShare = page.type | prepend : 'share/' | append : '.svg' %}
6
+ {% assign ShareType = page.type | prepend : 'share-' %}
7
7
 
8
- {% include {{ SvgBtn | append : DynamicShare }} %}
8
+ {% include {{ SvgIcon }} type=ShareType %}
9
9
 
10
- {%- if PageIsChapter -%}
10
+ {% unless PageIsChapter %}
11
11
 
12
- <h5></h5>
12
+ {% unless SiteIsDocs %}
13
13
 
14
- {%- else -%}
15
-
16
- <p>Copy page</p>
17
-
18
- {%- endif -%}
14
+ <p>Copy page</p>
15
+
16
+ {% endunless %}
17
+
18
+ {% endunless %}
19
19
 
20
20
  <div class="block util-url">{{ PageShare }}</div>
21
21
 
@@ -14,6 +14,6 @@
14
14
  "title" : "{{ item.title }}",
15
15
  "shorturl" : "{{ shorturl }}",
16
16
  "longurl" : "{{ longurl }}"
17
- } {% unless forloop.last %},{% endunless %}
17
+ },
18
18
 
19
19
  {% endfor %}
@@ -55,4 +55,12 @@
55
55
 
56
56
  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 74.7 116.7"><path d="M16.2 0L.3 15.7l34.4 32.1 7.3 6.7 4.3 3.8L34.7 69 0 100.3l16.2 16.4 58.5-58.9z"></path></svg>
57
57
 
58
+ {%- elsif include.type == "share-chapter" -%}
59
+
60
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 34 34"><path class="background" d="M19,19h-8v-8h8V19z M33,17c0,8.8-7.2,16-16,16S1,25.8,1,17S8.2,1,17,1S33,8.2,33,17z M25,13h-4V9H9v12h4v4h12V13z M21,21 h-6v2h8v-8h-2V21z"/></svg>
61
+
62
+ {%- elsif include.type == "share-page" -%}
63
+
64
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 34 34"><path class="background" d="M19,19h-8v-8h8V19z M33,17c0,8.8-7.2,16-16,16S1,25.8,1,17S8.2,1,17,1S33,8.2,33,17z M25,13h-4V9H9 v12h4v4h12V13z M21,21h-6v2h8v-8h-2V21z"/><path class="foreground" fill="#000" d="M21,13V9H9v12h4v4h12V13H21z M11,19v-8h8v8H11z M23,23h-8v-2h6v-6h2V23z"/></svg>
65
+
58
66
  {%- endif -%}
data/_sass/_bar.scss CHANGED
@@ -8,7 +8,7 @@
8
8
  }
9
9
 
10
10
  &.mobile {
11
- background-color: map-get($color,gun);
11
+ background-color: setcolor(gun);
12
12
  justify-self: center;
13
13
  display: grid;
14
14
  height: 20px;
data/_sass/_base.scss CHANGED
@@ -150,7 +150,7 @@ button.modify-slim {
150
150
  button.navigation {
151
151
  letter-spacing: -0.02em;
152
152
  border-radius: 0;
153
- color: map-get($color,slate);
153
+ color: setcolor(slate);
154
154
  padding: 0;
155
155
  }
156
156
 
data/_sass/_box.scss CHANGED
@@ -7,7 +7,7 @@
7
7
  }
8
8
 
9
9
  &.mobile {
10
- border: 3px solid map-get($color,gun);
10
+ border: 3px solid setcolor(gun);
11
11
  display: grid;
12
12
  width: 100%;
13
13
  }
data/_sass/_button.scss CHANGED
@@ -27,9 +27,9 @@
27
27
  }
28
28
 
29
29
  .button-wrap.type-outline {
30
- border: 1px solid map-get($color, slate);
31
- color: map-get($color, slate);
32
- fill: map-get($color, slate);
30
+ border: 1px solid setcolor(slate);
31
+ color: setcolor(slate);
32
+ fill: setcolor(slate);
33
33
  background-color: white;
34
34
  }
35
35
 
data/_sass/_col.scss CHANGED
@@ -6,7 +6,7 @@
6
6
  }
7
7
 
8
8
  > .block.browse-label, > .block.browse-lnk {
9
- border-right: 2px solid map-get($color,gun);
9
+ border-right: 2px solid setcolor(gun);
10
10
  }
11
11
  }
12
12
 
@@ -16,6 +16,6 @@
16
16
 
17
17
  .col.browse.page {
18
18
  > .block.browse-label, > .block.browse-chunk {
19
- border-left: 2px solid map-get($color,gun);
19
+ border-left: 2px solid setcolor(gun);
20
20
  }
21
21
  }
data/_sass/_item.scss CHANGED
@@ -26,5 +26,5 @@
26
26
 
27
27
  .item.scroller {
28
28
  opacity: 0.5;
29
- fill: map-get($color,gun);
29
+ fill: setcolor(gun);
30
30
  }
data/_sass/_link.scss CHANGED
@@ -28,7 +28,6 @@
28
28
 
29
29
  .link.browse-book.draft {
30
30
  pointer-events: none;
31
- user-select: none;
32
31
  opacity: 0.5;
33
32
  }
34
33
 
@@ -40,3 +39,24 @@
40
39
  .link.browse-page {
41
40
  @extend %LinkBrowse;
42
41
  }
42
+
43
+ .link.book {
44
+ width: map-get($book,large);
45
+ display: block;
46
+ fill: white;
47
+
48
+ @media#{map-get($query,max767)} {
49
+ width: map-get($book,medium);
50
+ }
51
+
52
+ @media#{map-get($query,max599)} {
53
+ width: map-get($book,small);
54
+ }
55
+ }
56
+
57
+ .link.book.draft {
58
+ // default color for draft books
59
+ background-color: setcolor(gray);
60
+ // remove link appearance
61
+ pointer-events: none;
62
+ }