Skip to content

Commit

Permalink
Merge pull request #9259 from nextcloud/various-css-fixes-bckprt
Browse files Browse the repository at this point in the history
[stable13] backport various scss fixes #8777
  • Loading branch information
MorrisJobke authored May 4, 2018
2 parents 1a900c6 + 721ff40 commit 642ebea
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions core/css/apps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ kbd {
> a,
> .app-navigation-entry-bullet {
/* hide icon or bullet if loading state*/
background: none !important;
background: transparent !important;
}
}
/* Main entry link */
Expand Down Expand Up @@ -247,6 +247,11 @@ kbd {
border: none;
border-radius: 50%;
cursor: pointer;
transition: background 100ms ease-in-out;
+ a {
/* hide icon if bullet, can't have both */
background: transparent !important;
}
}

/* popover fix the flex positionning of the li parent */
Expand Down Expand Up @@ -303,7 +308,7 @@ kbd {
margin: 0;
z-index: 110;
}
&:after {
&:before {
position: absolute;
height: 44px;
width: 44px;
Expand All @@ -323,13 +328,14 @@ kbd {
-webkit-transform: rotate(-90deg);
-ms-transform: rotate(-90deg);
transform: rotate(-90deg);
z-index: 50;
}

/* force padding on link no matter if 'a' has an icon class */
> a:first-child {
padding-left: 44px;
}
&:after,
&:before,
> a {
transition: background 100ms ease-in-out,
transform 250ms ease-in-out,
Expand All @@ -341,7 +347,7 @@ kbd {
}
&:hover,
&:focus {
&:after {
&:before {
opacity: 1;
}
}
Expand Down

0 comments on commit 642ebea

Please sign in to comment.