From 1c8ab8ad7a5812d41eafd22546308f7aa5a7c850 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 10 Dec 2012 14:56:45 +0530
Subject: [PATCH] c

---
 website/css/website.css               | 99 +++++----------------------
 website/templates/css/login.css       |  9 ++-
 website/templates/html/blog_page.html | 15 +---
 website/templates/html/outer.html     | 15 ++--
 website/templates/js/blog_page.js     |  2 +-
 website/templates/pages/login.html    | 68 +++++++++---------
 6 files changed, 69 insertions(+), 139 deletions(-)

diff --git a/website/css/website.css b/website/css/website.css
index eb9e6cc834..4d08434ed0 100644
--- a/website/css/website.css
+++ b/website/css/website.css
@@ -1,69 +1,35 @@
-header .container, .content {
-	width: 900px;
-}
+.content {
+	width: 800px;
+}	
 
 div#body_div {
-	padding-top: 80px;
+	padding: 0px;
 	min-height: 400px;
+	width: 800px;
+	margin: 40px auto;
+	box-shadow: 1px 1px 3px 3px #ccc;
+}
+
+.navbar-inner {
+	border: 0px;
+	border-bottom: 1px solid #ddd;
+	border-radius: 0px;
 }
 
 p, li {
 	line-height: 1.6em;
 }
 
