mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3260 from nextcloud/various-scss-fixes 

Various scss fixes
This commit is contained in:
Christoph Wurst 2017-01-30 11:34:39 +01:00 committed by GitHub
parent bbcb1dd2e0 07cbdbff52
commit 9a036a2ae3
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/css/apps.scss
View File

@ -62,12 +62,26 @@ em {
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
border-right: 1px solid #eee; border-right: 1px solid #eee;
display: flex;
flex-direction: column;
> ul { > ul {
position: relative; position: relative;
height: 100%; height: 100%;
width: inherit; width: inherit;
overflow: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
> li {
&:focus,
&:hover,
&.active,
a.selected {
&,
> a {
opacity: 1;
box-shadow: inset 2px 0 #0082c9;
}
}
}
} }
li { li {
position: relative; position: relative;
@ -104,16 +118,6 @@ em {
color: #000; color: #000;
opacity: .57; 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 { li > a:first-child img {
margin-bottom: -3px; margin-bottom: -3px;
margin-right: 11px; margin-right: 11px;
@ -559,7 +563,6 @@ em {
background-color: #fff; background-color: #fff;
color: #333; color: #333;
border-radius: 3px; border-radius: 3px;
border-top-right-radius: 0;
z-index: 110; z-index: 110;
margin: 5px; margin: 5px;
margin-top: -5px; margin-top: -5px;
@ -592,7 +595,6 @@ em {
transform: translateX(50%); transform: translateX(50%);
right: 50%; right: 50%;
margin-right: 0; margin-right: 0;
border-top-right-radius: 3px;
&:after { &:after {
right: 50%; right: 50%;
transform: translateX(50%); transform: translateX(50%);
@ -603,8 +605,6 @@ em {
right: auto; right: auto;
left: 0; left: 0;
margin-right: 0; margin-right: 0;
border-top-left-radius: 0;
border-top-right-radius: 3px;
&:after { &:after {
left: 6px; left: 6px;
right: auto; right: auto;
@ -639,6 +639,7 @@ em {
margin: 0; margin: 0;
font-weight: inherit; font-weight: inherit;
box-shadow: none; box-shadow: none;
color: #333 !important; /* Overwrite app-navigation li */
/* prevent .action class to break the design */ /* prevent .action class to break the design */
&.action { &.action {
padding: inherit !important; padding: inherit !important;
@ -653,15 +654,15 @@ em {
cursor: pointer; cursor: pointer;
white-space: nowrap; white-space: nowrap;
} }
span {
-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important;
filter: alpha(opacity = 70) !important;
opacity: .7 !important;
}
> p { > p {
width: 150px; width: 150px;
line-height: 1.6em; line-height: 1.6em;
padding: 8px 0; 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 */ /* Add padding if contains icon+text */
&:not(:empty) { &:not(:empty) {
@ -680,7 +681,8 @@ em {
padding: 18px 0 18px 36px; padding: 18px 0 18px 36px;
min-width: 0; /* Overwrite icons*/ min-width: 0; /* Overwrite icons*/
min-height: 0; min-height: 0;
background-position: 10px center background-position: 10px center;
opacity: 0.7; /* Default button icon override */
} }
} }
} }