Skip to content

Commit 4bf13fb

Browse files
naher94naher94
authored
Merge pull request #223 from naher94/development
Content Update
2 parents d49d810 + d0bbaee commit 4bf13fb

File tree

15 files changed

+100
-68
lines changed

15 files changed

+100
-68
lines changed

‎_includes/banner.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<div class="site-banner-container">
2+
<a href="/2019">
3+
<div class="site-banner">
4+
<div class="row column large-12">
5+
<p>2019 Year in Review 🎉<span>Explore</span></p>
6+
</div>
7+
</div>
8+
</a>
9+
</div>

‎_includes/header.html‎

Lines changed: 53 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,75 @@
11
<header>
2-
3-
2+
3+
44
<nav class=" nav-container">
55
<div class="site-nav row column large-12">
6-
6+
77
<div class="menu-container">
8-
8+
99
<div class="burger-container">
1010
<input class="burger-btn" type="checkbox" id="burger-btn"/>
1111
<label class="burger-icon" for="burger-btn">
1212
<span class="nav-burger-icon"></span>
1313
</label>
1414
<ul class="menu-links">
1515
<div class="nav-item-container"><a class="nav" href="/index.html">Portfolio</a></div>
16-
{% for my_page in site.pages %}{% if my_page.title %}
17-
<div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
18-
{% endif %}{% endfor %}
16+
{% for my_page in site.pages %}
17+
{% if my_page.exclude != "true" %}
18+
{% if my_page.title %}
19+
<div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
20+
{% endif %}
21+
{% endif %}
22+
{% endfor %}
1923
<div class="nav-item-container"><a class="nav" href="http://blog.rehanbutt.com">Blog</a></div>
2024
<div class="nav-item-container"><a class="nav" href="http://resources.rehanbutt.com">Resources</a></div>
2125
<div class="nav-item-container"><a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a></div>
2226
</ul>
23-
27+
2428
<div class="mobile-navbar">
25-
<a class="nav" href="/index.html">Portfolio</a>
26-
{% for my_page in site.pages %}{% if my_page.title == "About" %}
27-
<a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
28-
{% endif %}{% endfor %}
29-
</div>
29+
<a class="nav" href="/index.html">Portfolio</a>
30+
{% for my_page in site.pages %}
31+
{% if my_page.title == "About" %}
32+
<a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
33+
{% endif %}
34+
{% endfor %}
35+
</div>
3036
</div>
31-
<!--
32-
<a href="#" class="menu">
33-
<svg width="16px" height="9px" viewBox="0 0 16 9">
34-
<g fill-rule="evenodd">
35-
<g transform="translate(-30.000000, -44.000000)" fill="#FFFFFF">
36-
<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>
37-
</g>
38-
</g>
39-
</svg>
40-
</a>
41-
-->
4237

43-
<div class="navbar">
44-
<a class="nav" href="/index.html">Portfolio</a>
45-
{% for my_page in site.pages %}{% if my_page.title %}
46-
<a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
47-
{% endif %}{% endfor %}
48-
<a class="nav" href="http://blog.rehanbutt.com">Blog</a>
49-
<a class="nav" href="http://resources.rehanbutt.com">Resources</a>
50-
<a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a>
51-
</div>
52-
<div class="logo">
53-
<a href="{{ site.baseurl }}/">
54-
<img src="{{'/img/rehanLogo.svg'| prepend: site.baseurl }}" alt="Rehan's Logo">
55-
</a>
56-
</div>
57-
<div class="mobile-navbar-full">
58-
<div class="nav-item-container"><a class="nav" href="/index.html">Portfolio</a></div>
59-
{% for my_page in site.pages %}{% if my_page.title %}
60-
<div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
61-
{% endif %}{% endfor %}
62-
<div class="nav-item-container"><a class="nav" href="http://blog.rehanbutt.com">Blog</a></div>
63-
<div class="nav-item-container"><a class="nav" href="http://resources.rehanbutt.com">Resources</a></div>
64-
<div class="nav-item-container"><a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a></div>
65-
</div>
38+
<div class="navbar">
39+
<a class="nav" href="/index.html">Portfolio</a>
40+
{% for my_page in site.pages %}
41+
{% if my_page.exclude != "true" %}
42+
{% if my_page.title %}
43+
<a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
44+
{% endif %}
45+
{% endif %}
46+
{% endfor %}
47+
<a class="nav" href="http://blog.rehanbutt.com">Blog</a>
48+
<a class="nav" href="http://resources.rehanbutt.com">Resources</a>
49+
<a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a>
50+
</div>
51+
<div class="logo">
52+
<a href="{{ site.baseurl }}/">
53+
<img src="{{'/img/rehanLogo.svg'| prepend: site.baseurl }}" alt="Rehan's Logo">
54+
</a>
55+
</div>
56+
57+
<!-- Is this used? -->
58+
<div class="mobile-navbar-full">
59+
<div class="nav-item-container"><a class="nav" href="/index.html">Portfolio</a></div>
60+
{% for my_page in site.pages %}
61+
{% if my_page.exclude != "true" %}
62+
{% if my_page.title %}
63+
<div class="nav-item-container"><a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></div>
64+
{% endif %}
65+
{% endif %}
66+
{% endfor %}
67+
<div class="nav-item-container"><a class="nav" href="http://blog.rehanbutt.com">Blog</a></div>
68+
<div class="nav-item-container"><a class="nav" href="http://resources.rehanbutt.com">Resources</a></div>
69+
<div class="nav-item-container"><a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a></div>
70+
</div>
6671
</div>
6772
</div>
6873
</nav>
69-
70-
<!--
71-
<div class="nav-container">
72-
<div class="navbar navscroll">
73-
<a class="nav" href="/index.html">Portfolio</a>
74-
{% for my_page in site.pages %}{% if my_page.title %}
75-
<a class="nav" href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a>
76-
{% endif %}{% endfor %}
77-
<a class="nav" href="http://blog.rehanbutt.com">Blog</a>
78-
<a class="nav" href="http://resources.rehanbutt.com">Resources</a>
79-
<a class="nav" target="_blank" href="https://society6.com/rehanbutt">Store</a>
80-
</div>
81-
<a href="{{ site.baseurl }}/">
82-
<img src="{{'/img/rehanLogo.svg'| prepend: site.baseurl }}" style="height:50px;" alt="Rehan's Logo">
83-
</a>
84-
</div>
85-
-->
74+
8675
</header>

