form-jekyll 0.4.3 → 0.4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d4eedf7d115d897a02d59f493e7119a4f67af9f789986fd8960399e97dc87c7
-  data.tar.gz: c4608e50096dc277fa83b97bb80bd077e89c32c6bf48a518455bbb07af0a2fbf
+  metadata.gz: 51b1c4c64d3526f2b930303ce0f905a71a1eaf785405be789aa33f24cd524df2
+  data.tar.gz: d82ff2acb17556b2a1600c359bf488c7019011797912395d369719ee4af5d907
 SHA512:
-  metadata.gz: 52ee297c15aae4ac4a3e1ed27c924daf55ecf7e79ea7b95eb34c2821e36618999bbc6d39ca9aa039c0231b5d752e156eceb1430f2e1c5cb0794c83e1aadea695
-  data.tar.gz: 19b70cc8bd8f7ae572935aca6cce0fa3ada77b8c06b2acdba860816ac4617cccae0a152c1f1c76dce7f1227ecb53730c4033cddb69fd170a61a178a45ed84ee1
+  metadata.gz: 242a59783ddc9ae5ce052bf72d7b5723b3f1908c6a9c7bd2c19a986dbff7ab4c8d584c17b5bed4d8f04494baa07f08e3711cd34797d3acaf44235783a78748bf
+  data.tar.gz: ff5f7c4361f98709ba7c0f25dd51e5de356018e5b7e5b0a56f0979c10f4465872e30ff2a32b2c30f02200ebf914d3c277943a46adda899861c8f5b626d459100

data/_includes/fields/checkbox.html

@@ -13,13 +13,13 @@
           {% if option.shows %} data-shows="{{ option.shows }}"{% endif %}
           {% if option.hides %} data-hides="{{ option.hides }}"{% endif %}
           >
-          <span>{{ option.label | markdownify | remove: '<p>' | remove: '</p>' | improve}}</span>
+          <span class="inline-label">{{ option.label | markdownify | remove: '<p>' | remove: '</p>' | improve}}</span>
         </label>
       {% endfor %}
     {% else %}
       <label class="checkbox">
         <input type="checkbox" value="{{ label  }}" name="{{ name }}" {% if checked %}checked="checked"{% endif %}>
-        <span>{{ label | markdownify | remove: '<p>' | remove: '</p>' | improve}}</span>
+        <span class="inline-label">{{ label | markdownify | remove: '<p>' | remove: '</p>' | improve}}</span>
       </label>
     {% endif %}
 

data/_includes/fields/radio.html

@@ -16,13 +16,13 @@
         {% else %}
           data-error="You must select an option."
         {% endif %}>
-        <span>{{ option.label | markdownify | remove: '<p>' | remove: '</p>' | improve }}</span>
+        <span class="inline-label">{{ option.label | markdownify | remove: '<p>' | remove: '</p>' | improve }}</span>
       </label>
     {% endfor %}
     {% if other %}
       <label class="other-label radio">
         <input type="radio" value="Other" name="{{ name }}">
-        <span>Other</span>
+        <span class="inline-label">Other</span>
       </label>
       <div class="other-input">
         <label for="{{ name }}-other">Write more information here</label>

data/_includes/render_form.html

@@ -1,35 +1,19 @@
 {% capture currentform %}{{ include.form }}{% endcapture %}
 
-{% for currentpage in site.data[currentform] %}
+{% for page in site.data[currentform] %}
 
-  {% assign fields = currentpage.fields %}
-  {% assign label = currentpage.title %}
+  {% assign fields = page.fields %}
+  {% assign label = page.title %}
 
-  {% assign length = forloop.length %}
+  <div class="form-section"{% if page.group %} data-group="{{ page.group }}"{% endif %}>
 
-  {% assign percentdone = forloop.index | times: '100' | divided_by: forloop.length %}
-
-  <div class="form-section"{% if currentpage.group %} data-group="{{ currentpage.group }}"{% endif %}>
-
-    <header class="hero-banner default" id="page-{{ forloop.index }}">
-      <div class="form-header-meta">
-        {% comment %} Form title {% endcomment %}
-        <h2>{{ page.title }}</h2>
-
-        <div class="form-progress">
-          {% if length < 6 %}
-            <div class="form-progress-bubble">Page {{ forloop.index }} of {{ length }}</div>
-          {% else %}
-            {% comment %} Progress bar {% endcomment %}
-            <div class="form-progress-bar form-progress-bar-{{ percentdone }}">{{ percentdone }}% done</div>
-          {% endif %}
-        </div>
-      </div>
+    {% comment %} Page headers {% endcomment %}
+    <header class="hero-banner default">
       <h1>
         {{ label | markdownify | remove: '<p>' | remove: '</p>' }}
       </h1>
