Skip to content

Commit 2b166ff

Browse files
committed
Fixed string representation in the tabular inline
1 parent 6f97581 commit 2b166ff

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
CHANGELOG
22
=========
33

4+
1.2.5 (unreleased)
5+
------------------
6+
7+
* Fixed string representation in the tabular inline
8+
9+
410
1.2.4 (2016-09-15)
511
------------------
612

djangocms_admin_style/sass/components/_content.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ ul.messagelist + #content {
158158
border-radius: 0;
159159
background: none !important;
160160
box-shadow: none;
161+
overflow: auto;
161162
h2 {
162163
font-size: $font-size-large !important;
163164
margin-bottom: 10px;
@@ -185,10 +186,6 @@ ul.messagelist + #content {
185186
border-bottom: none !important;
186187
}
187188
}
188-
.module {
189-
overflow: auto;
190-
width: 80%;
191-
}
192189
.add-row {
193190
border-bottom: 0 !important;
194191
&,

djangocms_admin_style/sass/components/_tables.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
border-right: 0 !important;
3030
}
3131
p,
32-
a {
32+
a:not(.cke_button) {
3333
font-size: $font-size-normal !important;
3434
line-height: $font-size-normal;
3535
font-weight: normal;
@@ -324,6 +324,7 @@
324324
}
325325
}
326326
tbody td {
327+
padding-top: 46px !important;
327328
input[type="checkbox"] {
328329
line-height: 36px;
329330
height: 36px;
@@ -334,14 +335,13 @@
334335
}
335336
}
336337
td.original {
337-
// make sure that there is no padding if there is no content #252
338-
padding: 0 !important;
338+
padding-left: 0 !important;
339+
padding-right: 0 !important;
339340
p {
340-
position: static !important;
341341
line-height: 36px !important;
342342
height: 36px !important;
343343
font-weight: normal !important;
344-
padding: 0 !important;
344+
padding: 0 13px !important;
345345
}
346346
.vForeignKeyRawIdAdminField {
347347
width: auto;

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.

0 commit comments

Comments
 (0)