Skip to content

Commit 0248a3c

Browse files
authored
fix: Adds an icon for the new view-related button in Django (#494)
* Bump version to 3.2.4 * Add support for new view-related icon in django admin * fix scss
1 parent f6884b0 commit 0248a3c

File tree

12 files changed

+225
-182
lines changed

12 files changed

+225
-182
lines changed

djangocms_admin_style/sass/components/_base.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ a.button.cancel-link {
152152
padding: 0 20px !important
153153
}
154154
// resets general list styles for object-tool list elements
155-
.colM ul:not(.object-tools) {
155+
.colM ul:not(.object-tools):not(.messagelist) {
156156
margin: 20px 0 25px;
157157
border-bottom: solid 1px $gray-lighter;
158158
&:empty {

djangocms_admin_style/sass/components/_forms.scss

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -892,14 +892,25 @@ form select[multiple] {
892892
// required in admin/aldryn_newsblog/article/add to ensure outline is not cut off #249
893893
overflow: visible;
894894
width: 100%;
895-
&.widget-wrapper-links-1 select {
896-
width: calc(100% - 46px) !important;
895+
&.widget-wrapper-links-1 {
896+
select, .select2 {
897+
width: calc(100% - 46px) !important;
898+
}
897899
}
898-
&.widget-wrapper-links-2 select {
899-
width: calc(100% - 92px) !important;
900+
&.widget-wrapper-links-2 {
901+
select, .select2 {
902+
width: calc(100% - 87px) !important;
903+
}
900904
}
901-
&.widget-wrapper-links-3 select {
902-
width: calc(100% - 138px) !important;
905+
&.widget-wrapper-links-3 {
906+
select, .select2 {
907+
width: calc(100% - 128px) !important;
908+
}
909+
}
910+
&.widget-wrapper-links-4 {
911+
select, .select2 {
912+
width: calc(100% - 169px) !important;
913+
}
903914
}
904915
// makes sure that related widget wrapper links are floated next to select field #315
905916
select {

djangocms_admin_style/sass/components/_iconography.scss

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -105,150 +105,153 @@
105105
@if $filename == exclamation-triangle {
106106
$char: "E01A";
107107
}
108-
@if $filename == file-text {
108+
@if $filename == eye {
109109
$char: "E01B";
110110
}
111-
@if $filename == file {
111+
@if $filename == file-text {
112112
$char: "E01C";
113113
}
114-
@if $filename == files-o {
114+
@if $filename == file {
115115
$char: "E01D";
116116
}
117-
@if $filename == film {
117+
@if $filename == files-o {
118118
$char: "E01E";
119119
}
120-
@if $filename == flag {
120+
@if $filename == film {
121121
$char: "E01F";
122122
}
123-
@if $filename == floppy-o {
123+
@if $filename == flag {
124124
$char: "E020";
125125
}
126-
@if $filename == folder-open {
126+
@if $filename == floppy-o {
127127
$char: "E021";
128128
}
129-
@if $filename == folder {
129+
@if $filename == folder-open {
130130
$char: "E022";
131131
}
132-
@if $filename == gamepad {
132+
@if $filename == folder {
133133
$char: "E023";
134134
}
135-
@if $filename == gift {
135+
@if $filename == gamepad {
136136
$char: "E024";
137137
}
138-
@if $filename == heart {
138+
@if $filename == gift {
139139
$char: "E025";
140140
}
141-
@if $filename == home {
141+
@if $filename == heart {
142142
$char: "E026";
143143
}
144-
@if $filename == info-circle {
144+
@if $filename == home {
145145
$char: "E027";
146146
}
147-
@if $filename == key {
147+
@if $filename == info-circle {
148148
$char: "E028";
149149
}
150-
@if $filename == laptop {
150+
@if $filename == key {
151151
$char: "E029";
152152
}
153-
@if $filename == life-ring {
153+
@if $filename == laptop {
154154
$char: "E02A";
155155
}
156-
@if $filename == lightbulb-o {
156+
@if $filename == life-ring {
157157
$char: "E02B";
158158
}
159-
@if $filename == lock {
159+
@if $filename == lightbulb-o {
160160
$char: "E02C";
161161
}
162-
@if $filename == logo {
162+
@if $filename == lock {
163163
$char: "E02D";
164164
}
165-
@if $filename == map-marker {
165+
@if $filename == logo {
166166
$char: "E02E";
167167
}
168-
@if $filename == minus-circle {
168+
@if $filename == map-marker {
169169
$char: "E02F";
170170
}
171-
@if $filename == mobile {
171+
@if $filename == minus-circle {
172172
$char: "E030";
173173
}
174-
@if $filename == money {
174+
@if $filename == mobile {
175175
$char: "E031";
176176
}
177-
@if $filename == music {
177+
@if $filename == money {
178178
$char: "E032";
179179
}
180-
@if $filename == newspaper-o {
180+
@if $filename == music {
181181
$char: "E033";
182182
}
183-
@if $filename == pencil {
183+
@if $filename == newspaper-o {
184184
$char: "E034";
185185
}
186-
@if $filename == picture-o {
186+
@if $filename == pencil {
187187
$char: "E035";
188188
}
189-
@if $filename == picture {
189+
@if $filename == picture-o {
190190
$char: "E036";
191191
}
192-
@if $filename == plus-circle {
192+
@if $filename == picture {
193193
$char: "E037";
194194
}
195-
@if $filename == plus {
195+
@if $filename == plus-circle {
196196
$char: "E038";
197197
}
198-
@if $filename == print {
198+
@if $filename == plus {
199199
$char: "E039";
200200
}
201-
@if $filename == refresh {
201+
@if $filename == print {
202202
$char: "E03A";
203203
}
204-
@if $filename == remove {
204+
@if $filename == refresh {
205205
$char: "E03B";
206206
}
207-
@if $filename == reply {
207+
@if $filename == remove {
208208
$char: "E03C";
209209
}
210-
@if $filename == scissors {
210+
@if $filename == reply {
211211
$char: "E03D";
212212
}
213-
@if $filename == search-plus {
213+
@if $filename == scissors {
214214
$char: "E03E";
215215
}
216-
@if $filename == search {
216+
@if $filename == search-plus {
217217
$char: "E03F";
218218
}
219-
@if $filename == shopping-cart {
219+
@if $filename == search {
220220
$char: "E040";
221221
}
222-
@if $filename == suitcase {
222+
@if $filename == shopping-cart {
223223
$char: "E041";
224224
}
225-
@if $filename == tag {
225+
@if $filename == suitcase {
226226
$char: "E042";
227227
}
228-
@if $filename == ticket {
228+
@if $filename == tag {
229229
$char: "E043";
230230
}
231-
@if $filename == trash-o {
231+
@if $filename == ticket {
232232
$char: "E044";
233233
}
234-
@if $filename == trash {
234+
@if $filename == trash-o {
235235
$char: "E045";
236236
}
237-
@if $filename == unlock-alt {
237+
@if $filename == trash {
238238
$char: "E046";
239239
}
240-
@if $filename == upload {
240+
@if $filename == unlock-alt {
241241
$char: "E047";
242242
}
243-
@if $filename == user {
243+
@if $filename == upload {
244244
$char: "E048";
245245
}
246-
@if $filename == volume-up {
246+
@if $filename == user {
247247
$char: "E049";
248248
}
249-
@if $filename == wrench {
249+
@if $filename == volume-up {
250250
$char: "E04A";
251251
}
252+
@if $filename == wrench {
253+
$char: "E04B";
254+
}
252255

253256
@return $char;
254257
}

djangocms_admin_style/sass/components/_icons.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ a.selector-chooseall,
2525
.add-related,
2626
.change-related,
2727
.delete-related,
28+
.view-related,
2829
.inlinechangelink,
2930
a[id*="calendarlink"],
3031
a[id*="clocklink"],
@@ -78,6 +79,9 @@ a.selector-chooseall,
7879
.delete-related {
7980
@include icon(remove);
8081
}
82+
.view-related {
83+
@include icon(eye);
84+
}
8185
.icon-arrow-right,
8286
.calendarnav-next {
8387
@include icon(arrow-right);
@@ -184,7 +188,8 @@ a[id*="clocklink"] {
184188
.add-another,
185189
.add-related,
186190
.change-related,
187-
.delete-related {
191+
.delete-related,
192+
.view-related {
188193
@include button-variant($btn-default-color, $btn-default-bgcolor, $btn-default-border, true);
189194
display: inline-block;
190195
// make sure that add another button has correct width and height on advanced setting #293

djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.

0 commit comments

Comments
 (0)