Skip to content

Commit 1a9388a

Browse files
raghu-kamathnetchampfaris
authored andcommitted
Clean inline css found in chapter and grant for loops! (frappe#13038)
* Clean inline css found in chapter and grant for loops! * Remove redundant css * remove unwanted ide files and append gitignore * remove unnecessary line from build.json * restore import for variable.less * remove kdev from gitignore
1 parent 5b9f3b0 commit 1a9388a

File tree

4 files changed

+8
-89
lines changed

4 files changed

+8
-89
lines changed

erpnext/non_profit/doctype/chapter/templates/chapter.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,4 @@ <h3>Address</h3>
6565
<p style="margin: 20px 0 30px;"><a href="/non_profit/join-chapter?name={{ name }}" class='btn btn-primary'>Join this Chapter</a></p>
6666
<p style="margin: 20px 0 30px;"><a href="/non_profit/leave-chapter?name={{ name }}" class=''>Leave this Chapter</a></p>
6767

68-
6968
{% endblock %}
70-
71-
<!-- this is a sample default web page template -->

erpnext/non_profit/doctype/chapter/templates/chapter_row.html

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,51 +19,7 @@ <h3>{{ doc.name }}</h3>
1919
</span>
2020
<!-- Assignment of value to global variable not working in jinja -->
2121
</p>
22-
<p>{{ html2text(doc.introduction[:200]) }}{% if introduction|len > 200 %}...{% endif %}</p>
22+
<p>{{ html2text(doc.introduction) | truncate (200) }}</p>
2323
</a>
2424
</div>
2525
{% endif %}
26-
27-
<!-- this is a sample default list template -->
28-
<style type="text/css">
29-
30-
.label {
31-
font-weight: normal;
32-
background-color: #d1d8dd;
33-
font-size: 13px;
34-
padding: 3px 7px;
35-
margin-right: 10px;
36-
}
37-
38-
39-
.with-border {
40-
border: 1px solid #d1d8dd;
41-
border-radius: 3px;
42-
padding: 15px;
43-
margin-bottom: 30px;
44-
}
45-
46-
.with-border h3 {
47-
margin-top: 0px;
48-
}
49-
50-
a {
51-
color: #5E64FF;
52-
}
53-
54-
.clickable a {
55-
color: #161c23;
56-
}
57-
58-
.with-border.clickable:hover {
59-
border-color: #36414C;
60-
background-color: #fafbfc;
61-
62-
}
63-
64-
.with-border a, .with-border a:hover {
65-
text-decoration: none;
66-
}
67-
68-
69-
</style>

erpnext/non_profit/doctype/grant_application/templates/grant_application.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,10 @@ <h3>Contact</h3>
5959
{% else %}
6060
<p><br><a href="/my-grant?new=1" class='btn btn-primary'>Post a New Grant</a></p>
6161
{% endif %}
62-
{% endblock %}
62+
{% endblock %}
63+
{% block style %}
64+
<link type="text/css" rel="stylesheet" href="/assets/css/non-profits.css">
65+
<style>
66+
{% if style is defined %}{{ style }}{% endif %}
67+
</style>
68+
{% endblock %}

erpnext/non_profit/doctype/grant_application/templates/grant_application_row.html

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,3 @@ <h3 style='margin-top: 0px;'>{{ doc.name }}</h3>
99
</a>
1010
</div>
1111
{% endif %}
12-
13-
<style type="text/css">
14-
.label {
15-
font-weight: normal;
16-
background-color: #d1d8dd;
17-
font-size: 13px;
18-
padding: 3px 7px;
19-
margin-right: 10px;
20-
}
21-
22-
23-
.with-border {
24-
border: 1px solid #d1d8dd;
25-
border-radius: 3px;
26-
padding: 15px;
27-
margin-bottom: 30px;
28-
}
29-
30-
.with-border h3 {
31-
margin-top: 0px;
32-
}
33-
34-
a {
35-
color: #5E64FF;
36-
}
37-
38-
.clickable a {
39-
color: #161c23;
40-
}
41-
42-
.with-border.clickable:hover {
43-
border-color: #36414C;
44-
background-color: #fafbfc;
45-
46-
}
47-
48-
.with-border a, .with-border a:hover {
49-
text-decoration: none;
50-
}
51-
</style>

0 commit comments

Comments
 (0)