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.

Sign up for GitHub

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 scss fixes #3260

Merged
merged 5 commits into from
Jan 30, 2017
Merged

Various scss fixes #3260

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
179bd58
Border radius fix on popover
skjnldsv Jan 25, 2017
87fd41d
Fix popover conflicts with app-navigation li (color & opacity)
skjnldsv Jan 25, 2017
4e91759
No more height css calc for app-navigation children
skjnldsv Jan 25, 2017
9513e7a
Blue left shadow fix #3288
skjnldsv Jan 26, 2017
07cbdbf
Blue shadow fix 2
skjnldsv Jan 26, 2017
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
42 changes: 22 additions & 20 deletions core/css/apps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,26 @@ em {
-ms-user-select: none;
user-select: none;
border-right: 1px solid #eee;
display: flex;
flex-direction: column;
> ul {
position: relative;
height: 100%;
width: inherit;
overflow: auto;
box-sizing: border-box;
> li {
&:focus,
&:hover,
&.active,
a.selected {
&,
> a {
opacity: 1;
box-shadow: inset 2px 0 #0082c9;
}
}
}
}
li {
position: relative;
Expand Down Expand Up @@ -94,16 +108,6 @@ em {
color: #000;
opacity: .57;
}
li:hover > a,
li:focus > a,
a:focus,
.selected,
.selected a,
.active,
.active a {
opacity: 1;
box-shadow: inset 2px 0 #0082c9;
}
li > a:first-child img {
margin-bottom: -3px;
margin-right: 11px;
Expand Down Expand Up @@ -549,7 +553,6 @@ em {
background-color: #fff;
color: #333;
border-radius: 3px;
border-top-right-radius: 0;
z-index: 110;
margin: 5px;
margin-top: -5px;
Expand Down Expand Up @@ -582,7 +585,6 @@ em {
transform: translateX(50%);
right: 50%;
margin-right: 0;
border-top-right-radius: 3px;
&:after {
right: 50%;
transform: translateX(50%);
Expand All @@ -593,8 +595,6 @@ em {
right: auto;
left: 0;
margin-right: 0;
border-top-left-radius: 0;
border-top-right-radius: 3px;
&:after {
left: 6px;
right: auto;
Expand Down Expand Up @@ -629,6 +629,7 @@ em {
margin: 0;
font-weight: inherit;
box-shadow: none;
color: #333 !important; /* Overwrite app-navigation li */
/* prevent .action class to break the design */
&.action {
padding: inherit !important;
Expand All @@ -643,15 +644,15 @@ em {
cursor: pointer;
white-space: nowrap;
}
span {
-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important;
filter: alpha(opacity = 70) !important;
opacity: .7 !important;
}
> p {
width: 150px;
line-height: 1.6em;
padding: 8px 0;
> span {
-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important;
filter: alpha(opacity = 70) !important;
opacity: .7 !important;
}
}
/* Add padding if contains icon+text */
&:not(:empty) {
Expand All @@ -670,7 +671,8 @@ em {
padding: 18px 0 18px 36px;
min-width: 0; /* Overwrite icons*/
min-height: 0;
background-position: 10px center
background-position: 10px center;
opacity: 0.7; /* Default button icon override */
}
}
}