-      {% if currentpage.description %}
-        {{ currentpage.description | markdownify | improve }}
+      {% if page.description %}
+        {{ page.description | markdownify | improve }}
       {% endif %}
     </header>
 
@@ -39,7 +23,7 @@
         <div class="nav-on-top">
           {% include pagination.html %}
         </div>
-        {% comment %} Render fields in the currentpage {% endcomment %}
+        {% comment %} Render fields in the page {% endcomment %}
         {% include render_field.html %}
 
         {% include pagination.html %}

data/_includes/sfgov/header.html

@@ -1,4 +1,4 @@
-<header role="banner" id="sfgov-header">
+<header role="banner">
   <div class="sfgov-nav-container">
     <div class="sfgov-nav-container__content">
       <div class="sfgov-logo__container">

data/_layouts/default.html

@@ -29,26 +29,26 @@ layout: base
 
   <label class="checkbox">
     <input type="checkbox" id="settings-all-pages">
-    <span>Every page</span>
+    <span class="inline-label">Every page</span>
   </label>
 
   <label class="checkbox">
     <input type="checkbox" id="settings-all-conditionals">
-    <span>All conditionals</span>
+    <span class="inline-label">All conditionals</span>
   </label>
 
   <label class="checkbox">
     <input type="checkbox" id="settings-all-annotations">
-    <span>Annotations</span>
+    <span class="inline-label">Annotations</span>
   </label>
 
   <label class="checkbox">
     <input type="checkbox" id="settings-show-hidden">
-    <span>Hidden fields</span>
+    <span class="inline-label">Hidden fields</span>
   </label>
 
   <label class="checkbox">
     <input type="checkbox" id="settings-top-nav">
-    <span>Page navigation on top</span>
+    <span class="inline-label">Page navigation on top</span>
   </label>
 </div>

data/assets/css/main.scss

@@ -385,7 +385,7 @@ $rc-size: 3rem;
   min-height: $rc-size;
 
   input,
