Merge branch 'develop'

Author: Ivan Stegic

_config.yml

@@ -19,7 +19,7 @@
 # in the templates via {{ site.myvariable }}.
 
 title: "Contractor’s Quick Start"
-subtitle: "Version 2.0.1, 11/06/21"
+subtitle: "Version 2.1.0, 11/07/21"
 
 nav:
   - title: "Start Here"

_includes/head.html

@@ -10,7 +10,13 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  <title>{{ page.title }} - {{ site.title }}</title>
+  {% if page.url == '/' %}
+    {% assign title = page.title -%}
+  {% else %}
+    {% assign title = page.title | append: " - " | append: site.title -%} 
+  {% endif %}
+
+  <title>{{ title }}</title>
 
   <link rel="stylesheet" href="{{ 'assets/css/main.css' | relative_url }}">
   <script src="{{ 'assets/js/main.js' | relative_url }}"></script>

_includes/header.html

@@ -5,7 +5,7 @@
         <span class="nav-brand-logo">
           <svg viewbox="0 0 67 22" fill="none" xmlns="http://www.w3.org/2000/svg"><title>TEN7</title><path d="M46.824.822H0V21.57h60.055l6.26-11.721V.822H46.825ZM15.416 7.976H11.45v9.53H7.263v-9.53h-3.73V4.46h11.848l.034 3.516Zm12.758 0h-6.706v1.361h5.537v3.293h-5.537v1.361h6.706v3.523H17.572V4.46h10.602v3.516Zm14.636 9.53h-3.833l-4.786-7.146v7.147h-3.91V4.46h4.89l3.639 5.396V4.46h3.916l.084 13.047Zm22.525-7.93L59.47 20.531H46.824V1.831h18.51v7.744Z" fill="#fff"/><path d="M52.523 17.748h4.838l4.744-9.228V4.098H50V7.79h7.657l-5.134 9.959Z" fill="#fff"/></svg>
         </span>
-        <span class="nav-brand-title is-hidden-touch">{{ site.title }}</span>
+        <span class="nav-brand-title">{{ site.title }}</span>
       </a>
     </div>
     <nav class="nav-main">

_includes/navigation.html

@@ -12,7 +12,7 @@
 
 		<div id="thisNavBar" class="navbar-menu">
 			<div class="navbar-item has-dropdown">
-				<a class="navbar-link">{{ nav_title }}</a>
+				<a class="navbar-link is-hidden-mobile is-hidden-touch">Start Here</a>
 				<div class="navbar-dropdown">
 					{% if item.subfolderitems.show_numbers %}
 						{% assign i = 1 %}

_layouts/page.html

@@ -19,14 +19,16 @@ <h1 class="post-title">{{ page.title | escape }}</h1>
   </article>
 
   <div class="progress-bar">
-    {%- if page.url == '/' %}
+    <div class="progress-bar-section is-read"></div>
+    
+    {%- if page.url == '/' -%}
       {% assign is_read = false %}
     {% else %}
       {% assign is_read = true %}
     {% endif %}
-    
+      
     {% for item in site.pages %}
-      {%- if item.url != '/404.html' and item.url != '/feed.xml' -%}
+      {%- if item.url != '/' and item.url != '/404.html' and item.url != '/feed.xml' -%}
         <div class="progress-bar-section {% if is_read %}is-read{% endif %}"></div>
       {%- endif -%}
       {%- if page.url == item.url -%}
@@ -38,37 +40,62 @@ <h1 class="post-title">{{ page.title | escape }}</h1>
 
 
 <div class="pager column is-8">
-    
-  {% if page.previous.title %}
+
+  {% if page.back_title %}
+    {% assign prev_title = page.back_title -%}
+  {% elsif page.previous.title %}
+    {% assign prev_title = page.previous.title -%}
+  {% endif %}
+
+  {% assign prev_url = page.previous.url %}
+
+  {% if page.url == site.pages.first.url %}
+
+    {% if page.back_title %}
+      {% assign prev_title = page.back_title %}
+    {% else %}
+      {% assign prev_title = "Home" -%}
+    {% endif %}
+
+    {% assign prev_url = '/' %}
+
+  {% endif %}
+
+  {% if prev_title %}
   <div class="pager-previous">
-    <a href="{{ page.previous.url }}" class="pager-link" title="{{ page.previous.title }}">
+    <a href="{{ prev_url }}" class="pager-link" title="{{ page.previous.title }}">
       <span class="pager-arrow pager-arrow--left">
         <svg width="15" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M12 5.813H1M5.813 10.625 1 5.812 5.813 1" stroke="#6330F4" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>
       </span>
       <span class="pager-prev-content">
         <span class="pager-direction">Back:</span>
-        <span class="pager-title">{{ page.previous.title }}</span>
+        <span class="pager-title">{{ prev_title }}</span>
       </span>
     </a>
   </div>
   {% endif %}
-  
+
+
   {% if page.url == '/' %}
     {% assign sub_title = "Let's Dive In:" %}
