jekyll-rebellion 0.1.0 → 0.2

data/_sass/rebellion/desktop-header.scss

@@ -6,7 +6,12 @@
     flex-wrap: nowrap;
     justify-items: space-between;
     align-items: center;
-    min-height: $action-bar-height;
+    min-height: $action-bar-height-mobile;
+
+    @media screen and (min-width: $on-small) {
+        min-height: $action-bar-height;
+    }
+    
     height: 100%;
 
     .Rebellion-Button {

data/_sass/rebellion/header.scss

@@ -1,6 +1,9 @@
 
 .nav-hide {
-    top: -$action-bar-height;
+    top: -$action-bar-height-mobile;
+    @media screen and (min-width: $on-small) {
+        top: -$action-bar-height;
+    }
 }
 
 .nav-visible {
@@ -76,7 +79,13 @@
     }
 
     .site-title img {
-        max-height: $action-bar-height;
+        max-height: $action-bar-height-mobile;
+
+
+        @media screen and (min-width: $on-small) {
+            max-height: $action-bar-height;
+        }
+        
         box-sizing: border-box;
         padding: 10px 0;
     }
@@ -84,8 +93,13 @@
     .site-title .logo-square
     {
         display: none;
-        max-width: $action-bar-height;
-        max-height: $action-bar-height;
+        max-width: $action-bar-height-mobile;
+        max-height: $action-bar-height-mobile;
+
+        @media screen and (min-width: $on-small) {
+            max-width: $action-bar-height-mobile;
+            max-height: $action-bar-height;
+        }
     }
 
     @media screen and (max-width: 250px) {

data/_sass/rebellion/mobile-header.scss

@@ -5,9 +5,13 @@
     flex-wrap: nowrap;
     justify-items: space-between;
     align-items: center;
-    min-height: $action-bar-height;
+    min-height: $action-bar-height-mobile;
     height: 100%;
 
+    @media screen and (min-width: $on-small) {
+        min-height: $action-bar-height;
+    }
+
     .nav-trigger { display: none; }
 
     .site-title {
@@ -32,6 +36,7 @@
     }
     
     .menu-icon {
+        line-height: 0;
         width: 18px;
         height: 15px;
         position: relative;
@@ -88,9 +93,13 @@
         display: none;
         z-index: 2;
         position: fixed;
-        top: 14px;
+        top: 6px;
         right: 16px;
 
+        @media screen and (min-width: $on-small) {
+            top: 14px;
+        }
+
         .menu-icon {
             width: 18px;
             height: 18px;
@@ -131,7 +140,12 @@
 
             width: 100%;
             position: relative;
-            padding-top: $action-bar-height;
+            padding-top: $action-bar-height-mobile;
+
+            @media screen and (min-width: $on-small) {
+                padding-top: $action-bar-height;
+            }
+        
 
             display: flex;
             flex-direction: column;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-rebellion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: '0.2'
 platform: ruby
 authors:
 - David Gundry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jekyll-feed
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
 description: 
 email:
 - david@davidgundry.co.uk
@@ -90,19 +76,6 @@ files:
 - LICENSE.txt
 - README.md
 - _includes/blog-list.html
-- _includes/component.html
-- _includes/components/big-picture.html
-- _includes/components/contents.html
-- _includes/components/event-item.html
-- _includes/components/event-list.html
-- _includes/components/floating-boxes.html
-- _includes/components/halves.html
-- _includes/components/pull-quote.html
-- _includes/components/rich-text.html
-- _includes/components/section-full-width.html
-- _includes/components/section.html
-- _includes/components/text-section.html
-- _includes/components/youtube-video.html
 - _includes/desktop-header.html
 - _includes/footer.html
 - _includes/google-analytics.html
@@ -111,29 +84,22 @@ files:
 - _includes/mobile-header.html
 - _includes/site-title.html
 - _includes/social-links.html
-- _layouts/base-post.html
 - _layouts/default.html
 - _layouts/home.html
 - _layouts/page.html
 - _layouts/post.html
 - _sass/rebellion.scss
 - _sass/rebellion/base.scss
-- _sass/rebellion/components.scss
+- _sass/rebellion/content.scss
 - _sass/rebellion/desktop-header.scss
 - _sass/rebellion/footer.scss
 - _sass/rebellion/header.scss
 - _sass/rebellion/mobile-header.scss
 - assets/css/rebellion-style.scss
 - assets/css/style.scss
-- assets/facebook.svg
 - assets/fucxedcaps-v2-webfont.woff
 - assets/fucxedcaps-v2-webfont.woff2
-- assets/instagram.svg
 - assets/js.js
-- assets/logo-black.svg
-- assets/logo-square.svg
-- assets/logo-white.svg
-- assets/twitter.svg
 homepage: https://github.com/davidgundry/jekyll-rebellion
 licenses:
 - MIT

data/_includes/component.html

@@ -1 +0,0 @@
-  {% include components/{{blok.component}}.html blok=blok %}

data/_includes/components/big-picture.html

@@ -1,25 +0,0 @@
-{% comment %}
-
-    blok {
-        image: string,
-        jump_target: string,
-        jump_text: string,
-        show_jump_button: boolean,
-        half_size: boolean
-    }
-
-{% endcomment %}
-{{blok._editable}}
-{% if blok.half_size %}
-<div class="Rebellion-Section Rebellion-Half-Picture" style="background-image: url('{{blok.image}}');">
-{% else %}
-<div class="Rebellion-Section Rebellion-Big-Picture" style="background-image: url('{{blok.image}}');">
-{% endif %}
-    {% if blok.show_jump_button %}
-    <div class="Rebellion-Near-Bottom">
-        <div class="Rebellion-Flex-Line">
-            <a href="#{{blok.jump_target}}"><span class="Rebellion-Button">{{blok.jump_text}}</span></a>
-        </div>
-    </div>
-    {% endif %}
-</div>

data/_includes/components/contents.html

@@ -1,25 +0,0 @@
-{% comment %}
-
-    page.story.content.body: [
-        {
-            show_in_contents: boolean,
-            anchor: string,
-            contents_title: string,
-            [...] other properties
-        }]
-{% endcomment %}
-{{blok._editable}}
-<div class="Rebellion-Section Rebellion-Contents">
-    <div class="Rebellion-Wrapper-Wide">
-        <h2>{{ page.title }}</h2>
-        {% if page.story.content.body %}
-            <ol>
-                {% for page_blok in page.story.content.body %}
-                    {% if page_blok.show_in_contents %}
-                        <li><a href="#{{ page_blok.anchor }}">{{ page_blok.contents_title }}</a></li>
-                    {% endif %} 
-                {% endfor %}
-            </ol>
-        {% endif %}
-    </div>
-</div>

data/_includes/components/event-item.html

@@ -1,33 +0,0 @@
-{% comment %}
-
-    blok {
-        day: string,
-        month: string,
-        summary: string,
-        time: string,
-        location: string,
-        image: string
-        url: string
-    }
-
-{% endcomment %}
-{{blok._editable}}
-<div class="Rebellion-Event-Item">
-    <div class="top">
-        <div class="date">
-            <span class="day-number">{{ blok.day }}</span>
-            <span class="month">{{ blok.month }}</span>
-        </div>
-        <div class="description">
-            <h3>{{ blok.summary }}</h3>
-            <time>{{ blok.time }}</time>
-            <div class="bottom-line">
-                <p>{{ blok.location }}</p>
-                <a href="{{ blok.url }}" class="Rebellion-Button">Details</a>
-            </div>
-        </div>
-    </div>
-    {% if blok.image %}
-        <img src="{{ blok.image }}" />
-    {% endif %}
-</div>

data/_includes/components/event-list.html

@@ -1,22 +0,0 @@
-{% comment %}
-
-    blok {
-        events: [
-            { 
-                day: string,
-                month: string,
-                summary: string,
-                time: string,
-                location: string,
-                image: string,
-                component: "event-item"
-            }]
-    }
-
-{% endcomment %}
-{{blok._editable}}
-<div class="Rebellion-Event-List">
-    {% for blok in blok.body %}
-        {% include component.html blok=blok %}
-    {% endfor %}
-</div>

data/_includes/components/floating-boxes.html

@@ -1,37 +0,0 @@
-{% comment %}
-
-    blok {
-        title: string,
-        show_title: boolean,
-        boxes: [
-            {
-                title: string,
-                text: string,
-                link: {
-                    url: string
-                }
-                button_text: string
-            }]
-    }
-
-{% endcomment %}
-{{blok._editable}}
-<div class="Rebellion-Section">
-    {% if blok.anchor %}
-        <a id="{{ blok.anchor }}"></a>
-    {% endif %}
-    {% if blok.show_title %}
-        <h1>{{ blok.title }}</h1>
-    {% endif %}
-    <div class="Rebellion-Floating-Boxes">
-        {% for box in blok.boxes %}
-        <div class="Rebellion-Floating-Box">
-            <h2>{{ box.title }}</h2>
-                <p>{{ box.text }}</p>
-                {% unless box.hide_link %}
-                    <div class="at-bottom"><div class="Rebellion-Flex-Line"><a href="{{ box.link.url }}"><span class="Rebellion-Button">{{ box.button_text }}</span></a></div></div>
-                {% endunless %}
-            </div>
-        {% endfor %}
-    </div>
-</div>

data/_includes/components/halves.html

@@ -1,33 +0,0 @@
-{% comment %}
-
-    blok {
-        image: string,
-        image_side: "right" || "left"
-        body: [
-            {
-                component: string
-                [...] other properties
-            }]
-        color: color string
-        invert_text_color: boolean
-        anchor: string
-    }
-
-{% endcomment %}
-{{blok._editable}}
-<div class="Rebellion-Halves image-{{blok.image_side}}">
-    {% if blok.anchor %}
-        <a id="{{ blok.anchor }}"></a>
-    {% endif %}
-    {% if blok.change_background_color && blok.color %}
-        <div class="half{% if blok.invert_text_color == true %} invert-text{% endif %}" style="background-color:{{ blok.color.color }};">
-    {% else %}
-        <div class="half">
-    {% endif %}
-
-        {% for blok in blok.body %}
-            {% include component.html blok=blok %}
-        {% endfor %}
-    </div>
-    <div class="half half-image" style="background-image: url('{{ blok.image }}')"></div>
-</div>

data/_includes/components/pull-quote.html

@@ -1,26 +0,0 @@
-{% comment %}
-
-    blok {
-        text: string,
-        show_join: boolean,
-        show_donate: boolean
-    }
-
-{% endcomment %}
-{{blok._editable}}
-<div class="Rebellion-Section Rebellion-PullQuote">
-    <div class="Rebellion-Wrapper-Wide">
-        <h1>{{blok.text}}</h1>
-        {% if blok.show_join or blok.show_donate %}
-            <div class="Rebellion-Flex-Line">
-                {% if blok.show_join %}
-                    <a href="{{ site.join }}"><span class="Rebellion-Button">Join Us</span></a>
-                {% endif %}
-                {% if blok.show_donate %}
-                    <a href="{{ site.donate }}"><span class="Rebellion-Button">Donate</span></a>
-                {% endif %}
-            </div>
-        {% endif %}
-    </div>
-</div>
-    

data/_includes/components/rich-text.html

@@ -1,11 +0,0 @@
-{% comment %}
-
-    blok {
-        text: string,
-    }
-
-{% endcomment %}
-{{ blok._editable }}
-<div class="Rebellion-rich-text">
-    {{ blok.text | markdownify }}
-</div>

data/_includes/components/section-full-width.html

@@ -1,8 +0,0 @@
-<div class="Rebellion-Section">
-    {% if blok.anchor %}
-        <a id="{{ blok.anchor }}"></a>
-    {% endif %}
-    {% for blok in blok.body %}
-        {% include component.html blok=blok %}
-    {% endfor %}
-</div>