Skip to content

Commit

Permalink
Fix admin menu arrow style (OrchardCMS#3627)
Browse files Browse the repository at this point in the history
  • Loading branch information
hishamco authored and sebastienros committed May 20, 2019
1 parent 6dd85fc commit 71d2eea
Show file tree
Hide file tree
Showing 6 changed files with 3,541 additions and 4,929 deletions.
19 changes: 12 additions & 7 deletions src/OrchardCore.Themes/TheAdmin/Assets/scss/TheAdmin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -462,13 +462,6 @@ body:not(.left-sidebar-compact) {
border-right: $border-content;
transition: left 0.2s ease-in-out, width 0.2s ease-in-out;
font-family: "Segoe UI VSS (Regular)","Segoe UI","-apple-system",BlinkMacSystemFont,Roboto,"Helvetica Neue",Helvetica,Ubuntu,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";
// Rotate the chevron's icon when the menu is active
label[aria-expanded="true"] {
.chevron {
transform: rotate(90deg);
transition-duration: 0.2s;
}
}

label[aria-expanded="false"] {
.chevron {
Expand Down Expand Up @@ -875,6 +868,18 @@ body:not(.left-sidebar-compact) {
}
}
}
/* rtl:ignore */
.left-sidebar-compact {
#ta-left-sidebar {
// Rotate the chevron's icon when the menu is active
label[aria-expanded="true"] {
.chevron {
transform: rotate(90deg);
transition-duration: 0.2s;
}
}
}
}

// fixing a flickering that occurs on compact leftbar while icons load.
html:not(.fontawesome-i2svg-complete) #left-nav ul.menu-admin > li > .item-label {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
tag.TagRenderMode = TagRenderMode.Normal;
tag.InnerHtml.AppendHtml(await DisplayAsync(Model));

tag.InnerHtml.AppendHtml(Html.Raw("<button class=\"btn-nostyle\"><span class=\"collapse-icon\"><i class=\"fas fa-chevron-right fa-xs chevron\"></i></span></button>"));
tag.InnerHtml.AppendHtml(Html.Raw($"<button class=\"btn-nostyle\"><span class=\"collapse-icon\"><i class=\"fas fa-chevron-{(Orchard.CultureDir() == "ltr" ? "right" : "left")} fa-xs chevron\"></i></span></button>"));
}
else
{
Expand Down
Loading

0 comments on commit 71d2eea

Please sign in to comment.