okf-pub-theme 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 485705bf9ad5e9ca9e7b04e812d19287085e2691
-  data.tar.gz: 46521665b10f89e76dbb7d7922f24f559b104db0
+  metadata.gz: 22f9f781e57e12912408ad353d17da14f7950815
+  data.tar.gz: 9ae9e97e7f4eedecfa754ff7f55572e1f0bd266f
 SHA512:
-  metadata.gz: 69fe094db0f62e249260a246bd96bac5d6fe9f156297218e2b281bcfecb930be6e9d20ae51a3a5dd56f5609eda001749d052144d2b10b5f712e82f8fdb220a2f
-  data.tar.gz: 84eca8921c0250dd27113bd690410c7f1b1f0e9c0262c13764cc38ba8648b1d72da70af4ef3aa39384590631eae07a6123e9d27cffc300c4cacf7b2ede5d4390
+  metadata.gz: 60bf96bc7bfc2718882843f2f0bc67268a905008faff9cfa6d2b53f18d8205f1b9565d1138f07c95705ea46e22c27425a61e2ff3e7be3de54973c21e21cf28f2
+  data.tar.gz: d87ebb6639c133fe08defd4c8edd60cd8b1a365608b653887cd0302bb9d791bb31cdf3a96e15ad484a24a4208be10276ebd374522f4718bf77eb74293beff37a

data/_includes/effect-chains.html

@@ -1,18 +1,20 @@
 {% if page.problem  %}
 <section>
+  <ol class="effect-chain">
 {% for x in site.chapter.effects %}
   {% if page[x.key] %}
-    <div class="effect__block">
+    <li class="effect-chain__link">
       <h3 class="is-size-4">{{ x.label }}</h3>
       {% assign collection = page[x.key] %}
-      <ol class="effect__chain">
+      <ul class="effect-chain__sublink {{ x.key }}">
         {% for item in collection %}
-          {% include effect-item.html %}
+        {% include effect-item.html %}
         {% endfor %}
-      </ol>
-    </div>
+      </ul>
+    </li>
   {% endif %}
-{% endfor %}
+    {% endfor %}
+    </ol>
 </section>
 <hr>
 {% endif %}

data/_includes/effect-item.html

@@ -1,5 +1,5 @@
-<li {% if item.claim %}class="effect__claim"{% endif %}>
+<li>
   {% if item.title %}<h4>{{ item.title }}</h4>{% endif %}
-  {% if item.text %}<p>{{ item.text }}</p>{% endif %}
-  {% if item.claim %}<p><strong>{{ item.claim }}</strong></p>{% endif %}
+  {% if item.text %}<div>{{ item.text | markdownify }}</div>{% endif %}
+  {% if item.claim %}<div>{{ item.claim | markdownify }}</div>{% endif %}
 </li>

data/_sass/_effects.sass

@@ -1,44 +1,72 @@
-.effect__block
-  margin-top: 5rem
-  counter-reset: effects
-
-.effect__chain
+.effect-chain
   list-style: none
-  $spacing: 0.3rem
-  h4
-    margin-bottom: $spacing
-    display: inline-block
-    &::before
-      counter-increment: effects
-      content: counter(effects)
-      display: inline-block
-      font-weight: 500
-      margin-right: 1rem
-  p
-    padding-left: 1.2rem
-    padding-bottom: 2em
-    margin-left: 0.25em
-    margin-bottom: $spacing !important
-
-  p:not(.effect__claim)
-    border-left: 1px solid $okf-grey-2
+  counter-reset: effects
 
-  li
-    margin-left: 1rem
-    &:last-of-type
-      p
-        border: none
-    &:only-child
-      margin-left: 0
-      p
-        padding: 0
 
-  .effect__claim
-    p
-      padding-bottom: 1rem
-      border: none
+  $spacing: 0.25rem
+  .effect-chain__link
+    h3
+      margin-top: 0.5rem
+      margin-bottom: $spacing
+      display: inline-block
       &::before
-        content: "🔥"
+        counter-increment: effects
+        content: counter(effects)
+        display: inline-block
+        font-weight: 500
         margin-right: 1rem
-        margin-left: -1.6rem
-        margin-right: 0.6rem
+    h4
+      margin-bottom: 0
+      color: $okf-font-1
+
+  .effect-chain__sublink
+    margin: 0 0 0 $spacing
+    padding: 2.2rem 0 5rem 2rem
+    border-left: 2px solid $okf-grey-2
+    > li
+      position: relative
+      margin-bottom: 3rem
+      list-style: none
+      &::before
+        content: ""
+        position: absolute
+        top: -0.2rem
+        left: -2.5rem
+        display: block
+        width: 2rem
+        height: 2rem
+        background-color: white
+      &::after
+        content: ""
+        position: absolute
+        top: .5rem
+        left: -2.4rem
+        display: block
+        width: .5em
+        height: .5em
+        background-color: $okf-grey-2
+        border-radius: 50%
+
+    &.problem
+      > li::after,
+      > li::before
+        content: none
+    &.causes
+      > li:last-of-type::after
+        content: "="
+        background-color: transparent
+        color: $okf-grey-2
+        font-size: 2rem
+        line-height: 0.5
+        text-align: center
+        left: -2.6rem
+    &.effect
+      > li:last-of-type::after
+        content: "💪"
+        background-color: white
+        font-size: 1.2em
+        line-height: 0.7
+        left: -2.7rem
+        width: 1rem
+        height: 15rem
+        border-radius: 0

data/_sass/_header.sass

@@ -44,7 +44,7 @@
   position: absolute
   width: 100vh
   font-size: 1.2rem
-  line-height: 1
+  line-height: 1.5
   transform: rotate(90deg) translate(10%, -50%)
   transform-origin: left bottom
 

data/_sass/_main.sass

@@ -57,8 +57,7 @@ main
   h1, h2, h3, h4
     font-weight: 500
     margin-bottom: 0.8em
-    //& + p
-     // margin-bottom: 1.8em
+    color: $okf-font-1
 
   h2
     font-size: $size-4
@@ -68,8 +67,8 @@ main
 
   p, ul, ol
     color: $okf-font-2
-    & + p
-      margin-bottom: 1em
+  * + p
+    margin-bottom: 1em
 
   strong
     font-weight: 500

data/assets/css/style.sass

@@ -66,8 +66,3 @@ $input-shadow: none
 
   .header
     display: none
-
-@media print and (color)
-  *
-    -webkit-print-color-adjust: exact
-    print-color-adjust: exact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okf-pub-theme
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - lislis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll