Skip to content

Commit

Permalink
Fix issues
Browse files Browse the repository at this point in the history
  • Loading branch information
fsbraun committed Mar 30, 2024
1 parent 583459f commit 4bede97
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 20 deletions.
23 changes: 9 additions & 14 deletions djangocms_admin_style/sass/components/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,8 @@ a.btn {

.button.default, input[type=submit].default, .submit-row input.default {
float: right;
}

[dir="rtl"] {
.button.default, input[type=submit].default, .submit-row input.default {
float: right;
[dir="rtl"] & {
float: left;
}
}

Expand All @@ -100,6 +97,9 @@ a.btn {
.deletelink-box, .deletelink {
display: inline-block;
float: left;
[dir="rtl"] & {
float: right;
}
}
a.deletelink {
margin-inline-start: 10px;
Expand All @@ -118,10 +118,6 @@ a.btn {
}
}

[dir="rtl"] .submit-row .deletelink-box, .deletelink {
float: right;
}

.cms-btn-group {
@include button-variant($btn-default-color, $btn-default-bgcolor, $btn-default-border, true);
display: inline-block;
Expand Down Expand Up @@ -169,6 +165,9 @@ a:link {
// make sure that cancel link has correct height #261
a.button.cancel-link {
float: right;
[dir="rtl"] & {
float: left;
}
font-family: $base-font-family;
display: inline-block;
line-height: 34px !important;
Expand All @@ -178,10 +177,6 @@ a.button.cancel-link {
padding: 0 20px !important
}

[dir="rtl"] a.button.cancel-link {
float: left;
}

// resets general list styles for object-tool list elements
.colM ul:not(.object-tools):not(.messagelist) {
margin: 20px 0 25px;
Expand Down Expand Up @@ -337,7 +332,7 @@ ul.messagelist {
border-bottom: 0;
&:before {
position: absolute;
inset-line-start: 10px;
inset-inline-start: 10px;
font-size: 18px !important;
margin-right: 20px !important;
}
Expand Down
6 changes: 3 additions & 3 deletions djangocms_admin_style/sass/components/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ a[id*="clocklink"],
@extend %icon;
font-size: $font-size-large;
vertical-align: middle;
margin-inline-end: 5px;
margin-right: 5px;
}
}

Expand Down Expand Up @@ -168,12 +168,12 @@ a[id*="clocklink"] {
.addlink,
.changelink,
.deletelink {
padding-inline-start: 15px;
padding-left: 15px;
}

// Viewlink uses a django supplied icon, we need to ensure that we don't override it's styling
.viewlink {
padding-inline-start: 15px !important;
padding-left: 15px !important;
}

.related-lookup,
Expand Down
4 changes: 2 additions & 2 deletions djangocms_admin_style/sass/components/_login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ body.login.djangocms-admin-style {
.submit-row {
float: right;
[dir="rtl"] & {
float: right;
float: left;
}
width: 100%;
padding: 0 !important;
Expand All @@ -97,7 +97,7 @@ body.login.djangocms-admin-style {
@include button-variant($btn-action-color, $btn-action-bgcolor, $btn-action-border, true);
float: right;
[dir="rtl"] & {
float: right;
float: left;
}
width: auto !important;
padding: 10px 20px !important;
Expand Down

Large diffs are not rendered by default.

0 comments on commit 4bede97

Please sign in to comment.