From f692d6a5fa1bfa9e25bbc8a0fe42d06b5fca7ddf Mon Sep 17 00:00:00 2001
From: Elia Sommerlad <Elia@Elias-MacBook-Pro.local>
Date: Tue, 24 Mar 2015 11:53:38 +0800
Subject: [PATCH] up to date

---
 .DS_Store                 | Bin 0 -> 8196 bytes
 css/custom.css            |  40 ++++++++++++-
 images/.DS_Store          | Bin 6148 -> 6148 bytes
 images/screenshots/lg.png | Bin 405304 -> 405407 bytes
 images/sidebar/.DS_Store  | Bin 0 -> 6148 bytes
 index.html                | 121 +++++++++++++++++++++++++++++---------
 6 files changed, 132 insertions(+), 29 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 images/sidebar/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..37f3d7faa108384afb7c4377e391dff06356b600
GIT binary patch
literal 8196
zcmeHLTWl0n7(U;&lo@uUr=>tywqdo1R4WupEuzTw!Yx3kZt0EUGP^Uvz;veW%(h5V
z?W;sI@fM86#0x?&`lR6Hh2SMd;*-RPiI+rQe9=UG(8LG-GiMe`FK@;WnUkFJo%3JL
z%zX3BoH@f7LwnI!!&oh2Ora`}$Elg22*0S)N-VSpCn%rg?VRh{)MXXZf+Iu3K*T`A
zK*T`AK*Ydx!GKt(sVK9o`_db=5d#qeHzWh%{g9$6FdgEA#NgFIO|S(ZEGKhNsLw@*
zFco4t#0iPyp#qsoC{qz`F(A{)o(kjAAx=n?=?vlK1L2Vo?obdMo#syk;S6bsQ5!K3
zF)*D0@z|8HJoA`mc$4?<78_zZJHSll<wm{XobBc)^sn5oZFzoE(`CfU%I8$fRn&R$
zczj-*SIyg(Ip~gNeBCd4?RsHvFtQ9Y7xue!|6r-#O}`1Q^z~eiWsYWfO^56Fy5*RK
zNvVUqmSec1?QYRAyupl|uh%mCgIT_?t6+{$YM1VqJ(g$XEZg!QQB+k`)GV(Z8*6E9
zZcMFP*EHUk8f$HBqJDGh_&7hWC`%h!+IIC1j~{#WwbxI+aq9F(pGayDzFydZDO7z*
z;|ey3lv&xby^$`-R_w_VTi;A#OS>u2-qE>evzF!6;_P=1`<Cl?J!Zip%<@W)XxyH6
zo$%^<^R8VSa=a|B%IkK%XzRY&X4@I-s7ba;FJEwNyUX<~F-?D;Zyxc5Z<?!bz;g?J
zM=)8RMf1xjUi8cdOq$dhF*|8$k3&5(e{nK(>+P%8t>1X5l2=u0HQJ)y5y7x+?im&2
z_v>EXbPUTmFhIA&@vVm}v!GU?QSEm0AyZ~8Ni0?QyUL(J)9!K&5n}|N#FE4^McFIt
z9R-tGY1VE@ELXX%bbECEa*Eru29<ki_hC|jOl{OwDcn%^*m};irD=`UtneLb?}(&O
z8f&yxMeWPGLql|Wp0sU9+^g`<ln2Fucj}(Md)Rd7*wwtM^1daBM8B}N8HQ;nic+8M
zKObnIKD|<Ep<V)G_30+rRcX<xV{2I_+sXE`0vlt;*$MUvdxxE6=hy{yk$uT7vme<n
z>{s?1`<?v>Ack_xK{b{li8?f3Et=7SyKoOWu^C&j4ZF~TUi4!C`(fb_Yz(1@NAVaY
z@Hn2vGk6Zq<0Rh3dw3ro;6r?jFYpz<mnRh~NqB4Nd?n%s!fPZ<N)4au*t0V$HMwQ$
zw#x0-u~IM37y4XKvvASk)bfT^&FeR|U%BUj5+{o+(3KQUAgGdHrs&~Xz1EV7lXcp%
z+4R4MlxZGOg!K8`OCnmU)9O`~vtW>1kzA?JL%?IwcSrJ0A#q+Ny-nI$p=LfudRw$s
zA$MLby&E*r>kgGy$l<1Bn~*P8Wble)T>Uq6`Z=leYxWcSnN<1*`x|l8;$~9jYTS)Y
zNTY+4xdpq?h5M1gAod|k%FN*~Dbs<AhjA2R7$=1aeICOTIF6@q0x#f2yo8r=3a4=f
zZ{jVS#koMU7jO}m@U7J46}|3|<5G+7rs{PhQ*dn8IY4%y@fbUFb<q-8fniFJut#NP
z2Fj$lR_y;b&;I{^=H$p4F%U8EzhD66ote&dx|GtF!_=!1d+ij}{ZvH}aT5}Q6l#L)
tIAO3ICk(gaL2QabMNT@z35jH(@}K_*2tFL6_5bR3YP9|bLcGD6e*g`jNC*G`

literal 0
HcmV?d00001

diff --git a/css/custom.css b/css/custom.css
index 6e7ce8b..ffb9d28 100644
--- a/css/custom.css
+++ b/css/custom.css
@@ -1 +1,39 @@
-/* You can include your custom styling here */
\ No newline at end of file
+
+#allchannels {
+	color: white;
+	background-color: #FF4719;
+	border:300px;
+}
+
+#bodytitle {
+	position: center;
+	font-size: 12px;
+	text-align: center;
+}
+
+.panel-panel-default {
+	float: auto;
+	height: 999px;
+}
+
+.btn-group {
+	padding: 2px;
+}
+
+.col-sm-3-col-md-2-sidebar{
+	padding-right: 40px;
+}
+
+.mainbox {
+	float: center;
+}
+#benWoods {
+	font-size: 12px;
+}
+
+#facebook, #twitter {
+	padding-top: 0px;
+}
+#FB {
+	height: 30px;
+}
diff --git a/images/.DS_Store b/images/.DS_Store
index 416248fd8c12136cf0d449da01ea09771fdc4d47..4188834b9c50dd174a4840987155fa5c291c4864 100644
GIT binary patch
delta 306
zcmZoMXfc=|#>B!ku~2NHo}wr>0|Nsi1A_nqLo!1?LtaX8a!ykI=0xV@%rYP;c7`;D
zM20ekOl0Z&9LC8!Op1{#3^_nO=?wW0T|i-=4i<)7ppHzKQD}l?!9{sF`FZIOTN$_+
zih%|fF{A=v9*~^@G_QoAc(M(X0wee2Sf+kKPEHQacmav(YI7rF9R(vxv&ny%+^ulv
yLv{xaC7b1#Oc^=h3MV@<KikaC!OsB<5umTXGf(ChapVB{g9+$DhRqQoYnTCqyhVoq

delta 92
zcmZoMXfc=|#>B)qu~2NHo}wr-0|Nsi1A_nqLo!1?Lta^MQC?2|#=_-{jLehOSrj*a
tVpU_DY|MUTvjWEh=FRLJ{2V~Nn*}+(Gf(ChapVB%25D#693irX836iE6<h!S

diff --git a/images/screenshots/lg.png b/images/screenshots/lg.png
index d796c01a63b91c0feed7a68d1dfb9c8a279b5a6a..ca6da9c59abf3f530d97ac00e93b050b4637fa12 100644
GIT binary patch
delta 156
zcmdmSPh$Rki48##OiZkkLnOYNb15K!irk#MVylwOv@~0#jFOT9D}DXEV!gza{G?R9
z<osNHkc_^eo`Js7<TgpC$$gT1lM^Kk6+yyQ{zaLoc_oP@nfZBkhBjcOaIwjIB`sOJ
fa(>4*|B`I~CCLcHOhC*G#4JF}y8V|Vo1G{C!Rt0w

delta 66
zcmbP#Ut-5Si48##OpNm;he&*%+$1SB`I4mJ<UUEW$@)@yEPSu_2{k85wI@n30x=U1
RGXpUT5VLMilwz|J1pqtR7100y

diff --git a/images/sidebar/.DS_Store b/images/sidebar/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/index.html b/index.html
index ce15d9c..7f52ef3 100644
--- a/index.html
+++ b/index.html
@@ -35,15 +35,21 @@
             <img src="images/logo/tnw-logo.svg" alt="" width="auto" height="100%">
           </a>
         </div>
+
         <div id="navbar" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav navbar-right">
-            <li><a href="#">Dashboard</a></li>
-            <li><a href="#">Settings</a></li>
-            <li><a href="#">Profile</a></li>
-            <li><a href="#">Help</a></li>
+          <ul class="nav navbar-nav navbar-left">
+            <li><a href="#" id="blog">Blog</a></li>
+            <li><a href="#" id="conference">Conference</a></li>
+            <li><a href="#" id="deals">Deals</a></li>
+            <li><a href="#" id="pro">Pro</a></li>
           </ul>
           <form class="navbar-form navbar-right">
-            <input type="text" class="form-control" placeholder="Search...">
+            <ul class="nav navbar-nav navbar-right">
+              <li><a id="facebook" href="#"> <img src="http://theawesomedaily.theawesomedaily.netdna-cdn.com/wp-content/uploads/2014/08/tshare.png" id="FB"></a></li>
+              <li><a id="twitter" href="#"><img src="http://theawesomedaily.theawesomedaily.netdna-cdn.com/wp-content/uploads/2014/08/fshare.png"></a></li>
+            <li><input type="text" class="form-control" placeholder="Search..."></li>
+            </ul>
+            
           </form>
         </div>
       </div>
@@ -51,31 +57,90 @@
 
     <div class="container-fluid">
       <div class="row">
-        <div class="col-sm-3 col-md-2 sidebar">
-          <ul class="nav nav-sidebar">
-            <li class="active"><a href="#">Overview <span class="sr-only">(current)</span></a></li>
-            <li><a href="#">Reports</a></li>
-            <li><a href="#">Analytics</a></li>
-            <li><a href="#">Export</a></li>
-          </ul>
-          <ul class="nav nav-sidebar">
-            <li><a href="">Nav item</a></li>
-            <li><a href="">Nav item again</a></li>
-            <li><a href="">One more nav</a></li>
-            <li><a href="">Another nav item</a></li>
-            <li><a href="">More navigation</a></li>
-          </ul>
-          <ul class="nav nav-sidebar">
-            <li><a href="">Nav item again</a></li>
-            <li><a href="">One more nav</a></li>
-            <li><a href="">Another nav item</a></li>
-          </ul>
+        <div class="hidden-xs hidden-sm hidden-md col-lg-3 sidebar">
+        <div class="btn-group btn-group-justified" role="group" aria-label="...">
+          <div class="btn-group">
+            <button class="btn btn-default btn-sl dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false" id="allchannels">All Channels <span class="caret"></span>                     
+            </button> 
+          </div>
+            <ul class="dropdown-menu" role="menu" >
+              ...
+            </ul>
         </div>
-        <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-          <h1>News Content</h1>
+          <div class="btn-group btn-group-justified" role="group" aria-label="...">
+            <div class="btn-group" role="group">
+              <button type="button" class="btn btn-default disabled">Latest</button>
+            </div>
+            <div class="btn-group" role="group">
+              <button type="button" class="btn btn-default">Popular</button>
+            </div>
+          </div>
+          <div class="list-group">
+
+            <a href="#" class="list-group-item"> 
+               <p class="list-group-item-text"><img src="images/sidebar/kits-and-themese-feat-60x50.jpg" align="left">91% off a Lieftime Of Premium Ul Kits & Design Resources</p>
+            <a href="#" class="list-group-item">  
+              <p class="list-group-item-text">Square Takes Its Register Software platform Worldwide</p>
+              <p>   </p>
+              <p> 10 minutes ago </p>
+            </a>
+            </a>
+            <a href="#" class="list-group-item">
+              <p class="list-group-item-text">The Weird Science of Frist Impressions</p>
+              <p>   </p>
+              <p> <em>18 minutes ago</em> </p>
+            <a href="#" class="list-group-item">  
+              <p class="list-group-item-text"></p>
+            </a>
+            </a>
+            <a href="#" class="list-group-item">
+              <p class="list-group-item-text">Print Photos on Your Adidas Sneakers. Why not?</p>
+              <p>   </p>
+              <p> 27 minutes ago </p>
+            <a href="#" class="list-group-item">  
+              <p class="list-group-item-text">Amazon begins its Black Friday deals a week early</p>
+              <p>   </p>
+              <p> 30 minutes ago </p>
+            </a>
+            </a>
+            <a href="#" class="list-group-item">
+              <p class="list-group-item-text">Facebook Expands Its Drone</p>
+            </a>
+          </div>
+          
+        </div>
+        <div class="col-xs-12 col-sm-12 main col-md-12 col-lg-9 col-lg-offset-3">
+          <h1 id= "bodytitle">Support TNW - <span style ="color: orange;"> <u>become Pro</u> </span> and we can ditch the banners. </h1> <!--I know I should use 'style' but I had no idea how to do it otherwise-->
+        
+      <div class="mainBox col-xs-12 col-sm-7">
+         <img src="images/main/Square-Reader-520x245.jpg" alt= "oops;" width="520" height="245">    
+          <h2 id ="benWoods"><em>By</em> <b>BEN WOODS </b>-<em>20 Nov' 14</em></h2>
+          <h1>Square officially launches its register software platform worldwide</h1>
+
+            <p> Square has today announced that its point-of-scale (POS) sofware Square Register is now available globaly, having previously been restricted to users in the US, Canada and Japan. Announced at the The Financial...Keep reading</p>
+      </div>
+          
+      <div class="row">
+        <div class="col-xs-12 col-sm-4">
+          <div class="thumbnail1">
+            <img src="images/main/well-dressed-man-in-coat-520x245.jpg" alt="oops_sorry" width="100%" height="auto" >
+            <div class="caption">
+              <p> <em>20 Nov' 14 - By</em> Jory Mackay</p>
+              <p> The weird science of first impressions</p>
+            </div>  
+          </div>
         </div>
+        
+        <div class="col-xs-12 col-sm-4">
+          <div class="thumbnail2">
+            <img src="images/main/FireShot-Screen-Capture-357-adidas-Originals-I-mi-ZX-FLUX-Photo-Print-App-www_adidas_co_uk_mizxflux-520x245.png" alt="oops_again" width="100%" height="auto" >
+            <div class="caption">
+              <p> <em> 20 Nov' 14 - By</em> Paul Sawers</p>
+              <p> Adidas now lets Americans print photos on their sneakers too</p>
+            </div>
+          </div>
+        </div> 
       </div>
-    </div>
 
     <!-- Bootstrap core JavaScript
     ================================================== -->