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

Removed unneeded bgs and borders. Replaced hard coded colours by 

variables.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2017-09-05 18:50:33 +02:00
parent e336283a48
commit 9fafe737bc
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
7 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/files/css/files.scss
View File

@ -32,8 +32,8 @@
} }
.newFileMenu .error, #fileList .error { .newFileMenu .error, #fileList .error {
color: #e9322d; color: $color-error;
border-color: #e9322d; border-color: $color-error;
-webkit-box-shadow: 0 0 6px #f8b9b7; -webkit-box-shadow: 0 0 6px #f8b9b7;
-moz-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7;
box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7;
@ -58,7 +58,6 @@
} }
#filestable tbody tr { #filestable tbody tr {
background-color: #fff;
height: 51px; height: 51px;
} }
@ -134,7 +133,6 @@
#filestable tbody tr { #filestable tbody tr {
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
background-color: #fff;
height: 40px; height: 40px;
} }
#filestable tbody tr:hover, #filestable tbody tr:hover,
@ -147,9 +145,9 @@
#filestable tbody tr.searchresult, #filestable tbody tr.searchresult,
table tr.mouseOver td { table tr.mouseOver td {
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
background-color: #f8f8f8; background-color: nc-darken($color-main-background, 3%);
} }
tbody a { color:#000; } tbody a { color: $color-main-text; }
span.conflict-path, span.extension, span.uploading, td.date { span.conflict-path, span.extension, span.uploading, td.date {
color: #999; color: #999;
@ -220,7 +218,7 @@ table th:focus .sort-indicator.hidden {
table th, table th,
table td { table td {
border-bottom: 1px solid #eee; border-bottom: 1px solid $color-border;
text-align: left; text-align: left;
font-weight: normal; font-weight: normal;
} }
@ -270,9 +268,6 @@ table.multiselect thead {
left: 250px; /* sidebar */ left: 250px; /* sidebar */
} }
table thead th {
background-color: #fff;
}
table.multiselect thead th { table.multiselect thead th {
background-color: rgba(255, 255, 255, 0.95); /* like controls bar */ background-color: rgba(255, 255, 255, 0.95); /* like controls bar */
color: #000; color: #000;
@ -702,7 +697,7 @@ table.dragshadow td.size {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
background-color: #fff; background-color: $color-main-background;
background-repeat: no-repeat no-repeat; background-repeat: no-repeat no-repeat;
background-position: 50%; background-position: 50%;
opacity: 0.7; opacity: 0.7;
@ -734,10 +729,6 @@ table.dragshadow td.size {
margin: 2px 0; margin: 2px 0;
} }
#fileList .popovermenu .action {
color: #000;
}
#filestable .filename .action .icon, #filestable .filename .action .icon,
#filestable .selectedActions a .icon, #filestable .selectedActions a .icon,
#controls .actions .button .icon { #controls .actions .button .icon {
@ -776,7 +767,11 @@ table.dragshadow td.size {
margin: 0 !important; margin: 0 !important;
border: none; border: none;
border-radius: 0; border-radius: 0;
position: fixed !important;
bottom: 44px;
width: inherit !important;
background-color: transparent; background-color: transparent;
border-right: 1px solid $color-border;
z-index:1; z-index:1;
.quota-container { .quota-container {

0
apps/files_trashbin/css/trash.css → apps/files_trashbin/css/trash.scss
View File

10
core/css/apps.scss
View File

@ -90,7 +90,7 @@ kbd {
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
border-right: 1px solid nc-darken($color-main-background, 8%); border-right: 1px solid $color-border;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
li { li {
@ -556,7 +556,7 @@ kbd {
min-width: 300px; min-width: 300px;
display: block; display: block;
background: $color-main-background; background: $color-main-background;
border-left: 1px solid nc-darken($color-main-background, 8%); border-left: 1px solid $color-border;
-webkit-transition: margin-right 300ms; -webkit-transition: margin-right 300ms;
transition: margin-right 300ms; transition: margin-right 300ms;
overflow-x: hidden; overflow-x: hidden;
@ -590,7 +590,7 @@ kbd {
/* restrict height of settings and make scrollable */ /* restrict height of settings and make scrollable */
max-height: 300px; max-height: 300px;
overflow-y: auto; overflow-y: auto;
border-right: 1px solid nc-darken($color-main-background, 8%); border-right: 1px solid $color-border;
width: 250px; width: 250px;
box-sizing: border-box; box-sizing: border-box;
@ -606,7 +606,7 @@ kbd {
} }
#app-settings-header { #app-settings-header {
border-right: 1px solid nc-darken($color-main-background, 8%); border-right: 1px solid $color-border;
width: 250px; width: 250px;
box-sizing: border-box; box-sizing: border-box;
} }
@ -735,7 +735,7 @@ kbd {
.popovermenu, .popovermenu:after, .popovermenu, .popovermenu:after,
#app-navigation .app-navigation-entry-menu, #app-navigation .app-navigation-entry-menu,
#app-navigation .app-navigation-entry-menu:after { #app-navigation .app-navigation-entry-menu:after {
border: 1px solid nc-darken($color-main-background, 8%); border: 1px solid $color-border;
} }
} }

10
core/css/header.scss
View File

@ -26,7 +26,7 @@
.menu { .menu {
position: absolute; position: absolute;
top: 45px; top: 45px;
background-color: #fff; background-color: $color-main-background;
box-shadow: 0 1px 10px $color-box-shadow; box-shadow: 0 1px 10px $color-box-shadow;
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
display: none; display: none;
@ -406,7 +406,7 @@ nav {
position: absolute; position: absolute;
pointer-events: none; pointer-events: none;
border: 0 solid transparent; border: 0 solid transparent;
border-bottom-color: white; border-bottom-color: $color-main-background;
border-width: 10px; border-width: 10px;
transform: translateX(-50%); transform: translateX(-50%);
left: 26px; left: 26px;
@ -491,7 +491,7 @@ nav {
display: none; display: none;
position: absolute; position: absolute;
overflow: visible; overflow: visible;
background-color: rgba(255, 255, 255, .97); background-color: rgba($color-main-background, .97);
white-space: nowrap; white-space: nowrap;
border: none; border: none;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
@ -500,7 +500,7 @@ nav {
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
margin-top: 0; margin-top: 0;
color: rgba(0, 0, 0, .7); color: rgba($color-main-text, .7);
width: auto; width: auto;
left: 50%; left: 50%;
top: 45px; top: 45px;
@ -522,7 +522,7 @@ nav {
position: absolute; position: absolute;
pointer-events: none; pointer-events: none;
border: 0 solid transparent; border: 0 solid transparent;
border-bottom-color: white; border-bottom-color: $color-main-background;
border-width: 10px; border-width: 10px;
transform: translateX(-50%); transform: translateX(-50%);
left: 50%; left: 50%;

15
core/css/inputs.scss
View File

@ -269,8 +269,8 @@ input {
} }
&:checked + label:before { &:checked + label:before {
box-shadow: inset 0px 0px 0px 2px $color-main-text; box-shadow: inset 0px 0px 0px 2px $color-main-text;
background-color: nc-darken($color-main-background, 8%); background-color: $color-border;
border-color: nc-darken($color-main-background, 8%) border-color: $color-border
} }
&:disabled + label:before { &:disabled + label:before {
background-color: nc-lighten($color-main-text, 33%) !important; /* override other status */ background-color: nc-lighten($color-main-text, 33%) !important; /* override other status */
@ -320,6 +320,7 @@ input {
/* Select2 overriding. Merged to core with vendor stylesheet */ /* Select2 overriding. Merged to core with vendor stylesheet */
.select2-drop { .select2-drop {
margin-top: -2px; margin-top: -2px;
background-color: $color-main-background;
&.select2-drop-active { &.select2-drop-active {
border-color: nc-lighten($color-main-text, 86%); border-color: nc-lighten($color-main-text, 86%);
} }
@ -354,7 +355,7 @@ input {
position: relative; position: relative;
display: list-item; display: list-item;
padding: 12px; padding: 12px;
background-color: $color-main-background; background-color: transparent;
cursor: pointer; cursor: pointer;
color: nc-lighten($color-main-text, 33%); color: nc-lighten($color-main-text, 33%);
} }
@ -362,10 +363,10 @@ input {
&.select2-selected { &.select2-selected {
background-color: nc-darken($color-main-background, 3%); background-color: nc-darken($color-main-background, 3%);
} }
&.select2-highlighted { }
.select2-highlighted {
background-color: nc-darken($color-main-background, 3%); background-color: nc-darken($color-main-background, 3%);
color: $color-main-text; color: $color-main-text;
}
} }
} }
} }
@ -444,8 +445,8 @@ input {
} }
&.select2-search-choice-focus, &.select2-search-choice-focus,
&:hover { &:hover {
background-color: nc-darken($color-main-background, 8%); background-color: $color-border;
border-color: nc-darken($color-main-background, 8%); border-color: $color-border;
} }
} }
.select2-arrow { .select2-arrow {

2
core/css/styles.scss
View File

@ -1124,7 +1124,7 @@ code {
.filelist { .filelist {
td { td {
padding: 14px; padding: 14px;
border-bottom: 1px solid nc-darken($color-main-background, 8%); border-bottom: 1px solid $color-border;
} }
tr:last-child td { tr:last-child td {
border-bottom: none; border-bottom: none;

1
core/css/variables.scss
View File

@ -21,3 +21,4 @@ $image-login-background: '../img/background.png?v=2';
$color-loading: #969696; $color-loading: #969696;
$color-loading-dark: #bbbbbb; $color-loading-dark: #bbbbbb;
$color-box-shadow: rgba(nc-lighten($color-main-text, 20%), 0.75); $color-box-shadow: rgba(nc-lighten($color-main-text, 20%), 0.75);
$color-border: nc-darken($color-main-background, 8%);