Beginning Keith feedback

josephbergdoll · Jul 22, 2013 · 8e99720 · 8e99720
1 parent 1be8e5f
commit 8e99720
Show file tree

Hide file tree

Showing 11 changed files with 152 additions and 17 deletions.
diff --git a/css/style.css b/css/style.css
@@ -253,6 +253,11 @@ section.products {
       text-align: center; }
       section.products a.product div h3 {
         line-height: 1.5em; }
+      section.products a.product div h4 {
+        color: black;
+        letter-spacing: 0.1em;
+        margin: 1em 0 0 0;
+        color: #6e7174; }
 
 footer {
   text-transform: uppercase;
@@ -503,7 +508,8 @@ section.static-copy {
     margin: 0 auto 2em; }
   section.static-copy h4 {
     font-weight: 600;
-    margin: 1em 0 0 0;
+    position: relative;
+    margin: 4em 0 -1.35em 0;
     color: #6e7174;
     width: 20%;
     line-height: 1.25em; }
@@ -516,7 +522,7 @@ section.static-copy {
     color: #6e7174; }
     section.static-copy p.secondary {
       font-size: 0.813em;
-      margin: 0 auto 2em; }
+      margin: 0 auto 1em; }
   section.static-copy figure {
     margin: 3em auto;
     width: 2em;

diff --git a/css/style.scss b/css/style.scss
@@ -335,6 +335,12 @@ section.products {
 			h3 {
 				line-height: 1.5em;
 			}
+			h4 {
+  			color: black;
+  			letter-spacing: 0.1em;
+  			margin: 1em 0 0 0;
+  			color: $darkertype;
+			}
 		}
 	}
 }
@@ -691,7 +697,8 @@ section.static-copy {
 	}
 	h4 {
 	 	font-weight: 600;
-	 	margin: 1em 0 0 0;
+	 	position: relative;
+	 	margin: 4em 0 -1.35em 0;
 	 	color: $darkertype;
 	 	width: 20%;
 	 	line-height: 1.25em;
@@ -706,7 +713,7 @@ section.static-copy {
 	color: $darkertype;
 	&.secondary {
   	font-size: 0.813em;
-  	margin: 0 auto 2em;
+  	margin: 0 auto 1em;
 	}
 	}
 	figure {

diff --git a/index.html b/index.html
@@ -80,7 +80,7 @@ <h1>Your cart is empty</h1>
 <a href="index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="products/">Products</a>
-<a href="mission/">Mission</a>
+<a href="mission/">About</a>
 <a href="journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart

diff --git a/journal/index.html b/journal/index.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<title></title>
+<meta name="description" content="" />
+  	<meta name="keywords" content="" />
+	<meta name="robots" content="" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
+	<link rel="shortcut icon" type="image/x-icon" href="">
+
+<!-- CSS Styles -->
+<link href="../css/style.css" rel="stylesheet" type="text/css">
+
+<!-- jQuery() -->
+
+ <!--[if lt IE 9]>
+<script src="js/html5shiv.js"></script>
+<![endif]-->
+
+<script src="http://code.jquery.com/jquery-latest.min.js"></script>
+<script src="../js/scripts-ck.js"></script>
+
+<!-- TypeKit-->
+<script type="text/javascript" src="//use.typekit.net/qcv7rrn.js"></script>
+<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+
+</head>
+
+<body class="full">
+
+<section class="cart-disp-full">
+	<article>
+
+	<div class="cart-contain">
+	<table border="0" cellspacing="0" cellpadding="0" class="shopcart">
+		<thead>
+			<tr class="first">
+			<th>&nbsp;</th>
+				<th class="td-quantity sm" scope="col">Qty.</th>
+				<th class="td-price sm" scope="col">Price</th>
+				<th class="td-remove sm" scope="col">Remove</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th class="td-name" scope="row">Board Shorts</th>
+				<td class="td-quantity">2</td>
+				<td class="td-price">$198.00</td>
+				<td class="td-remove">x</td>
+			</tr>
+			<tr>
+				<th class="td-name" scope="row">Echo Shirt</th>
+				<td class="td-quantity">1</td>
+				<td class="td-price">$129.00</td>
+				<td class="td-remove">x</td>
+			</tr>
+		</tbody>
+	</table>
+	</div>
+	<div class="cart-actions">
+	<h3>Subtotal</h3>
+	<h2>$327.00</h2>
+	<a class="checkout" href="#">
+	Checkout
+	</a>
+	</div>
+	<div class="clear"></div>
+	</article>
+</section>
+
+<section class="cart-disp-empty">
+  <article>
+    <h1>Your cart is empty</h1>
+    <p><a href="products/">Click here to check out our products</a></p>
+  </article>
+</section>
+
+<header>
+<article>
+<a href="../index.html" class="logo">Ten Thousand</a>
+<nav>
+<a href="../products/">Products</a>
+<a href="../mission/">About</a>
+<a href="../journal/">Journal</a>
+<span class="cart">
+	<a href="#">Cart
+	<figure class="counter">3<div class="closebtn">close</div></figure>
+	</a>
+</span>
+</nav>
+<div class="clearright"></div>
+</article>
+</header>
+
+
+<footer>
+	<article>
+	<aside>
+		<nav>
+		  <a href="../legal/">Legal</a>
+			<a href="../terms/">Terms</a>
+			<a href="../privacy/">Privacy</a>
+			<a href="../shipping-info/">Shipping Info</a>
+		</nav>
+	</aside>
+	<aside>
+		<nav>
+			<a href="#">Email</a>
+			<a href="#">Twitter</a>
+			<a href="#">Facebook</a>
+			<a href="#">888 212 4913</a>
+		</nav>
+	</aside>
+	<div class="clear"></div>
+	<h5> &copy; Ten Thousand Inc 2013. All rights reserved.</h5>
+	</article>
+</footer>
+
+</body>
+</html>
diff --git a/legal/index.html b/legal/index.html
@@ -33,7 +33,7 @@
 <a href="../index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="../products/">Products</a>
-<a href="../mission/">Mission</a>
+<a href="../mission/">About</a>
 <a href="../journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart

diff --git a/mission/index.html b/mission/index.html
@@ -80,7 +80,7 @@ <h1>Your cart is empty</h1>
 <a href="../index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="../products/">Products</a>
-<a href="../mission/">Mission</a>
+<a href="../mission/">About</a>
 <a href="../journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart

diff --git a/privacy/index.html b/privacy/index.html
@@ -33,7 +33,7 @@
 <a href="../index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="../products/">Products</a>
-<a href="../mission/">Mission</a>
+<a href="../mission/">About</a>
 <a href="../journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart
@@ -65,15 +65,13 @@ <h4>Facebook</h4>
 
 <p class="secondary">Using Facebook as well as other Site connection methods, we may utilize your personal data to better your individual Ten Thousand experience. We take your privacy seriously and abide by all Facebook terms, policies and agreements. Your data is kept secure and no actions are taken on your behalf without prior permission.</p>
 
-<h4>Additional Means of Obtaining Information</h4>
-
-<h4 class="sub">Cookies</h4>
+<h4>Cookies</h4>
 <p class="secondary">As you navigate our site, your preferences are remembered through the temporary use of "session" cookies. Cookies enable our systems to gather information about your browser as well as monitor the navigational patterns you take while browsing the site. Site users have the option to accept or disable cookies at any time through their browsers. If you choose to disable your cookies, your user experience may be limited.</p>
 
-<h4 class="sub">Site Statistics</h4>
+<h4>Site Statistics</h4>
 <p class="secondary">Web data is collected to monitor user trends on our Site. Analytical data such as hits to our server, traffic patterns and page views shows us where our audience is coming from and how they interact with us online. This type of collected information does not personally identify specific Site users. In addition, like most websites, our Site may utilize "web beacons," "pixel tags" or other tracking technologies to help us study the actions of our users through non-personally identifiable information. This data may be aggregated with similar data collected from other users to help us improve Ten Thousand products, services and our overall Site experience.</p>
 
-<h4>Information Sharing with Outside Parties</h4>
+<h4>Information Sharing</h4>
 
 <p class="secondary">Ten Thousand will never share, rent or sell your e-mail address for any reason. We do not share your personal information with third-party companies, though we may provide aggregate Site statistics and related information to reputable third party vendors. This data will never include personal information. We do not share credit card information with third parties except for the purpose of processing your order payment and as required by law. If for any reason you choose to access a third party website linked to our Site, you do so at your own risk. We are not held responsible for how these outside parties collect, use, protect or disclose the information you provide them.</p>
 

diff --git a/products/index.html b/products/index.html
@@ -82,7 +82,7 @@ <h1>Your cart is empty</h1>
 <a href="../index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="../products/">Products</a>
-<a href="../mission/">Mission</a>
+<a href="../mission/">About</a>
 <a href="../journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart
@@ -102,6 +102,7 @@ <h1>Your cart is empty</h1>
 	<div class="desc">
 	<h3>Board Short</h3>
 	<h3 class="purple">$99</h3>
+	<h4>More colors available</h4>
 	</div>
 	</a>
 
@@ -110,6 +111,7 @@ <h3 class="purple">$99</h3>
 	<div class="desc">
 	<h3>Board Short</h3>
 	<h3 class="purple">$99</h3>
+	<h4>More colors available</h4>
 	</div>
 	</a>
 
@@ -118,6 +120,7 @@ <h3 class="purple">$99</h3>
 	<div class="desc">
 	<h3>Board Short</h3>
 	<h3 class="purple">$99</h3>
+	<h4>More colors available</h4>
 	</div>
 	</a>
 
@@ -126,6 +129,7 @@ <h3 class="purple">$99</h3>
 	<div class="desc">
 	<h3>Board Short</h3>
 	<h3 class="purple">$99</h3>
+	<h4>More colors available</h4>
 	</div>
 	</a>
 

diff --git a/products/product.html b/products/product.html
@@ -83,7 +83,7 @@ <h1>Your cart is empty</h1>
 <a href="../index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="../products/">Products</a>
-<a href="../mission/">Mission</a>
+<a href="../mission/">About</a>
 <a href="../journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart

diff --git a/shipping-info/index.html b/shipping-info/index.html
@@ -33,7 +33,7 @@
 <a href="../index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="../products/">Products</a>
-<a href="../mission/">Mission</a>
+<a href="../mission/">About</a>
 <a href="../journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart

diff --git a/terms/index.html b/terms/index.html
@@ -33,7 +33,7 @@
 <a href="../index.html" class="logo">Ten Thousand</a>
 <nav>
 <a href="../products/">Products</a>
-<a href="../mission/">Mission</a>
+<a href="../mission/">About</a>
 <a href="../journal/">Journal</a>
 <span class="cart">
 	<a href="#">Cart