Skip to content

Commit a5c76f6

Browse files
committed
Fix list appearance in combination with django-grapelli
1 parent 0741963 commit a5c76f6

File tree

3 files changed

+56
-0
lines changed

3 files changed

+56
-0
lines changed

CHANGES.rst

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Changes in version 0.8.4 (alpha release)
2+
----------------------------------------
3+
4+
* Fix list appearance in combination with django-grapelli
5+
6+
17
Changes in version 0.8.3 (alpha release)
28
----------------------------------------
39

polymorphic_tree/static/polymorphic_tree/adminlist/nodetree.css

+50
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55

66
/* column layout */
77

8+
.jqtree-django {
9+
clear: both;
10+
}
11+
812
.jqtree-django .col-primary {
913
float: left;
1014
width: auto;
@@ -131,3 +135,49 @@ ul.tree li img { vertical-align: baseline; } /* keeps 3px space below, use 'bot
131135
ul.tree .no-js { display: none; }
132136
ul.tree li:first-child .move-up { visibility: hidden; } /* Hiding in CSS is easy, the server-side urlnode.is_first_sibling call is expensive. */
133137
ul.tree li:last-child .move-down { visibility: hidden; }
138+
139+
140+
141+
/* grapelli styling and workarounds */
142+
143+
#grp-container .results {
144+
margin: 0 0 5px 0;
145+
}
146+
147+
#grp-container .jqtree-django table {
148+
width: 100%; /* for grapelli */
149+
}
150+
151+
#grp-container #js-result-list {
152+
border-left: 1px solid #ccc;
153+
border-bottom: 1px solid #ccc;
154+
border-right: 1px solid #ccc;
155+
border-bottom-left-radius: 3px;
156+
border-bottom-right-radius: 3px;
157+
margin-left: -1px;
158+
margin-right: 1px;
159+
}
160+
161+
#grp-container .jqtree-django ul.tree {
162+
margin: 0;
163+
padding: 0 0 0 12px;
164+
background-image: url(zebra-grapelli.png);
165+
}
166+
167+
#grp-container .jqtree-django .col-primary,
168+
#grp-container .jqtree-django .col-metadata {
169+
height: 36px;
170+
}
171+
172+
#grp-container table thead th.col-title {
173+
border-top-left-radius: 2px;
174+
border-left: 0 none;
175+
}
176+
177+
#grp-container .jqtree-django .col-metadata {
178+
border-right: 0;
179+
}
180+
181+
#grp-container .jqtree-django div.col {
182+
padding: 10px;
183+
}
Loading

0 commit comments

Comments
 (0)