From fb1caa07270110403e9fac70694ecd12d616ef10 Mon Sep 17 00:00:00 2001 From: Ashish Acharya Date: Mon, 30 Nov 2015 17:26:17 +0530 Subject: [PATCH] Fixed documentation page width & docs index --- .../docs/current/api/utils/frappe.utils.html | 2 +- frappe/public/css/docs.css | 33 ++++++++++++++ frappe/public/less/docs.less | 44 +++++++++++++++++-- frappe/templates/autodoc/base_template.html | 2 +- 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html index 2104d63a5d..38cf1185a1 100644 --- a/frappe/docs/current/api/utils/frappe.utils.html +++ b/frappe/docs/current/api/utils/frappe.utils.html @@ -300,7 +300,7 @@ frappe.utils.get_formatted_email (user)

-

get email id of user formatted as: John Doe johndoe@example.com

+

get email id of user formatted as: John Doe johndoe@example.com


diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index fc3943867d..98df9db47a 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -273,6 +273,39 @@ body { .splash .section { padding: 30px 0 0 0; } +.page-container { + padding-top: 128px; + margin: 0 auto; + width: 870px; +} +.page-container .page-content { + width: 83%; + margin: 0 auto; +} +.page-container .webpage-content ol > li, +.page-container .webpage-content ul > li { + margin: 26px auto; +} +.page-container .webpage-content ol > li li, +.page-container .webpage-content ul > li li { + margin: 13px auto; +} +.page-container .webpage-content ol li ol { + list-style-type: disc; +} +.page-container .webpage-content ul, +.page-container .webpage-content ol { + margin-bottom: 6px; +} +#page-index { + padding-top: 0; + width: 100%; + margin: 0; +} +#page-index .page-content { + width: 100%; + margin: 0; +} code { color: #ff0000; } diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less index e9a2c37e54..d79e751ebf 100644 --- a/frappe/public/less/docs.less +++ b/frappe/public/less/docs.less @@ -42,16 +42,54 @@ body { line-height: 1.4em; } } - .section{ padding: 30px 0 0 0; } } - code{ - color: #ff0000; +.page-container{ + padding-top:128px; + margin:0 auto; + width:870px; + + .page-content { + width:83%; + margin:0 auto; + } + + .webpage-content{ + ol > li, ul > li { + margin: 26px auto; + } + + ol > li li, ul > li li { + margin: 13px auto; + } + + ol li ol { + list-style-type: disc; + } + ul, ol { + margin-bottom:26px; + } + } +} + +#page-index { + padding-top:0; + width:100%; + margin:0; + + .page-content { + width:100%; + margin:0; } +} + +code{ + color: #ff0000; +} .navbar { //background-color: @navbar-bg !important; diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html index 777a7ba4f7..661a4ff32c 100644 --- a/frappe/templates/autodoc/base_template.html +++ b/frappe/templates/autodoc/base_template.html @@ -60,7 +60,7 @@ {%- endblock -%}
{% block content %} - {{ content }} + {{ content }}
{% endblock %}