-    {% assign main_title = "Welcome" %}
+    {% assign next_title = site.pages.first.title %}
     {% assign next_url = site.pages.first.url %}
+  {% elsif page.next_title %}
+    {% assign sub_title = "Next:" %}
+    {% assign next_title = page.next_title %}
+    {% assign next_url = page.next.url %}
   {% elsif page.next.title %}
     {% assign sub_title = "Next:" %}
-    {% assign main_title = page.next.title %}
+    {% assign next_title = page.next.title %}
     {% assign next_url = page.next.url %}
   {% endif %}
-
-  {% if main_title %}
+  
+  {% if next_title %}
   <div class="pager-next">
-    <a href="{{ next_url }}" class="pager-link pager-link-next" title="{{ main_title }}">
+    <a href="{{ next_url }}" class="pager-link pager-link-next" title="{{ next_title }}">
       <span class="pager-next-content">
         <span class="pager-direction">{{ sub_title}}</span>
-        <span class="pager-title">{{ main_title }}</span>
+        <span class="pager-title">{{ next_title }}</span>
       </span>
       <span class="pager-arrow pager-arrow--right">
         <svg width="15" viewBox="0 0 13 12" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1 5.813h11M7.188 1 12 5.813l-4.813 4.812" stroke="#6330F4" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

_pages/01_admin.md

@@ -3,26 +3,26 @@ layout: page
 permalink: /admin.html
 title:  Admin
 opener: Chapter 1 of 4
+# Footer cards title control
+back_title: Intro
+# next_title: 
 ---
 
 - **Do I get any time off? When is TEN7 closed?**  
 As a contractor, you won’t get any paid time off. If you need to take time off, we ask that you give us as much notice as possible, so we can plan accordingly. TEN7 is closed every year on New Year’s Eve + Day, Memorial Day, Independence Day, Labor Day, Thanksgiving + Black Friday, and Christmas Eve + Day.
 - **Should I attend All Company Meetings?**  
-Once per quarter, we hold an all company meeting — sometimes virtual, sometimes in person. You're always welcome to join those meetings, and we encourage it! The one caveat is that we can't pay for your time to attend these meetings, since they are optional for you as a contractor. If you choose not to attend, we'll make sure to relay anything to you that's super important that may come out of them.
+Once per quarter, we hold an all company meeting — sometimes virtual, sometimes in person. You're always welcome to join those meetings, and we encourage it! The one caveat is that we can't pay for your time to attend these meetings, since they are optional for you as a contractor. If you choose not to attend, we'll make sure to relay anything to you that's super important that may come out of them. (We also record these meetings, so you could watch them after they happen, too.)
 - **Do I get any TEN7 issued hardware or software?**  
 Nope! ← simplest answer
