Merge pull request #223 from naher94/development

Content Update

_includes/banner.html

@@ -0,0 +1,9 @@
+<div class="site-banner-container">
+  <a href="/2019">
+    <div class="site-banner">
+      <div class="row column large-12">
+        <p>2019 Year in Review 🎉<span>Explore</span></p>
+      </div>
+    </div>
+  </a>
+</div>

_includes/header.html

@@ -1,86 +1,75 @@
 <header>
-  
-  
+
+
   <nav class=" nav-container">
   <div class="site-nav row column large-12">
-    
+
     <div class="menu-container">
-      
+
       <div class="burger-container">
         <input class="burger-btn" type="checkbox" id="burger-btn"/>
         <label class="burger-icon" for="burger-btn">
           <span class="nav-burger-icon"></span>
         </label>
         <ul class="menu-links">
           <div class="nav-item-container"><a class="nav" href="/index.html">Portfolio</a></div>
-        {% for my_page in site.pages %}{% if my_page.title %}
-          <div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
-        {% endif %}{% endfor %}
+        {% for my_page in site.pages %}
+          {% if my_page.exclude != "true" %}
+            {% if my_page.title %}
+              <div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
+            {% endif %}
+          {% endif %}
+        {% endfor %}
         <div class="nav-item-container"><a class="nav" href="http://blog.rehanbutt.com">Blog</a></div>
         <div class="nav-item-container"><a class="nav" href="http://resources.rehanbutt.com">Resources</a></div>
         <div class="nav-item-container"><a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a></div>
         </ul>
-        
+
         <div class="mobile-navbar">
-      <a class="nav" href="/index.html">Portfolio</a>
-      {% for my_page in site.pages %}{% if my_page.title == "About" %}
-        <a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
-        {% endif %}{% endfor %}
-    </div>
+          <a class="nav" href="/index.html">Portfolio</a>
+          {% for my_page in site.pages %}
+            {% if my_page.title == "About" %}
+              <a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
+            {% endif %}
+          {% endfor %}
+        </div>
       </div>
-<!--
-      <a href="#" class="menu">
-        <svg width="16px" height="9px" viewBox="0 0 16 9">
-          <g fill-rule="evenodd">
-            <g transform="translate(-30.000000, -44.000000)" fill="#FFFFFF">
-              <path d="M30,44 L46,44 L46,47 L30,47 L30,44 Z M30,50 L46,50 L46,53 L30,53 L30,50 Z"></path>
-            </g>
-          </g>
-        </svg>
-      </a>
--->
 
-    <div class="navbar">
-      <a class="nav" href="/index.html">Portfolio</a>
-        {% for my_page in site.pages %}{% if my_page.title %}
-        <a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
-        {% endif %}{% endfor %}
-        <a class="nav" href="http://blog.rehanbutt.com">Blog</a>
-        <a class="nav" href="http://resources.rehanbutt.com">Resources</a>
-        <a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a>
-    </div>
-    <div class="logo">
-      <a href="{{ site.baseurl }}/">
-        <img src="{{'/img/rehanLogo.svg'| prepend: site.baseurl }}" alt="Rehan's Logo">
-      </a>
-    </div>
-    <div class="mobile-navbar-full">
-      <div class="nav-item-container"><a class="nav" href="/index.html">Portfolio</a></div>
-      {% for my_page in site.pages %}{% if my_page.title %}
-        <div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
-      {% endif %}{% endfor %}
-      <div class="nav-item-container"><a class="nav" href="http://blog.rehanbutt.com">Blog</a></div>
-      <div class="nav-item-container"><a class="nav" href="http://resources.rehanbutt.com">Resources</a></div>
-      <div class="nav-item-container"><a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a></div>
-    </div>
+      <div class="navbar">
+        <a class="nav" href="/index.html">Portfolio</a>
+          {% for my_page in site.pages %}
+            {% if my_page.exclude != "true" %}
+            {% if my_page.title %}
+              <a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
+            {% endif %}
+            {% endif %}
+          {% endfor %}
+          <a class="nav" href="http://blog.rehanbutt.com">Blog</a>
+          <a class="nav" href="http://resources.rehanbutt.com">Resources</a>
+          <a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a>
+      </div>
+      <div class="logo">
+        <a href="{{ site.baseurl }}/">
+          <img src="{{'/img/rehanLogo.svg'| prepend: site.baseurl }}" alt="Rehan's Logo">
+        </a>
+      </div>
+
+      <!-- Is this used? -->
+      <div class="mobile-navbar-full">
+        <div class="nav-item-container"><a class="nav" href="/index.html">Portfolio</a></div>
+        {% for my_page in site.pages %}
+          {% if my_page.exclude != "true" %}
+            {% if my_page.title %}
+              <div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
+            {% endif %}
+          {% endif %}
+        {% endfor %}
+        <div class="nav-item-container"><a class="nav" href="http://blog.rehanbutt.com">Blog</a></div>
+        <div class="nav-item-container"><a class="nav" href="http://resources.rehanbutt.com">Resources</a></div>
+        <div class="nav-item-container"><a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a></div>
+      </div>
     </div>
   </div>
 </nav>
