Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various css fixes #8777

Merged
merged 1 commit into from
Apr 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions core/css/apps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,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 @@ -263,6 +263,12 @@ 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 @@ -319,7 +325,7 @@ kbd {
margin: 0;
z-index: 110;
}
&:after {
&:before {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we have a icon-loading, the after is already used. Let's use the before for the collapsible triangle indicator

position: absolute;
height: 44px;
width: 44px;
Expand All @@ -339,13 +345,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 @@ -357,12 +364,15 @@ kbd {
}
&:hover,
&:focus {
&:after {
&:before {
opacity: 1;
}
.app-navigation-entry-bullet {
background: transparent !important;
}
}
&.open {
&:after {
&:before {
-webkit-transform: rotate(0);
-ms-transform: rotate(0);
transform: rotate(0);
Expand Down Expand Up @@ -449,7 +459,7 @@ kbd {
height: 38px;
flex: 0 0 36px;
&:not(:last-child) {
border-radius: 0;
border-radius: 0 !important;
}
&:not(:first-child) {
margin-left: -1px;
Expand Down
3 changes: 2 additions & 1 deletion core/css/inputs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ input {
background-clip: padding-box; /* Avoid background under border */
background-color: $color-main-background !important;
opacity: 1;
width: 16px;
width: 34px;
padding: 7px 6px;
cursor: pointer;
&:disabled {
Expand Down Expand Up @@ -247,6 +247,7 @@ input {
+ .icon-confirm {
border-color: $color-primary-element !important;
border-left-color: transparent !important;
z-index: 2; /* above previous input */
}
}
}
Expand Down