Photoshoot section + o

shnist · Mar 18, 2012 · b0961ba · b0961ba
1 parent 3bacdb8
commit b0961ba
Show file tree

Hide file tree

Showing 32 changed files with 67 additions and 16 deletions.
diff --git a/assets/css/styles.css b/assets/css/styles.css
@@ -13,7 +13,7 @@ p{font-family: 'Open Sans', sans-serif;font-weight:400;}
 .full-image{width:768px;height:1024px;background:url('../../images/photo_full.jpg')}
 .quote{font-size:40px; background:#fff; width:250px; height:150px; /*padding:15px;margin: 300px 0 0 200px; */ margin:0;padding:0;}
 
-/* Main */
+/* Common styles */
 .left {float:left;}
 .right {float:right;}
 .clear {clear:both;}
@@ -24,8 +24,10 @@ p{font-family: 'Open Sans', sans-serif;font-weight:400;}
     -webkit-backface-visibility: hidden;
 } 
 
+/* Allows scrolling when navigaiton is open */
 .wrapper{-webkit-overflow-scrolling : auto;}
 
+/* Page wrappers */
 #content-wrapper{padding:0 50px 0 50px;width:669px;position:relative;}
 
 /* Navigation */
@@ -67,13 +69,20 @@ h2.title-box-feed {background:url('../../images/title_box_feed.gif') no-repeat 0
 .twitter-feed{background:#fff;margin:0 0 0 80px;}
 .twitter-feed p{background: url('../../images/twitter_quotes.gif') no-repeat top left;min-height:85px;color:#000; width:485px; padding:10px 65px 0 65px;}
 .twitter-feed span{margin:0 0 0 65px;}
+.twitter-feed .divider{width:562px; height:20px; background:#ffa633;}
 .refresh-feed{margin:15px 0 0 640px;}
 
+/* Photoshoot section */
+.photo-page-container{padding:50px 44px 50px 45px; background:#000;}
+.photo-page-container ul {list-style:none;float:left;}
+.photo-page-container ul li{padding:0 1px 0px 0;}
+
+.photo-large{position:relative;}
+.close-button{position:absolute;top:65px;left:65px;}
+
 /* Hot this month page */
 .hot-items-col1{float:left;}
 .hot-items-col2{float:right;}
-/*.hot-items-col2 .hot-items {width:126px;}*/
-/*.hot-items-col2 .hot-items .title-hot-4 {margin-left:40px;}*/
 
 h3.tip-hot-1{background:url('../../images/hot_tip_purple.gif') no-repeat right; width:40px; height:74px; padding:0 80px 0 0;margin:170px 0 0 0;}
 .title-hot-1{background:url('../../images/title_hot_book.png') no-repeat 10px #a352b2;text-indent:-999em; width:73px; height:14px;padding:30px 7px 30px 0;display:block;}

diff --git a/assets/scripts/app.js b/assets/scripts/app.js
@@ -23,7 +23,7 @@
 
                 }
             } else {
-                if($('.ui-page-active').prop('id') !== '6'){
+                if($('.ui-page-active').prop('id') !== '7'){
                     var nextPageNumber = Number($('.ui-page-active').attr('id')) + 1;
                     var nextPage = 'page-' + nextPageNumber + '.shtml';
 

diff --git a/assets/scripts/neatTweet-hashtag-min.js b/assets/scripts/neatTweet-hashtag-min.js
diff --git a/images/icon_close.gif b/images/icon_close.gif
diff --git a/images/images/fashionpad_designs_long_09.jpg b/images/images/fashionpad_designs_long_09.jpg
diff --git a/images/images/screen-02.jpg b/images/images/screen-02.jpg
diff --git a/images/images/screen-04.jpg b/images/images/screen-04.jpg
diff --git a/images/images/screen-05.jpg b/images/images/screen-05.jpg
diff --git a/images/images/screen-07.jpg b/images/images/screen-07.jpg
diff --git a/images/images/screen-08.jpg b/images/images/screen-08.jpg
diff --git a/images/images/screen.jpg b/images/images/screen.jpg
diff --git a/images/images/title_contents.gif b/images/images/title_contents.gif
diff --git a/images/images/title_hot.gif b/images/images/title_hot.gif
diff --git a/images/photo1.jpg b/images/photo1.jpg
diff --git a/images/photo_1.jpg b/images/photo_1.jpg
diff --git a/images/photo_thumb1.jpg b/images/photo_thumb1.jpg
diff --git a/images/photo_thumb2.jpg b/images/photo_thumb2.jpg
diff --git a/images/photo_thumb3.jpg b/images/photo_thumb3.jpg
diff --git a/images/photo_thumb4.jpg b/images/photo_thumb4.jpg
diff --git a/images/photo_thumb5.jpg b/images/photo_thumb5.jpg
diff --git a/images/photo_thumb6.jpg b/images/photo_thumb6.jpg
diff --git a/images/photo_thumb7.jpg b/images/photo_thumb7.jpg
diff --git a/images/photo_thumb8.jpg b/images/photo_thumb8.jpg
diff --git a/images/photo_thumb9.jpg b/images/photo_thumb9.jpg
diff --git a/page-1.shtml b/page-1.shtml
@@ -9,7 +9,7 @@
 
 
 <body> 
-<!-- Start of first page: #one -->
+<!-- Start of page: #1 -->
 <div data-role="page" id="1" class="swipe">
 	<div class="wrapper">
 		<div data-role="content" class="content" id="content-wrapper">

diff --git a/page-2.shtml b/page-2.shtml
@@ -9,7 +9,7 @@
 
 
 <body> 
-<!-- Start of first page: #2 -->
+<!-- Start of page: #2 -->
 <div data-role="page" id="2" class="swipe">
 	<div class="navigation-bar-top">
 		<div class="navigation-cover-button left">
@@ -44,7 +44,7 @@
                             <div class="contents_section_title">
                                 <a href="page-4.shtml" data-role="button"><img src="images/contents_title_pastels.gif" alt="Pastels this spring"></a>
                             </div>
-                            <a href="page-photo-1.shtml" data-transition="pop" title="Go to new/non-swipe page"><img src="images/contents_image_4.jpg" alt="Pastels this spring"></a>
+                            <img src="images/contents_image_4.jpg" alt="Pastels this spring">
                             <div class="contents_section_title">
                                 <img src="images/contents_title_pastels.gif" alt="Pastels this spring">
                             </div>

diff --git a/page-3.shtml b/page-3.shtml
@@ -9,11 +9,11 @@
 
 
 <body> 
-<!-- Start of first page: #3 -->
+<!-- Start of page: #3 -->
 <div data-role="page" id="3" class="swipe">
 	<div class="wrapper">
 		<div data-role="content" class="content">
-			<p>Hello Aaron</p>
+			<p>Page 3</p>
 			<!--<p><a name="fb_share"></a></p>-->
 		</div>  <!-- /content -->
 	</div> 	<!-- /wrapper -->

diff --git a/page-4.shtml b/page-4.shtml
@@ -9,7 +9,7 @@
 
 
 <body> 
-<!-- Start of first page: #4 -->
+<!-- Start of page: #4 -->
 <div data-role="page" id="4" class="swipe">
 	<div class="wrapper">
 		<div data-role="content" class="content">

diff --git a/page-5.shtml b/page-5.shtml
@@ -9,7 +9,7 @@
 </head> 
 
 <body> 
-<!-- Start of first page: #5 -->
+<!-- Start of page: #5 -->
 <div data-role="page" id="5" class="swipe">
 	<div class="wrapper">
 		<div data-role="content" class="content">

diff --git a/page-6.shtml b/page-6.shtml
@@ -9,7 +9,7 @@
 
 
 <body> 
-<!-- Start of first page: #3 -->
+<!-- Start of page: #6 -->
 <div data-role="page" id="6" class="swipe">
 	<div class="wrapper">
 		<div data-role="content" class="content">

diff --git a/page-7.shtml b/page-7.shtml
@@ -0,0 +1,39 @@
+
+<!DOCTYPE html> 
+<html class="ui-mobile-rendering"> 
+
+<head>
+	<title>FashionPad | Article</title> 
+	<!--#include virtual="blocks/head.html" -->
+</head> 
+
+
+<body> 
+<!-- Start of page: #7 -->
+<div data-role="page" id="7" class="swipe">
+	<div class="wrapper">
+		<div data-role="content" class="content">
+			<div class="photo-page-container">
+				<div class="col">
+					<a href="page-photo-1.shtml" data-transition="pop" title="Photo1"><img src="images/photo_thumb1.jpg" alt="Photo 1"></a>
+					<img src="images/photo_thumb2.jpg" alt="Photo 2">
+					<img src="images/photo_thumb3.jpg" alt="Photo 3">
+				</div>
+				<div class="col">
+					<img src="images/photo_thumb4.jpg" alt="Photo 4">
+					<img src="images/photo_thumb5.jpg" alt="Photo 5">
+					<img src="images/photo_thumb6.jpg" alt="Photo 6">
+				</div>
+				<div class="col">
+					<img src="images/photo_thumb7.jpg" alt="Photo 7">
+					<img src="images/photo_thumb8.jpg" alt="Photo 8">
+					<img src="images/photo_thumb9.jpg" alt="Photo 9">
+				</div>
+			</div>
+		</div>  <!-- /content -->
+	</div> 	<!-- /wrapper -->
+</div><!-- /page 7 -->
+
+<!--#include virtual="blocks/scripts.html" -->   
+</body>
+</html>
diff --git a/page-photo-1.shtml b/page-photo-1.shtml
@@ -10,11 +10,14 @@
 
 <body> 
 
-<!-- Start of first page: #6 -->
-<div data-role="page" id="6">
+<!-- Start of page: #6 -->
+<div data-role="page" >
 	<div id="wrapper">
 		<div data-role="content" class="content">
-			<p><a href="page-2.shtml" data-transition="pop" data-direction="reverse">Close/go back to contents page/page number 2</a><p>
+			<div class="photo-page-container">
+				<div class="photo-large"><img src="images/photo1.jpg" alt="Photo"></div>
+				<div class="close-button"><a href="page-7.shtml" data-transition="pop" data-direction="reverse"><img src="images/icon_close.gif" alt="close"></a><div>
+			</div>
 		</div>  <!-- /content -->
 	</div> 	<!-- /wrapper -->
 </div><!-- /page 6 -->