-  span::before {
+  .inline-label::before {
     position: absolute;
     top: 0;
     left: 0;
@@ -399,12 +399,12 @@ $rc-size: 3rem;
     opacity: 0;
     padding: 0;
     margin: 0;
-    &:focus + span:before {
+    &:focus + .inline-label:before {
       @include input-border-focus;
     }
   }
 
-  span {
+  .inline-label {
     display: block;
     font-size: initial;
     padding-top: 0.75rem;
@@ -416,12 +416,12 @@ $rc-size: 3rem;
 }
 
 .radio {
-  span::before,
-  span::after {
+  .inline-label::before,
+  .inline-label::after {
     border-radius: 50%;
   }
 
-  span::after {
+  .inline-label::after {
     content: '';
     width: $rc-size * 0.625;
     height: $rc-size * 0.625;
@@ -432,30 +432,30 @@ $rc-size: 3rem;
   }
 
   input:checked {
-   + span::after {
+   + .inline-label::after {
       background: $slate-blue;
     }
 
-    &:focus + span:after {
+    &:focus + .inline-label:after {
       background: $bright-blue;
     }
   }
 
-  input:focus + span:before {
+  input:focus + .inline-label:before {
     background: $white;
   }
 }
 
 
 .checkbox input:checked {
-  + span::before {
+  + .inline-label::before {
     background-size: 50% 40%;
     background-repeat: no-repeat;
     background-position: center;
     background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNNS43NTAwOSAxNi43NTVDNS41ODU3OSAxNi43NTU2IDUuNDIzIDE2LjcyMzYgNS4yNzExMSAxNi42NjFDNS4xMTkyMSAxNi41OTg0IDQuOTgxMjIgMTYuNTA2MyA0Ljg2NTA5IDE2LjM5TDAuMzY1MDkgMTEuODlDMC4yNDU4NzYgMTEuNzc0NiAwLjE1MDg1NCAxMS42MzY1IDAuMDg1NTY3OCAxMS40ODM5QzAuMDIwMjgxMyAxMS4zMzEzIC0wLjAxMzk2MjMgMTEuMTY3MiAtMC4wMTUxNjQ5IDExLjAwMTNDLTAuMDE2MzY3NiAxMC44MzUzIDAuMDE1NDk0NyAxMC42NzA3IDAuMDc4NTYyOSAxMC41MTcyQzAuMTQxNjMxIDEwLjM2MzcgMC4yMzQ2NDIgMTAuMjI0MyAwLjM1MjE3IDEwLjEwNzFDMC40Njk2OTcgOS45ODk4OCAwLjYwOTM4OCA5Ljg5NzI2IDAuNzYzMDkgOS44MzQ2M0MwLjkxNjc5MyA5Ljc3MiAxLjA4MTQzIDkuNzQwNiAxLjI0NzQgOS43NDIyN0MxLjQxMzM2IDkuNzQzOTQgMS41NzczMyA5Ljc3ODY1IDEuNzI5NzQgOS44NDQzN0MxLjg4MjE1IDkuOTEwMDkgMi4wMTk5NSAxMC4wMDU1IDIuMTM1MDkgMTAuMTI1TDUuNzUwMDkgMTMuNzRMMTcuODcwMSAxLjYyMDA0QzE4LjEwNjIgMS4zOTI2NSAxOC40MjIxIDEuMjY3MDkgMTguNzQ5OSAxLjI3MDM5QzE5LjA3NzYgMS4yNzM2OSAxOS4zOTA5IDEuNDA1NiAxOS42MjI0IDEuNjM3NjlDMTkuODUzOCAxLjg2OTc5IDE5Ljk4NDkgMi4xODM1MSAxOS45ODcyIDIuNTExMjdDMTkuOTg5NiAyLjgzOTAzIDE5Ljg2MzEgMy4xNTQ2MSAxOS42MzUxIDMuMzkwMDRMNi42MzUwOSAxNi4zOUM2LjUxODk2IDE2LjUwNjMgNi4zODA5NyAxNi41OTg0IDYuMjI5MDcgMTYuNjYxQzYuMDc3MTggMTYuNzIzNiA1LjkxNDM5IDE2Ljc1NTYgNS43NTAwOSAxNi43NTVaIiBmaWxsPSIjMUMzRTU3Ii8+Cjwvc3ZnPg==');
   }
 
-  &:focus + span::before {
+  &:focus + .inline-label::before {
     background-color: $bright-blue;
     background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8cGF0aCBkPSJNNS43NTAwOSAxNi43NTVDNS41ODU3OSAxNi43NTU2IDUuNDIzIDE2LjcyMzYgNS4yNzExMSAxNi42NjFDNS4xMTkyMSAxNi41OTg0IDQuOTgxMjIgMTYuNTA2MyA0Ljg2NTA5IDE2LjM5TDAuMzY1MDkgMTEuODlDMC4yNDU4NzYgMTEuNzc0NiAwLjE1MDg1NCAxMS42MzY1IDAuMDg1NTY3OCAxMS40ODM5QzAuMDIwMjgxMyAxMS4zMzEzIC0wLjAxMzk2MjMgMTEuMTY3MiAtMC4wMTUxNjQ5IDExLjAwMTNDLTAuMDE2MzY3NiAxMC44MzUzIDAuMDE1NDk0NyAxMC42NzA3IDAuMDc4NTYyOSAxMC41MTcyQzAuMTQxNjMxIDEwLjM2MzcgMC4yMzQ2NDIgMTAuMjI0MyAwLjM1MjE3IDEwLjEwNzFDMC40Njk2OTcgOS45ODk4OCAwLjYwOTM4OCA5Ljg5NzI2IDAuNzYzMDkgOS44MzQ2M0MwLjkxNjc5MyA5Ljc3MiAxLjA4MTQzIDkuNzQwNiAxLjI0NzQgOS43NDIyN0MxLjQxMzM2IDkuNzQzOTQgMS41NzczMyA5Ljc3ODY1IDEuNzI5NzQgOS44NDQzN0MxLjg4MjE1IDkuOTEwMDkgMi4wMTk5NSAxMC4wMDU1IDIuMTM1MDkgMTAuMTI1TDUuNzUwMDkgMTMuNzRMMTcuODcwMSAxLjYyMDA0QzE4LjEwNjIgMS4zOTI2NSAxOC40MjIxIDEuMjY3MDkgMTguNzQ5OSAxLjI3MDM5QzE5LjA3NzYgMS4yNzM2OSAxOS4zOTA5IDEuNDA1NiAxOS42MjI0IDEuNjM3NjlDMTkuODUzOCAxLjg2OTc5IDE5Ljk4NDkgMi4xODM1MSAxOS45ODcyIDIuNTExMjdDMTkuOTg5NiAyLjgzOTAzIDE5Ljg2MzEgMy4xNTQ2MSAxOS42MzUxIDMuMzkwMDRMNi42MzUwOSAxNi4zOUM2LjUxODk2IDE2LjUwNjMgNi4zODA5NyAxNi41OTg0IDYuMjI5MDcgMTYuNjYxQzYuMDc3MTggMTYuNzIzNiA1LjkxNDM5IDE2Ljc1NTYgNS43NTAwOSAxNi43NTVaIiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPg==');
   }
@@ -587,34 +587,23 @@ option:not(:checked) {
   @include line-height-to-rem(27);
 }
 
-@mixin display-2 {
-  font-weight: $t-light;
-  @include font-size-to-rem(50);
-  @include line-height-to-rem(59);
-  letter-spacing: -1px;
-}
-
-.t-display-2 {
-  @include display-2;
-}
-
-h1, .h1 {
+h1 {
   @include h1;
 }
 
-h2, .h2 {
+h2 {
   @include h2;
 }
 
-h3, .h3 {
+h3 {
   @include h3;
 }
 
-h4, .h4 {
+h4 {
   @include h4;
 }
 
-h5, .h5 {
+h5 {
   @include h5;
 }
 
@@ -638,13 +627,6 @@ h5, .h5 {
   @include contain-1090;
 }
 
-.form-header-meta {
-  position: relative;
-  margin-bottom: 1.5rem;
-}
-
-.form-header-meta,
-.form-section h1,
 .form-content-inner {
   max-width: 38rem;
 }
@@ -920,66 +902,9 @@ div[data-hidden] {
   }
 }
 
-// Progress
-
-.form-progress {
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
-.form-progress-bubble {
-  background: $purple-1;
-  padding: 0.25rem 1rem;
-  border-radius: 1.5rem;
-  position: relative;
-  top: -0.25rem;
-  font-size: 1rem;
-}
-
-.form-progress-bar {
-  font-size: 0;
-  color: transparent;
-  background: $purple-1;
-  height: 0.75rem;
-  display: inline-block;
-  width: 10rem;
-  position: relative;
-  top: -0.125rem;
-  border-radius: 0.375rem;
-  &::before {
-    content: '';
-    background: #6b8292;
-    height: 0.75rem;
-    border-radius: 0.375rem 0 0 0.375rem;
-    position: absolute;
-    top: 0;
-    left: 0;
-  }
-}
-
-@for $i from 1 to 90 {
-  .form-progress-bar-#{$i}::before {
-    width: $i * 1%;
-  }
-}
-
-@for $i from 91 to 99 {
-  .form-progress-bar-#{$i} {
-    background: #6b8292;
-    &::before {
-      background: $purple-1;
-      left: auto;
-      right: 0;
-      border-radius: 0 0.375rem 0.375rem 0;
-      width: (100% - ($i * 1%));
-    }
-  }
-}
-
-
 // Field length
 
+
 @for $i from 1 to 16 {
   .length-#{$i} {
     width: 2.5rem + (0.65rem * $i);
@@ -987,12 +912,4 @@ div[data-hidden] {
   }
 }
 
-// Header
-
-.hero-banner h2 {
-  font-size: 1rem;
-  font-weight: $t-normal;
-  margin-bottom: 0.25rem;
-}
-
 @import 'sfgov';

data/assets/js/script.js

@@ -76,9 +76,6 @@ $(document).ready(function(){
       } else {
         // If the page is visible, show it
         activePage.addClass('active');
-
-        // Scroll to the top of the page
-        document.getElementById("sfgov-header").scrollIntoView();
       }
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: form-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4.1
 platform: ruby
 authors:
 - Josh Rubenoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll