Fix up UI elements, fill in Resource page

_config.yml

@@ -6,18 +6,18 @@ gems:
 # Site settings
 title: "Consensual Software"
 description: > # this means to ignore newlines until "email:"
-   How Consent and Software Design Intersect
+   Where Consent and Software Design Intersect
 
-email: admin@consensualsoftware.com
+email: hi@consensualsoftware.com
 #blog logo to be changed
 logo: "/assets/images/cs_logo.png"
 float_logo: true # true, false (default)
 
 # blog cover
-cover: "/assets/images/cA4aKEIPQrerBnp1yGHv_IMG_9534-3-2.jpg"
+cover: "/assets/images/background_image.jpg"
 
-name: 'Danielle and Lucas'
-author: 'Danielle and Lucas'
+name: 'Danielle & Lucas'
+author: 'Danielle & Lucas'
 author_image: "/assets/images/author.jpg" # should be added
 
 paginate:	5
@@ -33,31 +33,9 @@ twitter_handle: '@consentsoftware'
 #google_analytics: UA-XXXXX-X
 
 #### social icons and sharing options
-# social:
-#   - icon:	twitter
-#     url:	https://twitter.com/consensualsoftwaredesign
-#     desc: Follow me on twitter
-#     share_url: http://twitter.com/share
-#     share_title: ?text=
-#     share_link: "&url="
-
-#  - icon:	facebook
-#    url:	https://facebook.com/???
-#    desc: Connect with me facebook
-#    share_url: https://www.facebook.com/sharer.php
-#    share_title: ?t=
-#    share_link: "&u="
-
-  # - icon:	github
-  #   url:	https://github.com/dirkfabisch
-  #   desc:	Fork me on github
-  #   share_url:
-  #   share_title:
-  #   share_link:
-
-#  - icon:	google-plus
-#    url:	https://google.com/???
-#    desc:	Add me on google+
-#    share_url:
-#    share_title:
-#    share_link:
+social:
+  - icon:	twitter
+    url:	https://twitter.com/@consentsoftware
+
+  - icon:	github
+    url:	https://github.com/TheLucasMoore/consensual_software

_layouts/page.html

@@ -50,7 +50,7 @@ <h4 class="author-name" itemprop="author" itemscope itemtype="http://schema.org/
       <div class="inner">
         <h1 class="blog-title">{{ site.title }}</h1>
         <h2 class="blog-description">{{ site.description }}</h2>
-        <a href={{ "/" | prepend: site.baseurl }} class="btn">Back to Overview</a>
+        <a href={{ "/" | prepend: site.baseurl }} class="btn">Back Home</a>
       </div>
     </div>
     {% include javascripts.html %}

_posts/2017-08-20-Welcome.markdown

@@ -3,8 +3,7 @@ layout: post
 title:  "Welcome"
 date:   2017-08-20 14:34:25
 categories: about
-image: /assets/article_images/2014-11-30-mediator_features/night-track.JPG
-image2: /assets/article_images/2014-11-30-mediator_features/night-track-mobile.JPG
+image: /assets/article_images/header.jpg
 ---
 
 This is an open source project advocating for better use consent in software design.

about.md

@@ -1,7 +1,9 @@
 ---
 layout: page
 title: About Us
+date:   2017-08-20 14:34:25
 permalink: /about/
+image: /assets/article_images/header.jpg
 ---
 # About Us
 

index.html

@@ -14,19 +14,21 @@
     {% endif %}
     <h1 class="blog-title">{{ site.title }}</h1>
     <h2 class="blog-description">{{ site.description }}</h2>
+
     <div class="custom-links">
+      <a href={{ "/about/" | prepend: site.baseurl }}>About</a> -
+      <a href={{ "/resources/" | prepend: site.baseurl }}> Resouces</a> -
+      <a href={{ "/pledge/" | prepend: site.baseurl }}> Sign The Pledge</a> -
+      <a href="https://medium.com/consensual-software" target="_new"> Read on Medium</a>
+      <br>
       {% for social in site.social %}
         {% if social.url %}
