From aca2c93839c9d462f93dea0e09049b10a72386fa Mon Sep 17 00:00:00 2001
From: raghunayyar
Date: Fri, 3 May 2013 16:31:18 +0530
Subject: [PATCH 01/95] Removes Borders from the left navigation.
---
core/css/styles.css | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 6c9d00114a0..670942738f8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -500,12 +500,6 @@ div.crumb:active {
/* special rules for first-level entries and folders */
#app-navigation > ul > li {
background-color: #eee;
- border-top: 1px solid #fff;
- border-bottom: 1px solid #ddd;
-}
-#app-navigation > ul > .active {
- border-top: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
}
#app-navigation .with-icon a {
@@ -527,10 +521,6 @@ div.crumb:active {
#app-navigation li:hover > a {
background-color: #ddd;
}
-#app-navigation > ul > li:hover {
- border-top: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
-}
#app-navigation .collapse {
display: none; /* hide collapse button intially */
@@ -592,7 +582,6 @@ div.crumb:active {
#app-navigation > ul .open:hover {
-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
- border-top: 1px solid #ccc;
}
#app-navigation > ul .open ul {
From 7eb6e8d5b58013661c8dca9d4f1cc34c1565816a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 9 Jul 2013 19:37:22 +0200
Subject: [PATCH 02/95] app styles: remove bottom padding. Settings should be
last in list instead of permanent
---
core/css/styles.css | 1 -
1 file changed, 1 deletion(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 670942738f8..154f73f27a7 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -475,7 +475,6 @@ div.crumb:active {
width: 250px;
height: 100%;
float: left;
- padding-bottom: 32px;
-moz-box-sizing: border-box; box-sizing: border-box;
background-color: #f8f8f8;
border-right: 1px solid #ccc;
From 87d1e72f9c9c4afc11f302409e00ff6825a9f5ef Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 9 Jul 2013 20:19:25 +0200
Subject: [PATCH 03/95] more whitespace WIP
---
core/css/styles.css | 63 +++++++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 25 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 154f73f27a7..1eb55aea78a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -148,7 +148,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#content { position:relative; height:100%; width:100%; }
#content .hascontrols { position: relative; top: 2.9em; }
#content-wrapper {
- position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px;
+ position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:80px;
-moz-box-sizing:border-box; box-sizing:border-box;
}
#leftcontent, .leftcontent {
@@ -274,16 +274,29 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
/* NAVIGATION ------------------------------------------------------------- */
#navigation {
- position:fixed; float:left; width:64px; padding-top:3.5em; z-index:75; height:100%;
+ position: fixed;
+ float: left;
+ width: 80px;
+ padding-top: 3.5em;
+ z-index: 75;
+ height: 100%;
background:#383c43 url('../img/noise.png') repeat;
-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
}
-#navigation:hover { overflow-y:auto; } /* show scrollbar only on hover */
+#navigation:hover {
+ overflow-y: auto; /* show scrollbar only on hover */
+}
+#navigation li {
+ padding: 6px 0; /* some whitespace between apps */
+}
#navigation a span {
- display:block;
- text-decoration:none; font-size:10px; text-align:center;
- color:#fff; text-shadow:#000 0 -1px 0;
+ display: block;
+ text-decoration: none;
+ font-size: 11px;
+ text-align: center;
+ color: #fff;
+ text-shadow: #000 0 -1px 0;
white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
}
@@ -309,12 +322,12 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
filter: alpha(opacity=100);
opacity: 1;
}
-
- /* positioning */
#navigation .icon {
- display:block;
- width:32px; height:32px;
- margin:0 16px 0; padding:8px 0 4px;
+ display: block;
+ width: 32px;
+ height: 32px;
+ margin-left: 24px;
+ padding: 8px 0 4px;
}
#navigation li:first-child a { padding-top:16px; }
@@ -472,7 +485,7 @@ div.crumb:active {
/* Navigation: folder like structure */
#app-navigation {
- width: 250px;
+ width: 300px;
height: 100%;
float: left;
-moz-box-sizing: border-box; box-sizing: border-box;
@@ -491,7 +504,8 @@ div.crumb:active {
text-shadow: 0 1px 0 rgba(255,255,255,.9);
}
#app-navigation .active,
-#app-navigation .active a { /* active navigation entry or folder */
+#app-navigation .active a,
+#app-navigation li:hover > a {
background-color: #ddd;
text-shadow: 0 1px 0 rgba(255,255,255,.7);
}
@@ -502,36 +516,35 @@ div.crumb:active {
}
#app-navigation .with-icon a {
- padding-left: 32px;
- background-size: 16px 16px; background-position: 10px center; background-repeat: no-repeat;
+ padding-left: 44px;
+ background-size: 16px 16px;
+ background-position: 14px center;
+ background-repeat: no-repeat;
}
#app-navigation li > a {
display: block;
width: 100%;
- padding: 0 16px;
+ height: 44px;
+ padding-top: 12px;
overflow: hidden;
-moz-box-sizing: border-box; box-sizing: border-box;
- line-height: 32px;
white-space: nowrap;
text-overflow: ellipsis;
color: #333;
}
-#app-navigation li:hover > a {
- background-color: #ddd;
-}
#app-navigation .collapse {
display: none; /* hide collapse button intially */
}
#app-navigation .collapsible > .collapse {
position: absolute;
- left: 6px;
- top: 5px;
- height: 16px;
- width: 16px;
+ height: 44px;
+ width: 44px;
+ margin: 0;
+ padding: 0;
background: none; background-image: url('../img/actions/triangle-s.svg');
- background-size: 16px 16px; background-repeat: no-repeat;
+ background-size: 16px 16px; background-repeat: no-repeat; background-position: center;
border: none;
border-radius: 0;
outline: none !important;
From a5c84768f163cad6afff6ddd6c4bd30ad53a3a86 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 9 Jul 2013 20:59:19 +0200
Subject: [PATCH 04/95] more whitespace WIP 2
---
core/css/styles.css | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 1eb55aea78a..6499f454f9f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -482,6 +482,9 @@ div.crumb:active {
height: 100%;
width: 100%;
}
+#app * {
+ -moz-box-sizing: border-box; box-sizing: border-box;
+}
/* Navigation: folder like structure */
#app-navigation {
@@ -526,7 +529,7 @@ div.crumb:active {
display: block;
width: 100%;
height: 44px;
- padding-top: 12px;
+ padding: 12px;
overflow: hidden;
-moz-box-sizing: border-box; box-sizing: border-box;
white-space: nowrap;
@@ -544,7 +547,7 @@ div.crumb:active {
margin: 0;
padding: 0;
background: none; background-image: url('../img/actions/triangle-s.svg');
- background-size: 16px 16px; background-repeat: no-repeat; background-position: center;
+ background-size: 16px; background-repeat: no-repeat; background-position: center;
border: none;
border-radius: 0;
outline: none !important;
@@ -600,6 +603,23 @@ div.crumb:active {
display: block;
}
+
+/* counter and actions */
+#app-navigation .utils {
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ font-size: 12px;
+}
+ #app-navigation .utils button,
+ #app-navigation .utils .counter {
+ width: 44px;
+ height: 44px;
+ padding-top: 12px;
+ }
+
+
/* drag and drop */
#app-navigation .drag-and-drop {
-moz-transition: padding-bottom 500ms ease 0s;
@@ -627,7 +647,7 @@ div.crumb:active {
/* settings area */
#app-settings {
position: fixed;
- width: 249px;
+ width: 299px;
bottom: 0;
border-top: 1px solid #ccc;
}
From 583d0685900aefdfce4f02eb4cc5783efbca2339 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 9 Jul 2013 21:21:29 +0200
Subject: [PATCH 05/95] more small whitespace fixes for the app list
---
core/css/styles.css | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 6499f454f9f..c33254856a8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -287,9 +287,6 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
#navigation:hover {
overflow-y: auto; /* show scrollbar only on hover */
}
-#navigation li {
- padding: 6px 0; /* some whitespace between apps */
-}
#navigation a span {
display: block;
text-decoration: none;
@@ -298,6 +295,7 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
color: #fff;
text-shadow: #000 0 -1px 0;
white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
+ padding-bottom: 10px;
}
/* icon opacity and hover effect */
@@ -327,9 +325,11 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
width: 32px;
height: 32px;
margin-left: 24px;
- padding: 8px 0 4px;
+ padding: 10px 0 4px;
+ }
+ #navigation li:first-child .icon { /* special rule for Files icon as it's first */
+ padding-top: 20px;
}
- #navigation li:first-child a { padding-top:16px; }
/* USER MENU */
From bbad1ad21ef703ccc8b230dfd79b83f76ab16d41 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 9 Jul 2013 21:57:47 +0200
Subject: [PATCH 06/95] more whitespace for user menu
---
core/css/styles.css | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index c33254856a8..97ab62df0a8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -343,13 +343,28 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
background:#383c43 url('../img/noise.png') repeat;
border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
+ -moz-box-sizing: border-box; box-sizing: border-box;
}
#expanddiv a {
- display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7;
+ display: block;
+ height: 40px;
+ color: #fff;
+ text-shadow: 0 -1px 0 #000;
+ padding: 4px 12px 0;
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+ filter: alpha(opacity=70);
+ opacity: .7;
+ -moz-box-sizing: border-box; box-sizing: border-box;
+ }
+ #expanddiv a img {
+ margin-bottom: -3px;
+ margin-right: 6px;
+ }
+ #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
+ opacity: 1;
}
- #expanddiv a img { margin-bottom:-3px; }
- #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
/* VARIOUS REUSABLE SELECTORS */
From b44cab5acc1adccf36ebd18ab7f4da9caf4c7932 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 9 Jul 2013 22:02:39 +0200
Subject: [PATCH 07/95] prevent ugly selection effect on accidental selection,
fix #3713
---
core/css/styles.css | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/css/styles.css b/core/css/styles.css
index 97ab62df0a8..89c074aabbf 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -283,6 +283,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
background:#383c43 url('../img/noise.png') repeat;
-moz-box-shadow:0 0 7px #000; -webkit-box-shadow:0 0 7px #000; box-shadow:0 0 7px #000;
overflow:hidden; box-sizing:border-box; -moz-box-sizing:border-box;
+ /* prevent ugly selection effect on accidental selection */
+ -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#navigation:hover {
overflow-y: auto; /* show scrollbar only on hover */
@@ -344,6 +346,8 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac
border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
-moz-box-sizing: border-box; box-sizing: border-box;
+ /* prevent ugly selection effect on accidental selection */
+ -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
}
#expanddiv a {
display: block;
From cab792323d4c136ed336442d7ae6bb9559955591 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Thu, 18 Jul 2013 18:31:56 +0200
Subject: [PATCH 08/95] make delete icon less intrusive again, only on hover
---
core/css/styles.css | 4 ++++
core/img/actions/delete-hover.png | Bin 0 -> 295 bytes
core/img/actions/delete-hover.svg | 12 ++++++++++++
core/img/actions/delete.png | Bin 295 -> 254 bytes
core/img/actions/delete.svg | 14 ++++----------
5 files changed, 20 insertions(+), 10 deletions(-)
create mode 100644 core/img/actions/delete-hover.png
create mode 100644 core/img/actions/delete-hover.svg
diff --git a/core/css/styles.css b/core/css/styles.css
index ca2d082eb32..94520a4e0cb 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -661,8 +661,12 @@ div.crumb:active {
/* icons */
.folder-icon { background-image: url('../img/places/folder.svg'); }
.delete-icon { background-image: url('../img/actions/delete.svg'); }
+.delete-icon:hover, .delete-icon:focus {
+ background-image: url('../img/actions/delete-hover.svg');
+}
.edit-icon { background-image: url('../img/actions/rename.svg'); }
+
/* buttons */
button.loading {
background-image: url('../img/loading.gif');
diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..99f549faf9b70be5d0917d601485170bfae526d8
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFwM+{iL7^mG#D7zGPR!nT&$J|w1L6X
L)z4*}Q$iB}Wn^OS
literal 0
HcmV?d00001
diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg
new file mode 100644
index 00000000000..568185c5c70
--- /dev/null
+++ b/core/img/actions/delete-hover.svg
@@ -0,0 +1,12 @@
+
diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png
index 99f549faf9b70be5d0917d601485170bfae526d8..0d8c89a56e2d88463f52bb1901ccf228640ff7a1 100644
GIT binary patch
delta 153
zcmZ3^^p9~uZoOiFPl)UP|Nj~Ag1ZGN;XnmkB|(0{3|w0A2@UfXT>bjKBycHE)Y8+%
zF@z&JIpF|v1h=Hb5vB&7Z=zg2v8)bk$=6fPi!v!#o()~C)+oAhP1MtdQw^R6MGtR1
d%zK2BVdr%rf!lfSkH&&5_jL7hS?83{1OP%#F82Tc
delta 194
zcmeyzxSVN1ZoO83Pl)UP|Nk#CFkE6_xXQqAnStR75(0`Kb06+JX2!t4z*`dJ7tFw|
zYnxfN;qKE{AOHUI6Y_`vN`!g3IEHXUCnq>CT
zaLwZE-jzi$4UJ!?H9b?YUbdByC#PK9P&4D6Z^DBe)xnLK@9wg(Fzc~~^IYdM7f58i
c6Qsewz?P}?{O4k|M4%N6p00i_>zopr07BGC0ssI2
diff --git a/core/img/actions/delete.svg b/core/img/actions/delete.svg
index 568185c5c70..ef564bfd482 100644
--- a/core/img/actions/delete.svg
+++ b/core/img/actions/delete.svg
@@ -1,12 +1,6 @@
+
From 197c979d264f15d82e991f45c7155b2172aae3c6 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Thu, 18 Jul 2013 18:40:09 +0200
Subject: [PATCH 09/95] use background image instead of img for Files delete
icon
---
apps/files/js/fileactions.js | 5 +----
core/css/styles.css | 4 ++++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index aa66a57a7b5..bb0a27638e4 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -125,12 +125,9 @@ var FileActions = {
if (typeof trashBinApp !== 'undefined' && trashBinApp) {
var html = '';
} else {
- var html = '';
+ var html = '';
}
var element = $(html);
- if (img) {
- element.append($('
'));
- }
element.data('action', actions['Delete']);
element.on('click', {a: null, elem: parent, actionFunc: actions['Delete']}, actionHandler);
parent.parent().children().last().append(element);
diff --git a/core/css/styles.css b/core/css/styles.css
index 94520a4e0cb..46972331df9 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -659,6 +659,10 @@ div.crumb:active {
}
/* icons */
+.folder-icon, .delete-icon, .edit-icon {
+ background-repeat: no-repeat;
+ background-position: center;
+}
.folder-icon { background-image: url('../img/places/folder.svg'); }
.delete-icon { background-image: url('../img/actions/delete.svg'); }
.delete-icon:hover, .delete-icon:focus {
From 8a25d1ad068b67914ae87159e062c28433a3a789 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Thu, 18 Jul 2013 18:41:01 +0200
Subject: [PATCH 10/95] remove unnecessary tipsy for Files delete
---
apps/files/js/fileactions.js | 2 +-
core/js/js.js | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index bb0a27638e4..59cf007f53d 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -125,7 +125,7 @@ var FileActions = {
if (typeof trashBinApp !== 'undefined' && trashBinApp) {
var html = '';
} else {
- var html = '';
+ var html = '';
}
var element = $(html);
element.data('action', actions['Delete']);
diff --git a/core/js/js.js b/core/js/js.js
index 5158b66d73a..6558adbb6a7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -664,7 +664,6 @@ $(document).ready(function(){
$('.password .action').tipsy({gravity:'se', fade:true, live:true});
$('#upload').tipsy({gravity:'w', fade:true});
$('.selectedActions a').tipsy({gravity:'s', fade:true, live:true});
- $('a.delete').tipsy({gravity: 'e', fade:true, live:true});
$('a.action').tipsy({gravity:'s', fade:true, live:true});
$('#headerSize').tipsy({gravity:'s', fade:true, live:true});
$('td.filesize').tipsy({gravity:'s', fade:true, live:true});
From 4bfd61fb7fcbc6394bbf2ee83f733cd09abb63a3 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Thu, 18 Jul 2013 18:46:37 +0200
Subject: [PATCH 11/95] use new delete icon for deleted files as well
---
apps/files/js/fileactions.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 59cf007f53d..ef82cd63468 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -123,7 +123,7 @@ var FileActions = {
img = img(file);
}
if (typeof trashBinApp !== 'undefined' && trashBinApp) {
- var html = '';
+ var html = '';
} else {
var html = '';
}
From dba4111aa0bfd387d705391bf9d75f7f43bf1135 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Mon, 22 Jul 2013 11:18:51 +0200
Subject: [PATCH 12/95] fix delete button not showing in IE8
---
apps/files/css/files.css | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f2ca1065eca..6c835a7cdd0 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -147,14 +147,14 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
display:none;
}
#fileList tr:hover a.action, #fileList a.action.permanent {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=.5)";
- filter: alpha(opacity=.5);
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+ filter: alpha(opacity=50);
opacity: .5;
display:inline;
}
#fileList tr:hover a.action:hover {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=1)";
- filter: alpha(opacity=1);
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
opacity: 1;
display:inline;
}
From cdb993ad69969964c433cf414b549c52b298c67d Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk
Date: Tue, 23 Jul 2013 17:13:12 +0300
Subject: [PATCH 13/95] Explicit ie8 fallback
---
core/css/styles.css | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/css/styles.css b/core/css/styles.css
index 46972331df9..c328804f816 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -685,3 +685,7 @@ button.loading {
::-moz-focus-inner {
border: 0; /* remove dotted outlines in Firefox */
}
+.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
+.lte8 .delete-icon:hover, .delete-icon:focus {
+ background-image: url('../img/actions/delete-hover.png');
+}
\ No newline at end of file
From 16d8074d77292f812234fc3b93e851e39f3a6cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?=
Date: Thu, 25 Jul 2013 11:15:01 +0200
Subject: [PATCH 14/95] fix css
---
apps/files_versions/css/versions.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index 6146eda3372..6f4e2ee1312 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -39,6 +39,6 @@
float: right;
}
-.drop-versions #makelink {
+.drop-versions #show-more-versions {
float: left;
}
From e5b0c1e78b0e0b5cb4b49db4060e1a2fffdc172c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?=
Date: Thu, 25 Jul 2013 11:15:24 +0200
Subject: [PATCH 15/95] remove unused code; use jquery
---
apps/files_versions/js/versions.js | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index ca479507d48..a14de7dbee2 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -104,9 +104,9 @@ function createVersionsDropdown(filename, files) {
success: function(result) {
var versions = result.data.versions;
if (result.data.endReached === true) {
- document.getElementById("show-more-versions").style.display="none";
+ $("#show-more-versions").css("display", "none");
} else {
- document.getElementById("show-more-versions").style.display="block";
+ $("#show-more-versions").css("display", "block");
}
if (versions) {
$.each(versions, function(index, row) {
@@ -132,8 +132,6 @@ function createVersionsDropdown(filename, files) {
download ='';
download+='
';
download+=name;
download+='';
@@ -143,8 +141,6 @@ function createVersionsDropdown(filename, files) {
revert+=' value="' + files + '">';
revert+='
'+t('files_versions', 'Restore')+'';
From 62f84ff79cdeebbba9bd65d97f542c59bc41911d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?=
Date: Thu, 25 Jul 2013 12:29:39 +0200
Subject: [PATCH 16/95] css for button no longer needed
---
apps/files_versions/css/versions.css | 3 ---
1 file changed, 3 deletions(-)
diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index 6f4e2ee1312..db4b2fca21a 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -39,6 +39,3 @@
float: right;
}
-.drop-versions #show-more-versions {
- float: left;
-}
From 33fe24dc3d12868d79f9b137e9e91eba2b3e5028 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk
Date: Mon, 29 Jul 2013 19:27:11 +0300
Subject: [PATCH 17/95] Replace delete icon with spinner
---
apps/files/js/filelist.js | 8 +++-----
core/css/styles.css | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 04a9fb91649..dc820dc93e2 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -371,9 +371,7 @@ var FileList={
}
for (var i=0; i';
- deleteAction.html(newHTML);
+ deleteAction.removeClass('delete-icon').addClass('progress-icon');
}
// Finish any existing actions
if (FileList.lastAction) {
@@ -394,8 +392,8 @@ var FileList={
procesSelection();
} else {
$.each(files,function(index,file) {
- var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
- deleteAction.html(oldHTML);
+ var deleteAction = $('tr').filterAttr('data-file',files[i]).children("td.date").children(".action.delete");
+ deleteAction.removeClass('progress-icon').addClass('delete-icon');
});
}
});
diff --git a/core/css/styles.css b/core/css/styles.css
index 490619c00d4..365de759fdc 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -659,7 +659,7 @@ div.crumb:active {
}
/* icons */
-.folder-icon, .delete-icon, .edit-icon {
+.folder-icon, .delete-icon, .edit-icon, .progress-icon {
background-repeat: no-repeat;
background-position: center;
}
@@ -669,7 +669,7 @@ div.crumb:active {
background-image: url('../img/actions/delete-hover.svg');
}
.edit-icon { background-image: url('../img/actions/rename.svg'); }
-
+.progress-icon { background-image: url('../img/loading.gif'); }
/* buttons */
button.loading {
From 1a1c100719643c6056541ffd208642e9f1653c95 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 30 Jul 2013 10:44:01 +0200
Subject: [PATCH 18/95] fix loading.gif size for both upload and deletion,
force visiblity
---
apps/files/js/filelist.js | 2 +-
core/css/styles.css | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index dc820dc93e2..e483626a91a 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -15,7 +15,7 @@ var FileList={
// filename td
td = $(' | ').attr({
"class": "filename",
- "style": 'background-image:url('+iconurl+')'
+ "style": 'background-image:url('+iconurl+'); background-size: 16px;'
});
td.append('');
var link_elem = $('').attr({
diff --git a/core/css/styles.css b/core/css/styles.css
index 365de759fdc..3af1a311585 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -669,7 +669,13 @@ div.crumb:active {
background-image: url('../img/actions/delete-hover.svg');
}
.edit-icon { background-image: url('../img/actions/rename.svg'); }
-.progress-icon { background-image: url('../img/loading.gif'); }
+.progress-icon {
+ background-image: url('../img/loading.gif');
+ background-size: 16px;
+ /* force show the loading icon, not only on hover */
+ opacity: 1 !important;
+ display: inline !important;
+}
/* buttons */
button.loading {
From f9d1d79929e8414789245c79369ceadf1af67ab4 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 30 Jul 2013 14:43:48 +0200
Subject: [PATCH 19/95] reduce z-index of settings popup, fix #4212
---
core/css/styles.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 0dd66fb5b7c..9c6d39030e9 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -596,7 +596,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
#category_addinput { width:10em; }
/* ---- APP SETTINGS ---- */
-.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:200; }
+.popup { background-color:white; border-radius:10px 10px 10px 10px; box-shadow:0 0 20px #888; color:#333; padding:10px; position:fixed !important; z-index:100; }
.popup.topright { top:7em; right:1em; }
.popup.bottomleft { bottom:1em; left:33em; }
.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; }
From 31afbb3434b98aaa839d20d035a449b842b9d97a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Tue, 30 Jul 2013 14:47:05 +0200
Subject: [PATCH 20/95] remove ugly inset shadow from header
---
core/css/styles.css | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/css/styles.css b/core/css/styles.css
index 9c6d39030e9..e7dcdf67d64 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -19,7 +19,10 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
#body-user #header, #body-settings #header {
position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em;
background:#1d2d44 url('../img/noise.png') repeat;
- -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
+ -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5);
+ -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5);
+ box-shadow:0 0 10px rgba(0, 0, 0, .5);
+}
#body-login {
text-align: center;
From 0a5be39446e01f6e4a25c11370b2b133198a92b7 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Wed, 31 Jul 2013 09:58:57 +0200
Subject: [PATCH 21/95] remove unused and never to be used pagination
---
core/templates/part.pagenavi.php | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 core/templates/part.pagenavi.php
diff --git a/core/templates/part.pagenavi.php b/core/templates/part.pagenavi.php
deleted file mode 100644
index 2f5c2183765..00000000000
--- a/core/templates/part.pagenavi.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
From 8eaa0e73366cc7bd4685394480f0498bc2e45e8b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Wed, 31 Jul 2013 10:04:02 +0200
Subject: [PATCH 22/95] remove table layout for background jobs
---
settings/templates/admin.php | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 2b14c1460d6..e54586b80df 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -90,38 +90,30 @@ if (!$_['internetconnectionworking']) {