Skip to content

Commit

Permalink
Merge branch '4.0-dev' into saturday5
Browse files Browse the repository at this point in the history
  • Loading branch information
brianteeman authored Jan 13, 2020
2 parents e2084ed + aebcf85 commit 1aefa3a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions administrator/templates/atum/scss/template-rtl.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ body {
margin-right: 0;
margin-left: 15px;
}

.logo svg,
.logo img {
margin-right: .8rem;
margin-left: auto;
Expand Down
1 change: 1 addition & 0 deletions build/media_source/system/scss/fields/switcher.scss
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ $switcher-height: 28px;

[dir=rtl] & {
margin-left: 0;
margin-right: -220px;
float: right;
text-align: right;
}
Expand Down

0 comments on commit 1aefa3a

Please sign in to comment.