-            <a class="icon-{{ social.icon }}" href="{{ social.url }}" {% if social.desc %} title="{{ social.desc }}"{% endif %}">
+            <a class="icon-{{ social.icon }}" href="{{ social.url }}" target="_new" {% if social.desc %} title="{{ social.desc }}"{% endif %}">
               <i class="fa fa-{{ social.icon }}"></i>
             </a>
-            &nbsp;&nbsp;·&nbsp;&nbsp;
+            &nbsp;&nbsp;
         {% endif %}
       {% endfor %}
-      <a href={{ "/about/" | prepend: site.baseurl }}>About</a> -
-      <a href={{ "/resources/" | prepend: site.baseurl }}> Resouces</a> -
-      <a href={{ "/pledge/" | prepend: site.baseurl }}> Sign The Pledge</a> -
-      <a href="https://medium.com/consensual-software" target="new"> Read on Medium</a>
     </div>
 </header>
 

resources.md

@@ -1,10 +1,26 @@
 ---
-layout: post
+layout: page
 date: 2014-08-29 14:34:25
 title: Resources
 permalink: /resources/
-image: /assets/article_images/2014-08-29-welcome-to-jekyll/desktop.JPG
+image: /assets/article_images/header.jpg
 ---
 
-Some resources:
-* Example
+### Links
+* [Danielle's Recommended Readings](http://danielleleong.com/recommended-readings/) - Navigating the world of online harassment can be tricky, as one can get stuck on two questions: why do people do this and how can we fix it?
+
+### Talks
+* [Security War Stories: The Battle for the Internet of Things](https://www.infoq.com/presentations/security-iot-2017?utm_source=infoq&utm_medium=QCon_EarlyAccessVideos&utm_campaign=QConLondon2017) - Alasdair Allan focuses on the sort of security problems people face when building Internet of Things devices, and the underlying differences between the Internet of Things and the digital Internet that drive those security issues.
+
+* [Key takeaways on mobile apps and privacy](http://www.pewresearch.org/fact-tank/2015/11/10/key-takeaways-mobile-apps/) - A new Pew Research Center report examines more than 1 million apps available in the Google Play Store from June to September 2014 and explores the wide range of permissions that Android apps require as a condition of use.
+
+### Books
+* [Ask: Building Consent Culture](https://www.amazon.com/Ask-Building-Consent-Kitty-Stryker-ebook/dp/B075RH642S/ref=sr_1_1?ie=UTF8&qid=1508806460&sr=8-1&keywords=ask+building+consent+culture) - Have you ever heard the phrase "It's easier to ask forgiveness than permission?" Violating consent isn't limited to sexual relationships, and our discussions around consent shouldn't be, either.
+
+* [Terms and Conditions](https://www.drawnandquarterly.com/terms-and-conditions) - A graphic novel of iTunes terms and conditions.
+
+### Software
+* [HTTPS Everywhere Browser Extension](https://www.eff.org/https-everywhere) - HTTPS Everywhere is an extension created by EFF and the Tor Project which automatically switches thousands of sites from insecure "http" to secure "https". Encrypt the web automatically!
+
+### What else?
+* Please feel free to [open a pull request](https://github.com/TheLucasMoore/consensual_software/pulls), [tweet at us](https://twitter.com/@consentsoftware) or send us an email if you want to share links to go here.

sign_the_pledge.md

@@ -1,15 +1,18 @@
 ---
 layout: page
+date:   2017-08-20 14:34:25
 title: Sign the Pledge
 permalink: /pledge/
+image: /assets/article_images/header.jpg
 ---
 
-Add your name by [opening a pull request](#).
-
 # The Pledge
 
-We believe that a user's explicit consent is a fundamental part of ethical software design and promise to advocate for our users in the software we write. (Not final pledge, obviously)
+We believe that a user's explicit consent is a fundamental part of ethical software design and promise to advocate for our users in the software we write. We have read about [consent]() and the [actions we can take]() and, by signing our names here, hope to create a statement on record, to begin a conversation and to advocate for the people using the software we write by earning their consent and including them in the conversation.
+
+
+Add your name by [opening a pull request](https://github.com/TheLucasMoore/consensual_software/pulls).
 
-## Signed,
+### Signed,
 
-* [My Name](#) - Company Name
+* [My Name](#) - Company Name (optional)