‎_layouts/default.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
{% include foot.html %}
1818
</body>
1919

20-
</html>
20+
</html>

‎_projects/cmunyc.markdown‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ tags: web Dzgn.IO
1010

1111
<div class="image-container"><img src="../img/nyc/nycDIO.png" alt="Home Page" /></div>
1212

13-
<div>
13+
<!-- <div>
1414
<a target="_blank" href="http://nyc.dzgn.io">
1515
<div class="nycButton contentButton"> Check out the full site
1616
</div>
1717
</a>
18-
</div>
18+
</div> -->
1919

2020
<div class="image-container"><img src="../img/nyc/screenshots.png" alt="Page Screens" /></div>
2121

@@ -50,6 +50,8 @@ When starting this project we looked into other Carnegie Mellon campuses as well
5050
<img src="../img/nyc/brandSketches.png" alt="Brand Sketches" />
5151
<img src="../img/nyc/brandingProcess.png" alt="Branding Process" />
5252
<img src="../img/nyc/colorIteration.png" alt="Color Iteration" class="image-center" style="width:70%"/>
53+
<img src="../img/nyc/persona.jpg" alt="Persona" />
54+
<img src="../img/nyc/persona2.jpg" alt="Persona" />
5355
<img src="../img/nyc/programChart.png" alt="Program Chart" />
5456
<img src="../img/nyc/originalSiteBreakdown.png" alt="Original Site Breakdown" />
5557
<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
6163

6264
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.
6365

64-
<!--talk about the overal mission of this site-->
66+
<!--talk about the overal mission of this site-->

‎_projects/lucidnyc.markdown‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
layout: post
3+
title: "Lucid NYC"
4+
tile-name: "Lucid NYC"
5+
thumbnail: "lucid.png"
6+
banner:
7+
date: 2016-02-15
8+
tags: digital UI UX
9+
---
10+
11+
<div class="image-container"><img src="../img/lucid/hero.png" alt="Home page iteration: hero shot"/></div>
12+
13+
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.
14+
15+
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.
16+
17+
<div class="image-container" style="margin-bottom:100px"><img src="../img/lucid/mainpages.png" alt="Home about and article final pages"/></div>
18+
19+
## Process
20+
21+
<div class="image-container"><img src="../img/lucid/brandingExploration.svg" alt="Branding iterations with different typefaces"/></div>
22+
23+
<div class="image-container"><img src="../img/lucid/brandingExploration2.svg" alt="Branding iterations with different shapes"/></div>
24+
25+
<div class="image-container"><img src="../img/lucid/colors.svg" alt="Brand color exploration"/></div>
26+
27+
<div class="image-container"><img src="../img/lucid/tileIterations.png" alt="Article Tile Design Iterations"/></div>
28+
29+
<div class="image-container"><img src="../img/lucid/splashpage.png" alt="Mobile and desktop splash pages mockups"/></div>

‎img/lucid/BrandingExploration2.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎img/lucid/brandingExploration.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎img/lucid/colors.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎img/lucid/hero.png‎

194 KB
Loading

‎img/lucid/mainpages.png‎

591 KB
Loading

0 commit comments

Comments
 (0)