[WIP] No not merge

This commit is contained in:
Kanchan Chauhan 2016-04-12 23:58:20 +05:30
parent 867dfec64b
commit 2dbf5294a9
4 changed files with 13 additions and 20 deletions

View File

@ -19,6 +19,7 @@ docs_version = "6.x.x"
splash_light_background = True
def get_context(context):
context.brand_html = "ERPNext"
context.app.splash_light_background = True
context.top_bar_items = [
{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},

View File

@ -44,12 +44,11 @@ $.extend(shopping_cart, {
var cart_count = getCookie("cart_count");
if($(".cart-icon").length == 0) {
$('<div class="cart-icon" style="float:right;padding-top:10px;">\
<a href="/cart" class="text-muted small">\
<div class="btn btn-primary cart"> Cart\
<span id="cart-count" class="label" style="padding-left:5px;margin-left:5px;\
margin-right:-5px;background-color: #2905E2;">\
</span>\
$('<div class="cart-icon" style="float:right;padding-top:5px;padding-right:10px;padding-left:10px;border-radius:10px;\
border: 2px solid #2fa5d6;color:#2fa5d6;">\
<a href="/cart" style="color:#2fa5d6;">\
<i class="icon-shopping-cart"></i> <span style="\
position: relative; bottom: 2ex; font-size: 75%; margin-left:-12px;" id="cart-count"></span> Cart\
</div>\
</a></div>').appendTo($('.hidden-xs'))
}

View File

@ -1,19 +1,11 @@
{% if not hide_footer_signup %}
<div class="container">
<div class="row">
<div class="col-sm-6 col-sm-offset-3 text-center" style="margin-top: 15px;">
<input class="form-control" type="text" id="footer-subscribe-email"
style="display: inline-block; max-width: 50%; margin-right: 10px;"
style="display: inline-block; max-width: 50%;margin-right:15px;"
placeholder="{{ _('Your email address') }}...">
<button class="btn btn-default btn-sm" type="button"
id="footer-subscribe-button">{{ _("Get Updates") }}</button>
</div>
</div>
<div class="text-center text-muted small" style="padding: 30px;">
<a href="https://erpnext.com?source=website_footer" target="_blank" class="text-extra-muted">
Powered by ERPNext</a>
</div>
</div>
<button class="btn btn-default btn-sm btn-subscribe" type="button"
id="footer-subscribe-button" style="float:right; border-radius:8px; border:1px solid #78D6FF; color:#78D6FF; background-color:white;">{{ _("Get Updates") }}</button>
<script>
frappe.ready(function() {
$("#footer-subscribe-button").click(function() {

View File

@ -1 +1,2 @@
<!-- blank -->
<a href="https://erpnext.com?source=website_footer" target="_blank" class="text-muted">
Powered by ERPNext</a>