-
-<!--
-  <div class="nav-container">
-    <div class="navbar navscroll">
-      <a class="nav" href="/index.html">Portfolio</a>
-      {% for my_page in site.pages %}{% if my_page.title %}
-      <a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
-      {% endif %}{% endfor %}
-      <a class="nav" href="http://blog.rehanbutt.com">Blog</a>
-      <a class="nav" href="http://resources.rehanbutt.com">Resources</a>
-      <a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a>
-    </div>
-    <a href="{{ site.baseurl }}/">
-      <img src="{{'/img/rehanLogo.svg'| prepend: site.baseurl }}" style="height:50px;" alt="Rehan's Logo">
-    </a>
-  </div>
--->
+
 </header>

_layouts/default.html

@@ -17,4 +17,4 @@
     {% include foot.html %}
 </body>
 
-</html>
+</html>

_projects/cmunyc.markdown

@@ -10,12 +10,12 @@ tags: web Dzgn.IO
 
 <div class="image-container"><img src="../img/nyc/nycDIO.png" alt="Home Page" /></div>
 
-<div>
+<!-- <div>
 <a target="_blank" href="http://nyc.dzgn.io">
     <div class="nycButton contentButton"> Check out the full site
     </div>
 </a>
-</div>
+</div> -->
 
 <div class="image-container"><img src="../img/nyc/screenshots.png" alt="Page Screens" /></div>
 
@@ -50,6 +50,8 @@ When starting this project we looked into other Carnegie Mellon campuses as well
 <img src="../img/nyc/brandSketches.png" alt="Brand Sketches" />
 <img src="../img/nyc/brandingProcess.png" alt="Branding Process" />
 <img src="../img/nyc/colorIteration.png" alt="Color Iteration" class="image-center" style="width:70%"/>
+<img src="../img/nyc/persona.jpg" alt="Persona" />
+<img src="../img/nyc/persona2.jpg" alt="Persona" />
 <img src="../img/nyc/programChart.png" alt="Program Chart" />
 <img src="../img/nyc/originalSiteBreakdown.png" alt="Original Site Breakdown" />
 <img src="../img/nyc/siteBreakdownDetail.png" alt="Site Breakdown Detail" />
@@ -61,4 +63,4 @@ When starting this project we looked into other Carnegie Mellon campuses as well
 
 In order to keep track and make sure everyone was up to speed on what each team was doing we decided to use Slack for communications and updates project wide.
 
-<!--talk about the overal mission of this site-->
+<!--talk about the overal mission of this site-->

_projects/lucidnyc.markdown

@@ -0,0 +1,29 @@
+---
+layout: post
+title:  "Lucid NYC"
+tile-name: "Lucid NYC"
+thumbnail: "lucid.png"
+banner:
+date:   2016-02-15
+tags: digital UI UX
+---
+
+<div class="image-container"><img src="../img/lucid/hero.png" alt="Home page iteration: hero shot"/></div>
+
+LucidNYC is an inspirational, informative, and popular salon series which introduces attendees to cutting edge projects by leading innovators across all fields. Lucid was developed to gain early insight into new trends and to track the pulse of cultural and technological change among early adopters and influencers.
+
+Throughout this project the goal for the team was to bring to light the interesting stories shared by the future viewing speakers, under a new brand and web language.
+
+<div class="image-container" style="margin-bottom:100px"><img src="../img/lucid/mainpages.png" alt="Home about and article final pages"/></div>
+
+## Process
+
+<div class="image-container"><img src="../img/lucid/brandingExploration.svg" alt="Branding iterations with different typefaces"/></div>
+
+<div class="image-container"><img src="../img/lucid/brandingExploration2.svg" alt="Branding iterations with different shapes"/></div>
+
+<div class="image-container"><img src="../img/lucid/colors.svg" alt="Brand color exploration"/></div>
+
+<div class="image-container"><img src="../img/lucid/tileIterations.png" alt="Article Tile Design Iterations"/></div>
+
+<div class="image-container"><img src="../img/lucid/splashpage.png" alt="Mobile and desktop splash pages mockups"/></div>