-pre {
-    background-color: #F8F8F8;
-    border: 1px solid #CCCCCC;
-    border-radius: 3px 3px 3px 3px;
-    font-size: 13px;
-    line-height: 19px;
-    overflow: auto;
-    padding: 6px 10px;
-	margin-bottom: 9px;
+.layout-wrapper {
+	box-shadow: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
 }
 
-.web-head-section {
-	margin-bottom: 20px
+.layout-side-section {
+	padding: 8px;
 }
 
-.web-main-section {
-	width: 65%;
-	float: left;
-	margin-bottom: 20px;
-}
-
-.web-side-section {
-	width: 30%;
-	float: right;
-	margin-bottom: 20px;
-	margin-right: 15px;
-	color: #606060;
-	overflow-x: hidden;
-	font-size: 90%;
-}
-
-.web-page-status {
-	padding: 7px;
-	margin-top: -20px;
-	color: #777;
-	clear: both;
-	text-align: right;
-}
-
-.web-page-status a,
-.web-page-status a:hover,
-.web-page-status a:visited {
-	padding: 2px;
-	background-color: #777;
-	color: #FFF;
-	text-decoration: none;
-}
-
-.web-page-status a:hover {
-	background-color: #444;
-}
-
-
 footer {
 
 }
@@ -98,33 +64,6 @@ footer {
 	margin-top: -12px;
 }
 
-/* slide view */
-
-.next-slide {
-	margin: 0px -27px 100px -27px;
-	background: #ffffff; /* Old browsers */
-	background: -moz-linear-gradient(top,  #eeeeee 0%, #fff 100%); /* FF3.6+ */
-	background: -webkit-linear-gradient(top,  #eeeeee 0%, #fff 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top,  #eeeeee 0%, #fff 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top,  #eeeeee 0%, #fff 100%); /* IE10+ */
-	background: linear-gradient(top,  #eeeeee 0%, #fff 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#fff',GradientType=0 ); /* IE6-9 */
-	height: 36px;
-}
-
-.slide-shadow {
-	background: #eeeeee; /* Old browsers */
-	background: -moz-linear-gradient(top,  #bababa 0%,#eeeeee 100%); /* FF3.6+ */
-	background: -webkit-linear-gradient(top,  #bababa 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top,  #bababa 0%,#eeeeee 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top,  #bababa 0%,#eeeeee 100%); /* IE10+ */
-	background: linear-gradient(top,  #bababa 0%,#eeeeee 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bababa', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */	
-	height: 3px;
-	margin: 100px -27px 0px -27px;
-	border-top: 1px solid #bababa;
-}
-
 .two-column {
 	width: 50%;
 	float: left;
diff --git a/website/templates/css/login.css b/website/templates/css/login.css
index 4c044d8d8c..a3cab85f5b 100644
--- a/website/templates/css/login.css
+++ b/website/templates/css/login.css
@@ -1,7 +1,12 @@
 	<style>
 		#login_wrapper {
-			width: 300px !important;
-			margin: 20px auto;
+			height: 300px;
+			padding-top: 50px;
+		}
+
+
+		#login_wrapper h3 {
+			text-align: center;
 		}
 
 		.login-banner {
diff --git a/website/templates/html/blog_page.html b/website/templates/html/blog_page.html
index 12a1c7ac85..5421f00615 100644
--- a/website/templates/html/blog_page.html
+++ b/website/templates/html/blog_page.html
@@ -13,7 +13,7 @@
 	<div class="layout-wrapper layout-wrapper-background">
 		<div class="web-content" id="blog-{{ name }}">
 
-			<div class="layout-main-section">
+			<div class="layout-main">
 				
 				<h2>{{ title }}</h2>
 
@@ -38,19 +38,6 @@
 				</div>
 				<button class="btn add-comment">Add Comment</button>
 			</div>
-
-			<div class="layout-side-section">
-				<p><a href="blog.html">All Blogs</a></p>
-				<br />
-				{% block blog_subscribe %}
-					{% include "html/blog_subscribe.html" %}
-				{% endblock %}
-				<br />
-				<h4>Recent Posts</h4>
-				<div class="recent-posts" style="min-height: 100px;"></div>
-			</div>
-
-			<div style="clear: both"></div>
 		</div>
 	</div>
 {% endblock %}
\ No newline at end of file
diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index 4d89162638..3b2dabe018 100644
--- a/website/templates/html/outer.html
+++ b/website/templates/html/outer.html
@@ -5,9 +5,12 @@
 {% extends "html/base.html" %}
 
 {% block body %}
-
 	<header>
-		<div class="navbar navbar-fixed-top navbar-inverse">
+	</header>
+	<div id="body_div">
+		<div class="navbar-wrapper">
+		<div class="navbar navbar-inverse" 
+			style="margin-bottom: 0px;">
 			<div class="navbar-inner">
 			<div class="container">
 				<a class="brand" href="index.html">{{ brand }}</a>
@@ -51,10 +54,10 @@
 				</ul>
 			</div>
 			</div>
-			</div>
-			<script>$('.dropdown-toggle').dropdown()</script>
-	</header>
-	<div id="body_div">
+		</div>
+		</div>
+		<script>$('.dropdown-toggle').dropdown()</script>
+			
 		<div class="content" id="page-{{ name }}" style="display: block;">
 		{% block content %}
 		{% endblock %}
diff --git a/website/templates/js/blog_page.js b/website/templates/js/blog_page.js
index 524de8e770..12dcac139f 100644
--- a/website/templates/js/blog_page.js
+++ b/website/templates/js/blog_page.js
@@ -21,7 +21,7 @@ wn.pages['{{ name }}'].onload = function(wrapper) {
 	erpnext.blog.wrapper = wrapper;
 	
 	// sidebar
-	erpnext.blog.render_recent_list(wrapper);
+	//erpnext.blog.render_recent_list(wrapper);
 	
 	// unhide no-result if no comments found
 	erpnext.blog.toggle_no_result(wrapper);
diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html
index b2da474981..33a5943b5b 100644
--- a/website/templates/pages/login.html
+++ b/website/templates/pages/login.html
@@ -14,42 +14,38 @@
 
 {% block content %}
 	<div class="layout-wrapper layout-wrapper-appframe" id='login_wrapper'>
-	<div class="appframe-area">
-		<div class="appframe-titlebar">
-			<div class="appframe-title">Login</div>
-		</div>
-	</div>
-	<div class="layout-main" style="padding: 15px;">
-	<form autocomplete="on">
-		<table border="0" class="login-box">
-			<tbody>
-				<tr>
-					<td>Login Id</td>
-					<td><input id="login_id" type="text" style="width: 180px"/></td>
-				</tr>
-				<tr>
-					<td>Password</td>
-					<td><input id="password" type="password" style="width: 180px" /></td>
-				</tr>
-				<!--<tr>
-					<td style="text-align:right"><input id="remember_me" type="checkbox" /></td>
-					<td>Remember Me</td>
-				</tr>-->
-				<tr>
-					<td>&nbsp;</td>
-					<td>
-						<button type="submit" id="login_btn" class="btn btn-small btn-primary">Login</button>
-					</td>
-				</tr>
-				<tr>
-					<td>&nbsp;</td>
-					<td id="login_message">&nbsp;</td>
-				</tr>
-				</tbody>
-		</table>
-	</form>
-	<p style="margin-left: 72px;"><span class="link_type" 
-		onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
+	<div style="width: 40px; margin: auto;">
+		<h3>Login</h3>
+		<form autocomplete="on">
+			<table border="0" class="login-box">
+				<tbody>
+					<tr>
+						<td>Login Id</td>
+						<td><input id="login_id" type="text" style="width: 180px"/></td>
+					</tr>
+					<tr>
+						<td>Password</td>
+						<td><input id="password" type="password" style="width: 180px" /></td>
+					</tr>
+					<!--<tr>
+						<td style="text-align:right"><input id="remember_me" type="checkbox" /></td>
+						<td>Remember Me</td>
+					</tr>-->
+					<tr>
+						<td>&nbsp;</td>
+						<td>
+							<button type="submit" id="login_btn" class="btn btn-small btn-primary">Login</button>
+						</td>
+					</tr>
+					<tr>
+						<td>&nbsp;</td>
+						<td id="login_message">&nbsp;</td>
+					</tr>
+					</tbody>
+			</table>
+		</form>
+		<p style="margin-left: 80px;"><span class="link_type" 
+			onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
 	</div>
 	</div>