Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/website/css/website.css b/website/css/website.css
index 956f22e..a0f4e1b 100644
--- a/website/css/website.css
+++ b/website/css/website.css
@@ -4,14 +4,14 @@
box-shadow: 0px 0px 3px rgba(0,0,0,0.9);
background-color: #fff;
border-radius: 5px;
- padding: 20px;
- margin: 30px -20px 10px -20px;
+ padding: 30px;
+ margin: 30px -30px 10px -30px;
min-height: 400px;
overflow: hidden;
}
.outer .navbar {
- margin: -20px -20px 10px -20px;
+ margin: -30px -30px 10px -30px;
}
footer {
@@ -121,5 +121,3 @@
.avatar-x-large img {
width: 100px;
}
-
-/* */
\ No newline at end of file
diff --git a/website/doctype/style_settings/custom_template.css b/website/doctype/style_settings/custom_template.css
index 9009bbe..5289744 100644
--- a/website/doctype/style_settings/custom_template.css
+++ b/website/doctype/style_settings/custom_template.css
@@ -26,3 +26,78 @@
font-family: '{{ doc.heading_font}}', Arial, 'Helvetica Neue' !important;
}
{% endif %}
+
+/* Bootstrap Navbar */
+
+.navbar-inverse .navbar-inner {
+ background-color: #{{ doc.top_bar_background or "444"}};
+ background-repeat: repeat-x;
+ border-color: transparent;
+ background-image: none;
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+ color: #{{ doc.top_bar_foreground or "fff"}};
+ text-shadow: none;
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:focus {
+ color: #{{ doc.top_bar_foreground or "fff"}};
+}
+
+.navbar-inverse .brand {
+ color: #{{ doc.top_bar_foreground or "fff"}};
+}
+
+.navbar-inverse .navbar-text {
+ color: #999999;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+ color: #{{ doc.top_bar_foreground or "fff"}};
+ background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+ color: #{{ doc.top_bar_foreground or "fff"}};
+ background-color: transparent;
+}
+
+.navbar-inverse .navbar-link {
+ color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+ color: #{{ doc.top_bar_foreground or "fff"}};
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+
+}
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+ color: #424242;
+ text-decoration: none;
+ background-color: transparent;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+ border-top-color: #{{ doc.top_bar_foreground or "fff"}};
+ border-bottom-color: #{{ doc.top_bar_foreground or "fff"}};
+}
diff --git a/website/doctype/style_settings/style_settings.js b/website/doctype/style_settings/style_settings.js
index 54091a3..6a17db9 100644
--- a/website/doctype/style_settings/style_settings.js
+++ b/website/doctype/style_settings/style_settings.js
@@ -18,5 +18,6 @@
cur_frm.cscript.onload_post_render = function() {
wn.require('lib/public/js/lib/jscolor/jscolor.js');
cur_frm.fields_dict.background_color.input.className = 'color';
+ cur_frm.fields_dict.top_bar_background.input.className = 'color';
jscolor.bind();
}
\ No newline at end of file
diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt
index 5f53441..0063ba9 100644
--- a/website/doctype/style_settings/style_settings.txt
+++ b/website/doctype/style_settings/style_settings.txt
@@ -1,8 +1,8 @@
[
{
- "creation": "2013-01-10 16:34:32",
+ "creation": "2013-01-25 11:35:10",
"docstatus": 0,
- "modified": "2013-01-22 14:57:25",
+ "modified": "2013-03-07 14:46:51",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -24,18 +24,15 @@
"permlevel": 0
},
{
- "create": 1,
"doctype": "DocPerm",
"name": "__common__",
"parent": "Style Settings",
"parentfield": "permissions",
"parenttype": "DocType",
- "permlevel": 0,
"read": 1,
- "report": 1,
+ "report": 0,
"role": "Website Manager",
- "submit": 0,
- "write": 1
+ "submit": 0
},
{
"doctype": "DocType",
@@ -58,6 +55,20 @@
},
{
"doctype": "DocField",
+ "fieldname": "top_bar_background",
+ "fieldtype": "Data",
+ "label": "Top Bar Background"
+ },
+ {
+ "description": "000 is black, fff is white",
+ "doctype": "DocField",
+ "fieldname": "top_bar_foreground",
+ "fieldtype": "Select",
+ "label": "Top Bar Foreground",
+ "options": "000\nFFF"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "cb0",
"fieldtype": "Column Break",
"print_width": "50%",
@@ -115,6 +126,16 @@
"print_hide": 1
},
{
- "doctype": "DocPerm"
+ "create": 1,
+ "doctype": "DocPerm",
+ "permlevel": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "cancel": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "permlevel": 1
}
]
\ No newline at end of file