This commit is contained in:
Rushabh Mehta 2012-12-10 14:56:45 +05:30
parent af63b16be8
commit 1c8ab8ad7a
6 changed files with 69 additions and 139 deletions

View File

@ -1,69 +1,35 @@
header .container, .content { .content {
width: 900px; width: 800px;
} }
div#body_div { div#body_div {
padding-top: 80px; padding: 0px;
min-height: 400px; 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 { p, li {
line-height: 1.6em; line-height: 1.6em;
} }
pre { .layout-wrapper {
background-color: #F8F8F8; box-shadow: none;
border: 1px solid #CCCCCC; -webkit-box-shadow: none;
border-radius: 3px 3px 3px 3px; -moz-box-shadow: none;
font-size: 13px;
line-height: 19px;
overflow: auto;
padding: 6px 10px;
margin-bottom: 9px;
} }
.web-head-section { .layout-side-section {
margin-bottom: 20px 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 { footer {
} }
@ -98,33 +64,6 @@ footer {
margin-top: -12px; 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 { .two-column {
width: 50%; width: 50%;
float: left; float: left;

View File

@ -1,7 +1,12 @@
<style> <style>
#login_wrapper { #login_wrapper {
width: 300px !important; height: 300px;
margin: 20px auto; padding-top: 50px;
}
#login_wrapper h3 {
text-align: center;
} }
.login-banner { .login-banner {

View File

@ -13,7 +13,7 @@
<div class="layout-wrapper layout-wrapper-background"> <div class="layout-wrapper layout-wrapper-background">
<div class="web-content" id="blog-{{ name }}"> <div class="web-content" id="blog-{{ name }}">
<div class="layout-main-section"> <div class="layout-main">
<h2>{{ title }}</h2> <h2>{{ title }}</h2>
@ -38,19 +38,6 @@
</div> </div>
<button class="btn add-comment">Add Comment</button> <button class="btn add-comment">Add Comment</button>
</div> </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>
</div> </div>
{% endblock %} {% endblock %}

View File

@ -5,9 +5,12 @@
{% extends "html/base.html" %} {% extends "html/base.html" %}
{% block body %} {% block body %}
<header> <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="navbar-inner">
<div class="container"> <div class="container">
<a class="brand" href="index.html">{{ brand }}</a> <a class="brand" href="index.html">{{ brand }}</a>
@ -51,10 +54,10 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<script>$('.dropdown-toggle').dropdown()</script> </div>
</header> <script>$('.dropdown-toggle').dropdown()</script>
<div id="body_div">
<div class="content" id="page-{{ name }}" style="display: block;"> <div class="content" id="page-{{ name }}" style="display: block;">
{% block content %} {% block content %}
{% endblock %} {% endblock %}

View File

@ -21,7 +21,7 @@ wn.pages['{{ name }}'].onload = function(wrapper) {
erpnext.blog.wrapper = wrapper; erpnext.blog.wrapper = wrapper;
// sidebar // sidebar
erpnext.blog.render_recent_list(wrapper); //erpnext.blog.render_recent_list(wrapper);
// unhide no-result if no comments found // unhide no-result if no comments found
erpnext.blog.toggle_no_result(wrapper); erpnext.blog.toggle_no_result(wrapper);

View File

@ -14,42 +14,38 @@
{% block content %} {% block content %}
<div class="layout-wrapper layout-wrapper-appframe" id='login_wrapper'> <div class="layout-wrapper layout-wrapper-appframe" id='login_wrapper'>
<div class="appframe-area"> <div style="width: 40px; margin: auto;">
<div class="appframe-titlebar"> <h3>Login</h3>
<div class="appframe-title">Login</div> <form autocomplete="on">
</div> <table border="0" class="login-box">
</div> <tbody>
<div class="layout-main" style="padding: 15px;"> <tr>
<form autocomplete="on"> <td>Login Id</td>
<table border="0" class="login-box"> <td><input id="login_id" type="text" style="width: 180px"/></td>
<tbody> </tr>
<tr> <tr>
<td>Login Id</td> <td>Password</td>
<td><input id="login_id" type="text" style="width: 180px"/></td> <td><input id="password" type="password" style="width: 180px" /></td>
</tr> </tr>
<tr> <!--<tr>
<td>Password</td> <td style="text-align:right"><input id="remember_me" type="checkbox" /></td>
<td><input id="password" type="password" style="width: 180px" /></td> <td>Remember Me</td>
</tr> </tr>-->
<!--<tr> <tr>
<td style="text-align:right"><input id="remember_me" type="checkbox" /></td> <td>&nbsp;</td>
<td>Remember Me</td> <td>
</tr>--> <button type="submit" id="login_btn" class="btn btn-small btn-primary">Login</button>
<tr> </td>
<td>&nbsp;</td> </tr>
<td> <tr>
<button type="submit" id="login_btn" class="btn btn-small btn-primary">Login</button> <td>&nbsp;</td>
</td> <td id="login_message">&nbsp;</td>
</tr> </tr>
<tr> </tbody>
<td>&nbsp;</td> </table>
<td id="login_message">&nbsp;</td> </form>
</tr> <p style="margin-left: 80px;"><span class="link_type"
</tbody> onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
</table>
</form>
<p style="margin-left: 72px;"><span class="link_type"
onclick="erpnext.login.show_forgot_password()">Forgot Password</span></p>
</div> </div>
</div> </div>