erpnext/foundation
1
0
Fork 0
mirror of https://github.com/erpnext/foundation.git synced 2026-10-16 18:00:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks

Browse Source
This commit is contained in:
Raghavendra Kamath
2018-02-21 10:47:19 +05:30
parent b9b0395927
commit 0507bca6db
9 changed files with 85 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
foundation/hooks.py
View File

@@ -19,7 +19,7 @@ app_license = "MIT"
# app_include_js = "/assets/foundation/js/foundation.js"
# include js, css files in header of web template
# web_include_css = "/assets/foundation/css/main.css"
# web_include_css = "/assets/foundation/css/style.css"
# web_include_js = "/assets/foundation/js/foundation.js"
# include js in page
@@ -50,7 +50,7 @@ website_context = {
{"label": "Freelancer Jobs", "url": "/erpnext-jobs", "right": 1},
], "right":1},
],
"hide_login": 1,
"hide_login": 0,
"favicon": "/assets/foundation/img/favicon.ico"
}
# website user home page (by Role)

0
foundation/public/css/.css Normal file
View File

33
foundation/public/css/bootstrap-for-webform.css vendored
View File

@@ -1106,15 +1106,7 @@ input[type="reset"].btn-block,
input[type="button"].btn-block {
width: 100%;
}
.fade {
opacity: 0;
-webkit-transition: opacity .15s linear;
-o-transition: opacity .15s linear;
transition: opacity .15s linear;
}
.fade.in {
opacity: 1;
}
.collapse {
display: none;
visibility: hidden;
@@ -1708,3 +1700,26 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-width: 0 5px 5px;
border-bottom-color: #000;
}
.popover {
position: absolute;
top: 0;
left: 0;
z-index: 1060;
display: none;
max-width: 276px;
padding: 1px;
font-size: 14px;
font-weight: normal;
line-height: 1.42857143;
text-align: left;
white-space: normal;
background-color: #fff;
-webkit-background-clip: padding-box;
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, .2);
border-radius: 6px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
}

27
foundation/public/css/erpnext-org-theme.css
View File

@@ -1,5 +1,4 @@
@import "reset.css";
/*@import (css) "bootstrap-temp.css";*/
.indicator,
.indicator-right {
background: none;
@@ -263,6 +262,12 @@ a:hover {
display: flex;
justify-content: space-between;
}
.three-column .columns {
max-width: 33.33%;
}
.two-column {
max-width: 50%;
}
.list-unstyled {
padding: 0;
margin: 0;
@@ -270,9 +275,11 @@ a:hover {
.list-unstyled li {
list-style: none;
}
.list-circle {
list-style: circle;
}
.bulleted-list {
margin: 0;
list-style: circle;
padding-left: 1em;
}
.bulleted-list li {
@@ -371,6 +378,18 @@ hr {
margin-right: .5em;
}
/* loaned from bootstrap*/
.fade.in {
opacity: 1;
}
.with-border a {
text-decoration: none;
}
.with-border a:hover {
text-decoration: none;
}
.clickable a {
color: #36414C;
}
caption {
padding-top: 8px;
padding-bottom: 8px;
@@ -708,6 +727,10 @@ img.blog-cover-image,
padding: 1rem;
margin-bottom: 2rem;
}
.with-border:hover {
border-color: #6c7680;
background-color: #fafbfc;
}
/* individual elements */
.domain-links {
font-size: 1.5rem;

26
foundation/public/less/erpnext-org-theme.less
View File

@@ -1,5 +1,4 @@
@import (css) "reset.css";
/*@import (css) "bootstrap-temp.css";*/
@import "variables.less";
@import "indicator.less";
@@ -117,7 +116,6 @@ a {
padding-left: 0;
}
/*utilities*/
.gray-bg {
background-color: @light-bg;
}
@@ -222,6 +220,12 @@ a {
justify-content: space-between;
}
.three-column .columns {
max-width: 33.33%;
}
.two-column{
max-width: 50%;
}
.list-unstyled {
padding: 0;
margin: 0;
@@ -353,7 +357,23 @@ hr {
}
/* loaned from bootstrap*/
.fade.in {
opacity: 1;
}
.with-border {
a{
text-decoration: none;
&:hover{
text-decoration: none;
}
}
}
.clickable a {
color: @text-color;
}
caption {
padding-top: 8px;
padding-bottom: 8px;
@@ -722,7 +742,7 @@ img.blog-cover-image, .blog-text img, .screenshot {
padding: 1rem;
margin-bottom: 2rem;
&:hover{
border-color: @text-light:;
border-color: @text-light;
background-color: @light-bg;
}
}

1
foundation/templates/base.html
View File

@@ -23,6 +23,7 @@
<link type="text/css" rel="stylesheet" href="/assets/frappe/css/octicons/octicons.css">
{% endif %}
{%- endblock -%}
{%- block head_include %}{{ head_include or "" }}{% endblock -%}
{%- block style %}{%- endblock -%}
<script>
window.frappe = {};

2
foundation/templates/includes/footer/footer.html
View File

@@ -18,7 +18,7 @@
<a class="secondary-link" href="/docs/user/manual/en/accounts/point-of-sale-pos-invoice">Retail</a>
</li>
<li>
<a class="secondary-link" href="/docs/user/manual/en/schools">Education</a>
<a class="secondary-link" href="/docs/user/manual/en/education">Education</a>
</li>
<li>
<a class="secondary-link" href="/docs/user/manual/en/healthcare">Healthcare</a>

4
foundation/website/doctype/web_form/templates/web_form.html
View File

@@ -1,4 +1,4 @@
{% extends "foundation/templates/web.html" %}
{% extends "templates/web.html" %}
{% block title %}{{ _(title) }}{% endblock %}
@@ -43,7 +43,7 @@
{% block page_content %}
<div class="introduction">
{% if introduction_text %} hello
{% if introduction_text %}
<p class="text-muted">{{ _(introduction_text) }}</p>
{% endif %}
</div>

5
foundation/www/index.html
View File

@@ -32,7 +32,7 @@
<img class="domain-image" src="/assets/foundation/img/distribution.svg"><span>Distribution</span></a>
</li>
<li class="list-items">
<a class="primary-links domain-links" href="/docs/user/manual/en/schools">
<a class="primary-links domain-links" href="/docs/user/manual/en/education">
<img class="domain-image" src="/assets/foundation/img/education.svg"><span>Education</span></a>
</li>
<li class="list-items">
@@ -65,7 +65,8 @@
<div class="columns">
<h1 class="subtitle">Events & Meetups</h1>
<ul class="bulleted-list list-circle">
{% for e in events %}
{# get first three events from portal events doctype #}
{% for e in events[:3] %}
<li>
<a href="{{ e.route }}" class="secondary-link">{{ frappe.format_date(e.event_date, "medium") }} - {{ e.event_title }}</a>
</li>