-- **Do you have standups? Am I supposed to attend?**  
-Standups happen daily, at 9:30am CT. If you can attend, great! If not, that’s ok too. Either way, we ask that you please post your priorities each day in our #standup Slack channel.
-- **Does TEN7 have a Brand and House Style Guide?**  
-Why yes, we do! You can find it [here](https://docs.google.com/document/d/1nnrddeZrnxrE_J7nycWva9d42q3NZ6zAv2fHBbaeXHk/edit).
-- **What is the correct way to write our company name?**  
+- **Does TEN7 have Brand Guidelines?**  
+Why yes, we do! You can find them at [https://t7.io/brandguidelines](https://t7.io/brandguidelines).
+- **What is the correct way to write the company name?**  
 The rule of thumb is that "TEN7" should always be written in CAPS with NO space between the "TEN" and the number "7". Don’t use lower case, and don’t add spaces. The "TEN7" wordmark is geared to resemble the logo as closely as possible.
-- **What the heck is Pets of TEN7?**
-We're glad you asked! Pets of TEN7 is a special little webpage where you can find pictures of TEN7 employee pets. We have lots of animal friends, and wanted a place to showcase their cuteness. If you have an animal friend, be sure to let us know, and send us a pic. In the meantime, you can admire all the cuteness [here](https://pets.ten7.com/).
 - **What is TEN7’s contact information?**
     *   Call us: (612) 868-7884
     *   Email us: [hi@ten7.com](mailto:hi@ten7.com)
     *   Send us a postcard: TEN7, 9450 SW Gemini Dr #85756, Beaverton OR 97008-7105
-    *   Visit our website: [https://ten7.com/](https://ten7.com/)
-    *   Follow us on Twitter: [https://twitter.com/TEN7](https://twitter.com/TEN7)
+    *   Visit our website: [ten7.com](https://ten7.com/)
+    *   Follow us on Twitter: [twitter.com/TEN7](https://twitter.com/TEN7)
+    *   Listen to our podcast: [ten7.com/podcast](https://ten7.com/podcast)
 

_pages/02_time.md

@@ -3,10 +3,13 @@ layout: page
 title:  Time Tracking and Payment
 permalink: /time.html
 opener: Chapter 2 of 4
+# Footer cards title control
+# back_title:
+# next_title: 
 ---
 
 - **Where do I track my time?**  
-We use the Harvest app to track all time. Please track your time in real time, as you’re working on projects. Harvest has both desktop and mobile apps, and timers can also be started from tickets in Jira (for devs) as well as tasks in Asana (non-devs).
+We use the Harvest app to track all time. Please track your time in real time, as you’re working on projects. Harvest has both desktop and mobile apps, and timers can also be started from tickets in Jira.
 - **How do I know which projects or tasks I should track time to?**  
 Your team lead will let you know which projects, tasks or categories you should be tracking time to. If you have questions about logging your time, ask Dani!
 - **Can I bill my local setup and switching time?**  
@@ -21,6 +24,6 @@ Please submit your timesheet at the end of each week. We can’t pay you unless
 We ask that you invoice us on a monthly basis — on the 1st of every month for all time logged in the previous month. Your invoices should be dated as the last day of the previous month. For example, on 10/1, you will invoice for September, and the date on your invoice should be 9/30. Please make sure that your timesheets are approved __before__ invoicing us.
 - **How do I invoice?**  
 Email your invoice to [billing@ten7.com](mailto:billing@ten7.com). No need to itemize things, a total is fine. We rely on approved (and locked) Harvest timesheets for details. Make sure each invoice only contains time spent during one month. If you are invoicing for work done in multiple months, please submit them as separate invoices (one for each month's work). Please include a copy of your approved Harvest timesheet as a PDF attachment for the time period you are invoicing. You can generate this PDF in Harvest by going to "Reports" > "Detailed Time" and running a report for the time period for which you're invoicing.
-![How do I Invoice?](harvest-time-report.png)
+[![How do I Invoice?](harvest-time-report.png)](harvest-time-report.png)
 - **How and when do I get paid?**  
 Invoices are usually paid on receipt via direct deposit through Gusto. You'll see payment in your bank account within five business days. Don’t forget, you’re a 1099 contractor, so we **don't** withhold any taxes. You're responsible for applicable taxes in your jurisdiction.

_pages/03_process.md

@@ -3,6 +3,9 @@ layout: page
 title:  Process
 permalink: /process.html
 opener: Chapter 3 of 4
+# Footer cards title control
+# back_title:
+# next_title: 
 ---
 
 - **How should I use my TEN7 calendar? How should I indicate times I am busy for others to see?**  
@@ -24,4 +27,4 @@ We ask that you please keep all TEN7 tools and their contents separate from any
 - **What are the expectations around using Slack with clients?**  
 All client-facing channels include `#t7care_` , so please be mindful of what you post in those channels. Although, don’t be too wary; we trust you to post in those channels when you need something from a client. 
 - **What kind of project or ticket management system do you use?**  
-For the most part, we use Jira for technical work and Asana for non-technical work. We have a ticketing system in Jira, so that tickets can be assigned to you and you can change the status as you work on something. Someone will walk you through how to use Jira in more detail, before you start. 
+For the most part, we use [Jira](https://teamten7.atlassian.net/) for technical work and [Notion](https://ten7.notion.site/) for everything else. We have a ticketing system in Jira, so that tickets can be assigned to you and you can change the status as you work on something. Someone will walk you through how to use Jira in more detail, before you start. 

_pages/04_developer_questions.md

@@ -3,11 +3,16 @@ layout: page
 title:  Developer Specific
 permalink: /developer.html
 opener: Chapter 4 of 4
+# Footer cards title control
+# back_title:
+# next_title:
 ---
 
-- **Where does the code live?**  
-Most of the code you will work with will be in our own Gitlab server: gitlab.ten7.com, to which you can get access by asking for it in the `#developers` Slack channel. We have clients that host with Pantheon, Acquia and platform.sh, so each will have their own setup.
-- **How do I make changes?**  
+- **Do you have standups? Am I supposed to attend?**  
+Standups happen daily, at 9:30am CT. If you can attend, great! If not, that’s ok too. Either way, we ask that you please post your priorities each day in our `#standup` Slack channel.
+- **Where is all the code?**  
+Most of the code you will work with will be in our own Git server, to which you can get access by asking for it in the `#developers` Slack channel. We have clients that host with Pantheon, Acquia and platform.sh, so each will have their own setup.
+- **How do I make changes to code?**  
 We use the [git flow](https://nvie.com/posts/a-successful-git-branching-model/) branching model, and use feature branches extensively. Your code will always be reviewed by another set of eyes before it goes live. And we expect that you will spend time reviewing code from others as well. This is how we all learn!
 - **How do I get my code live?**  
 Getting your code live is usually a mix of finishing a feature branch, pushing the code into the develop branch, and then doing a release to the main branch. You probably won’t be responsible for doing releases to main.

assets/_src/sass/_settings.scss

@@ -21,3 +21,5 @@ $color-warmgray: #cec8c3;
 
 $link-color: $color-electricpurple;
 $link-hover: $color-mediumpurple;
+
+$content-width: 896px;