From 9fafe737bcb633a350a6233d5e01c9ed2920500f Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Tue, 5 Sep 2017 18:50:33 +0200 Subject: Removed unneeded bgs and borders. Replaced hard coded colours by variables. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/css/files.scss | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'apps/files/css') diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 10f37840580..2d9f71be02c 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -32,8 +32,8 @@ } .newFileMenu .error, #fileList .error { - color: #e9322d; - border-color: #e9322d; + color: $color-error; + border-color: $color-error; -webkit-box-shadow: 0 0 6px #f8b9b7; -moz-box-shadow: 0 0 6px #f8b9b7; box-shadow: 0 0 6px #f8b9b7; @@ -58,7 +58,6 @@ } #filestable tbody tr { - background-color: #fff; height: 51px; } @@ -134,7 +133,6 @@ #filestable tbody tr { transition: background-color 0.3s ease; - background-color: #fff; height: 40px; } #filestable tbody tr:hover, @@ -147,9 +145,9 @@ #filestable tbody tr.searchresult, table tr.mouseOver td { 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 { color: #999; @@ -220,7 +218,7 @@ table th:focus .sort-indicator.hidden { table th, table td { - border-bottom: 1px solid #eee; + border-bottom: 1px solid $color-border; text-align: left; font-weight: normal; } @@ -270,9 +268,6 @@ table.multiselect thead { left: 250px; /* sidebar */ } -table thead th { - background-color: #fff; -} table.multiselect thead th { background-color: rgba(255, 255, 255, 0.95); /* like controls bar */ color: #000; @@ -702,7 +697,7 @@ table.dragshadow td.size { left: 0; right: 0; bottom: 0; - background-color: #fff; + background-color: $color-main-background; background-repeat: no-repeat no-repeat; background-position: 50%; opacity: 0.7; @@ -734,10 +729,6 @@ table.dragshadow td.size { margin: 2px 0; } -#fileList .popovermenu .action { - color: #000; -} - #filestable .filename .action .icon, #filestable .selectedActions a .icon, #controls .actions .button .icon { @@ -776,7 +767,11 @@ table.dragshadow td.size { margin: 0 !important; border: none; border-radius: 0; + position: fixed !important; + bottom: 44px; + width: inherit !important; background-color: transparent; + border-right: 1px solid $color-border; z-index:1; .quota-container { -- cgit v1.2.3 From 65353af3745d5ab078fd68562efc6bee4291803f Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 6 Sep 2017 13:28:00 +0200 Subject: Replaced colours by variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/css/files.scss | 4 - apps/systemtags/css/systemtagsfilelist.css | 12 --- core/css/header.scss | 5 +- core/css/inputs.scss | 3 + core/css/mobile.scss | 4 +- core/css/styles.scss | 4 +- core/css/variables.scss | 2 +- settings/css/settings.scss | 158 +++++++++++++---------------- 8 files changed, 83 insertions(+), 109 deletions(-) (limited to 'apps/files/css') diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 2d9f71be02c..13746db9fca 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -767,11 +767,7 @@ table.dragshadow td.size { margin: 0 !important; border: none; border-radius: 0; - position: fixed !important; - bottom: 44px; - width: inherit !important; background-color: transparent; - border-right: 1px solid $color-border; z-index:1; .quota-container { diff --git a/apps/systemtags/css/systemtagsfilelist.css b/apps/systemtags/css/systemtagsfilelist.css index 6318d43687e..ad711f74733 100644 --- a/apps/systemtags/css/systemtagsfilelist.css +++ b/apps/systemtags/css/systemtagsfilelist.css @@ -12,18 +12,6 @@ margin-left: 10px; } -#app-content-systemtagsfilter .select2-choices { - white-space: nowrap; - text-overflow: ellipsis; - background: #fff; - color: #555; - box-sizing: content-box; - border-radius: 3px; - border: 1px solid #ddd; - padding: 0; - min-height: auto; -} - .nav-icon-systemtagsfilter { background-image: url('../img/tag.svg'); } diff --git a/core/css/header.scss b/core/css/header.scss index 24cafb4637a..fae11a878ec 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -236,7 +236,6 @@ nav { } /* arrow look */ - #expanddiv:after { bottom: 100%; border: solid transparent; @@ -245,8 +244,8 @@ nav { width: 0; position: absolute; pointer-events: none; - border-color: rgba(0, 0, 0, 0); - border-bottom-color: rgba(255, 255, 255, .97); + border-color: transparent; + border-bottom-color: $color-main-background; border-width: 10px; margin-left: -10px; } diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 766bfe55015..5fe65935ec5 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -409,6 +409,9 @@ input { } .select2-search-field input { line-height: 20px; + &.select2-active { + background: none !important; + } } } } diff --git a/core/css/mobile.scss b/core/css/mobile.scss index b0f8421345c..baf874db8f5 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -78,7 +78,7 @@ #app-content { width: 100% !important; left: 0 !important; - background-color: #fff; + background-color: $color-main-background; overflow-x: hidden !important; z-index: 1000; } @@ -97,7 +97,7 @@ width: 44px; height: 44px; z-index: 149; - background-color: rgba(255, 255, 255, .7); + background-color: rgba($color-main-background, .7); cursor: pointer; opacity: .6; } diff --git a/core/css/styles.scss b/core/css/styles.scss index facadad693e..ad75c0c2fc6 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -165,7 +165,7 @@ body { } ::-webkit-scrollbar-thumb { - background: nc-lighten($color-main-text, 86%); + background: nc-darken($color-main-background, 14%); border-radius: 3px; } @@ -1213,7 +1213,7 @@ span.ui-icon { position: relative; align-items: center; padding: 3px 3px 3px 10px; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid $color-border; :last-of-type { border-bottom: none; diff --git a/core/css/variables.scss b/core/css/variables.scss index d6974c4839a..26fd11a07d7 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -20,5 +20,5 @@ $image-login-background: '../img/background.png?v=2'; $color-loading: #969696; $color-loading-dark: #bbbbbb; -$color-box-shadow: rgba(nc-lighten($color-main-text, 20%), 0.75); +$color-box-shadow: rgba(nc-darken($color-main-background, 30%), 0.75); $color-border: nc-darken($color-main-background, 8%); diff --git a/settings/css/settings.scss b/settings/css/settings.scss index de5dcf8a1e8..5f9b7d6a4c5 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -431,7 +431,7 @@ table.nostyle { box-sizing: border-box; background-color: transparent; border: none; - border-bottom: 1px solid #eee; + border-bottom: 1px solid $color-border; border-radius: 0; } @@ -515,14 +515,14 @@ table.grid { th { height: 2em; color: #999; - border-bottom: 1px solid #eee; + border-bottom: 1px solid $color-border; padding: 0 .5em; padding-left: .8em; text-align: left; font-weight: normal; } td { - border-bottom: 1px solid #eee; + border-bottom: 1px solid $color-border; padding: 0 .5em; padding-left: .8em; text-align: left; @@ -736,32 +736,6 @@ input.userFilter { } /* APPS */ - -/* Bundle header */ - -#apps-list .apps-header { - display: table-row; - position: relative; - div { - display: table-cell; - height: 70px; - } - h2 { - display: table-cell; - position: absolute; - padding-left: 6px; - padding-top: 15px; - .enable { - position: relative; - top: -1px; - margin-left: 12px; - } - + .section { - margin-top: 50px; - } - } -} - #app-content > svg.app-filter { float: left; height: 0; @@ -835,49 +809,6 @@ span.version { opacity: .5; } -#apps-list { - position: relative; - height: 100%; - display: flex; - flex-wrap: wrap; - align-content: flex-start; - &.hidden { - display: none; - } - .section { - position: relative; - flex: 0 0 auto; - margin-left: 20px; - &.apps-experimental { - flex-basis: 90%; - } - } - .app-description { - p { - margin: 10px 0; - } - ul { - list-style: disc; - } - ol { - list-style: decimal; - ol, ul { - padding-left: 15px; - } - } - > { - ul, ol { - margin-left: 19px; - } - } - ul { - ol, ul { - padding-left: 15px; - } - } - } -} - @media (min-width: 1601px) { #apps-list .section { width: 22%; @@ -967,10 +898,6 @@ span.version { clear: both; } -#apps-list .groups-enable { - margin-top: 8px; -} - #app-category-1 { margin-bottom: 18px; } @@ -1029,11 +956,17 @@ span.version { height: initial; vertical-align: middle; float: none; - border-bottom: 1px solid #eee; + border-bottom: 1px solid $color-border; padding: 6px; box-sizing: border-box; } } + .groups-enable { + margin-top: 0; + label { + margin-right: 3px; + } + } .app-image { width: 44px; text-align: right; @@ -1053,21 +986,76 @@ span.version { height: 64px; opacity: .1; } + position: relative; + height: 100%; + display: flex; + flex-wrap: wrap; + align-content: flex-start; + &.hidden { + display: none; + } + .section { + position: relative; + flex: 0 0 auto; + margin-left: 20px; + &.apps-experimental { + flex-basis: 90%; + } + } + .app-description { + p { + margin: 10px 0; + } + ul { + list-style: disc; + } + ol { + list-style: decimal; + ol, ul { + padding-left: 15px; + } + } + > { + ul, ol { + margin-left: 19px; + } + } + ul { + ol, ul { + padding-left: 15px; + } + } + } + /* Bundle header */ + .apps-header { + display: table-row; + position: relative; + div { + display: table-cell; + height: 70px; + } + h2 { + display: table-cell; + position: absolute; + padding-left: 6px; + padding-top: 15px; + .enable { + position: relative; + top: -1px; + margin-left: 12px; + } + + .section { + margin-top: 50px; + } + } + } } .installed .actions { text-align: right; } -#apps-list.installed .groups-enable { - margin-top: 0; - label { - margin-right: 3px; - } -} - /* LOG */ - #log { white-space: normal; margin-bottom: 14px; -- cgit v1.2.3 From d169e3fd596928ae2e43aaeb9e42b5e827d61a11 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Thu, 21 Sep 2017 19:26:01 +0200 Subject: Removed unused filter for opacity, fix #6408 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/css/detailsView.scss | 1 - apps/files/css/files.scss | 23 ----------------------- apps/files/css/mobile.scss | 2 -- apps/files_sharing/css/public.scss | 2 -- apps/files_versions/css/versions.css | 4 ---- core/css/apps.scss | 5 ----- core/css/guest.css | 4 ---- core/css/header.scss | 16 ---------------- core/css/styles.scss | 16 ---------------- core/css/tooltip.scss | 2 -- core/search/css/results.css | 2 -- settings/css/settings.scss | 1 - 12 files changed, 78 deletions(-) (limited to 'apps/files/css') diff --git a/apps/files/css/detailsView.scss b/apps/files/css/detailsView.scss index 46c177d63d4..c292a45b964 100644 --- a/apps/files/css/detailsView.scss +++ b/apps/files/css/detailsView.scss @@ -122,7 +122,6 @@ top: 0; right: 0; padding: 15px; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; opacity: .5; z-index: 1; } diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 13746db9fca..8d5d245a6ce 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -153,8 +153,6 @@ span.conflict-path, span.extension, span.uploading, td.date { color: #999; } span.conflict-path, span.extension { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; - filter: alpha(opacity=70); opacity: .7; -webkit-transition: opacity 300ms; -moz-transition: opacity 300ms; @@ -166,8 +164,6 @@ tr:hover span.conflict-path, tr:focus span.conflict-path, tr:hover span.extension, tr:focus span.extension { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; color: #777; } @@ -198,8 +194,6 @@ table th .sort-indicator { margin-left: 5px; display: inline-block; vertical-align: text-bottom; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; - filter: alpha(opacity=30); opacity: .3; } .sort-indicator.hidden, @@ -434,8 +428,6 @@ table td.filename .uploadtext { height: 20px; padding: 10px 0; font-size: 11px; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } @@ -531,8 +523,6 @@ table td.filename .uploadtext { /* force show the loading icon, not only on hover */ #fileList .icon-loading-small { - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter:alpha(opacity=100); opacity: 1 !important; display: inline !important; } @@ -575,8 +565,6 @@ a.action > img { display: inline; padding: 17px 8px; line-height: 50px; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; - filter: alpha(opacity=0); opacity: 0; } #fileList a.action.action-share { @@ -597,8 +585,6 @@ a.action > img { #fileList a.action.disabled:hover, #fileList a.action.disabled:focus, #fileList a.action.disabled img { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; - filter: alpha(opacity=30); opacity: .3; } @@ -610,8 +596,6 @@ a.action > img { #fileList .fileActionsMenu a.action, /* show share action of shared items darker to distinguish from non-shared */ #fileList a.action.action-share.shared-style { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; - filter: alpha(opacity=70); opacity: .7; } @@ -626,8 +610,6 @@ a.action > img { } #fileList .action.action-favorite.permanent { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } @@ -636,8 +618,6 @@ a.action > img { /* show share action of shared items darker to distinguish from non-shared */ #fileList a.action.action-share.shared-style:hover, #fileList a.action.action-share.shared-style:focus { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } @@ -655,8 +635,6 @@ a.action > img { } .summary { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; - filter: alpha(opacity=30); opacity: .3; /* add whitespace to bottom of files list to correctly show dropdowns */ height: 300px; @@ -701,7 +679,6 @@ table.dragshadow td.size { background-repeat: no-repeat no-repeat; background-position: 50%; opacity: 0.7; - filter: alpha(opacity=70); transition: opacity 100ms; -moz-transition: opacity 100ms; -o-transition: opacity 100ms; diff --git a/apps/files/css/mobile.scss b/apps/files/css/mobile.scss index 9e1c8a01d89..eefc92c816b 100644 --- a/apps/files/css/mobile.scss +++ b/apps/files/css/mobile.scss @@ -51,11 +51,9 @@ table td.filename .nametext { display: none !important; } #fileList a.action.action-favorite { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important; opacity: .7 !important; } #fileList a.action.action-favorite { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important; opacity: .3 !important; } diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 6d9fcf14efc..652d36f77db 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -97,8 +97,6 @@ thead { .directLink label { font-weight: normal; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } .directLink input { diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css index cd63a90ab51..74ab146b051 100644 --- a/apps/files_versions/css/versions.css +++ b/apps/files_versions/css/versions.css @@ -16,8 +16,6 @@ .versionsTabView a, .versionsTabView div > span { vertical-align: middle; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } @@ -27,8 +25,6 @@ .versionsTabView a:hover, .versionsTabView a:focus { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - filter: alpha(opacity=100); opacity: 1; } diff --git a/core/css/apps.scss b/core/css/apps.scss index 5f90f13e934..fb0eb7e43e4 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -34,7 +34,6 @@ h3 { /* do not use italic typeface style, instead lighter color */ em { font-style: normal; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; opacity: .5; } @@ -820,12 +819,8 @@ kbd { box-shadow: none; width: 100%; /* Override the app-navigation li opacity */ - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important; - filter: alpha(opacity = 70) !important; opacity: .7 !important; &:hover, &:focus, &.active { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)' !important; - filter: alpha(opacity = 100) !important; opacity: 1 !important; } /* prevent .action class to break the design */ diff --git a/core/css/guest.css b/core/css/guest.css index 1081b95fb36..dacf79b37bc 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -43,7 +43,6 @@ p.info a:hover { } em { font-style: normal; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; opacity: .5; } @@ -309,7 +308,6 @@ label.infield { padding: 14px !important; } #show:checked + label, #dbpassword-toggle:checked + label, #personal-show:checked + label { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)'; opacity: .8; } #show + label, #dbpassword-toggle + label, #personal-show + label { @@ -319,7 +317,6 @@ label.infield { background-image: url('../img/actions/toggle.svg?v=1'); background-repeat: no-repeat; background-position: center; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)'; opacity: .3; } #show + label:before, #dbpassword-toggle + label:before, #personal-show + label:before { @@ -520,7 +517,6 @@ form #selectDbType label.ui-state-active { .error a { color: #fff !important; font-weight: 600 !important; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } .error a.button { diff --git a/core/css/header.scss b/core/css/header.scss index fae11a878ec..e9edfe0bfb8 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -86,14 +86,11 @@ height: 45px; /* header height */ box-sizing: border-box; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; &:focus { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)'; opacity: .75; } &:hover, &:active { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } @@ -156,30 +153,25 @@ /* hover effect for app switcher label */ .header-appname-container .header-appname { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)'; opacity: .75; } .menutoggle { .icon-caret { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)'; opacity: .75; } &:hover { .header-appname, .icon-caret { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } &:focus { .header-appname, .icon-caret { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } &.active { .header-appname, .icon-caret { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } @@ -276,7 +268,6 @@ nav { } svg, span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)'; opacity: .7; } svg { @@ -286,12 +277,10 @@ nav { &:focus svg, &:hover span, &:focus span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } &.active { svg, span { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } @@ -315,7 +304,6 @@ nav { height: 16px; } .app-icon { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'; opacity: 0; } } @@ -356,7 +344,6 @@ nav { cursor: pointer; } img { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)'; opacity: .7; margin-bottom: -2px; } @@ -366,7 +353,6 @@ nav { color: $color-primary-text; img, #expandDisplayName { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } @@ -428,7 +414,6 @@ nav { color: $color-main-text; padding: 10px 12px 0; box-sizing: border-box; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)'; opacity: .7; img { margin-bottom: -3px; @@ -438,7 +423,6 @@ nav { &:focus, &:active, &.active { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } diff --git a/core/css/styles.scss b/core/css/styles.scss index ad75c0c2fc6..be0b200ce35 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -187,7 +187,6 @@ body { cursor: pointer; -webkit-transition: all 100ms; transition: all 100ms; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)'; opacity: .6; &:focus, &:active, &:valid { color: $color-primary-text; @@ -197,7 +196,6 @@ body { border: 1px solid rgba($color-primary-text, 0.5) !important; } &:hover, &:focus, &:active { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } & ~ .icon-close-white { @@ -327,7 +325,6 @@ body { height: 64px; width: 64px; margin: 0 auto 15px; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=40)'; opacity: .4; } @@ -580,7 +577,6 @@ label.infield { } #show:checked + label, #dbpassword:checked + label, #personal-show:checked + label { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)'; opacity: .8; } @@ -591,7 +587,6 @@ label.infield { background-image: url('../img/actions/toggle.svg?v=1'); background-repeat: no-repeat; background-position: center; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)'; opacity: .3; } @@ -723,7 +718,6 @@ label.infield { .warning { margin: 0 7px 5px 4px; legend { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } @@ -856,7 +850,6 @@ td.avatar { top: 0; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=90)'; opacity: .9; span { cursor: pointer; @@ -882,19 +875,16 @@ td.avatar { } tr .action:not(.permanent), .selectedActions a { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'; opacity: 0; } tr { &:hover .action, &:focus .action, .action.permanent { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; opacity: .5; } } .selectedActions a { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)'; opacity: .5; } @@ -904,27 +894,23 @@ tr .action { } .header-action { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)'; opacity: .8; } tr { &:hover .action:hover, &:focus .action:focus { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } .selectedActions a { &:hover, &:focus { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } .header-action { &:hover, &:focus { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)'; opacity: 1; } } @@ -1359,7 +1345,6 @@ div.crumb { top: 8px !important; } &:hover, &:focus, a:focus, &:active { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)'; opacity: .7; } } @@ -1422,5 +1407,4 @@ fieldset { width: 0; height: 0; opacity: 0; - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'; } diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss index 7c6a2f8a580..dad7b95bbdf 100644 --- a/core/css/tooltip.scss +++ b/core/css/tooltip.scss @@ -31,10 +31,8 @@ font-size: 12px; opacity: 0; z-index: 100000; - filter: alpha(opacity = 0); &.in { opacity: 1; - filter: alpha(opacity = 100); } &.top { diff --git a/core/search/css/results.css b/core/search/css/results.css index e55c2926fd7..2e3791a47f0 100644 --- a/core/search/css/results.css +++ b/core/search/css/results.css @@ -88,8 +88,6 @@ color: #545454; } #searchresults .path { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; - filter: alpha(opacity=50); opacity: .5; } #searchresults .text em { diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 5f9b7d6a4c5..2ec7f575329 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -884,7 +884,6 @@ span.version { clear: both; padding: 7px 0; cursor: pointer; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; opacity: .5; } -- cgit v1.2.3 From 7cee919f57c916ee6e3291c795fe25802d17c3ba Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Thu, 21 Sep 2017 19:46:29 +0200 Subject: Fix busy state loading animation in files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/css/files.scss | 10 +++++++++- apps/files/js/filelist.js | 6 ++---- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'apps/files/css') diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 8d5d245a6ce..7c2d3b0bb1c 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -296,11 +296,19 @@ table td.filename a.name { line-height: 50px; padding: 0; } +table td.filename label.icon-loading-small { + &:after { + z-index: 10; + } + .thumbnail { + opacity: 0.2; + } +} table td.filename .thumbnail { display: inline-block; width: 32px; height: 32px; - margin-left: 8px; + margin-left: 9px; margin-top: 9px; cursor: pointer; float: left; diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 48ac0f4e33a..fd13deedc0d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2540,11 +2540,9 @@ $tr.toggleClass('busy', state); if (state) { - $thumbEl.attr('data-oldimage', $thumbEl.css('background-image')); - $thumbEl.css('background-image', 'url('+ OC.imagePath('core', 'loading.gif') + ')'); + $thumbEl.parent().addClass('icon-loading-small'); } else { - $thumbEl.css('background-image', $thumbEl.attr('data-oldimage')); - $thumbEl.removeAttr('data-oldimage'); + $thumbEl.parent().removeClass('icon-loading-small'); } }); }, -- cgit v1.2.3