start editing setting page

some relevant stuff updated

app/views/desktop/settings.html.erb

@@ -5,19 +5,34 @@
 		</div>
 	</div>
 	<div id="holder">
-		<div class="scrollbar"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
-		<div class="viewport">
-			<div class="overview">
-				<ul>
-					<li><a href="" class="admtxt">Overview</a></li>
-					<li><a href="" class="admtxt">Account</a></li>
-					<li><a href="" class="admtxt">Sections</a></li>
-					<li><a href="" class="admtxt">Theme</a></li>
-					<li><a href="" class="admtxt">Connection</a></li>
-				</ul>
+		
+				<div id="panel_l" class="ph">
+					<div class="s_menu sm_v">
+						<ul>
+							<li><a href="" class="admtxt hh2 w2 hp">Overview</a></li>
+							<li><a href="" class="admtxt hh2 w2 hp">Account</a></li>
+							<li><a href="" class="admtxt hh2 w2 hp">Sections</a></li>
+							<li><a href="" class="admtxt hh2 w2 hp">Theme</a></li>
+							<li><a href="" class="admtxt hh2 w2 hp">Connection</a></li>
+						</ul>
+					</div>
+				</div>
+				<div id="panel_r" class="ph pw admbg">
+					<div class="s_tab stb_h">
+						<ul>
+							<li><a href="#st1" class="hh2 hp thmtxt thmc1">Select Theme</a></li>
+							<li><a href="#st2" class="hh2 hp admtxt">Custom Theme</a></li>
+						</ul>
+					</div>
+					<div class="scrollbar sb_v"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
+					<div class="viewport">
+						<div class="overview w100">
+							<div id="st1" class="st_c hp vp">try</div>
+							<div id="st2" class="st_c hp vp">test</div>
+						</div>
+					</div>
+				</div>
 				<div class="clear"></div>
-<<<<<<< HEAD
-=======
 				<select id="change_theme">
 				<option value='default'>Default Theme</option>
 				<option value='snake'>Snake Theme</option>
@@ -27,8 +42,5 @@
 				</select>
 				<br />
 				<button onClick="od.tempFunc();">Save</button>
->>>>>>> desktop_harry
-			</div>
-		</div>
 	</div>
 </div>