From 9ffa5780dbbf3abe68b34ba5a679c196ef51a1ac Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 2 Jun 2014 14:32:07 +0200 Subject: [PATCH 01/10] fix height of select boxes for OS X --- core/css/fixes.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/fixes.css b/core/css/fixes.css index 91267c276ae..0f18f0a56cd 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -7,7 +7,7 @@ /* fix height of select boxes for OS X */ select { - min-height: 29px; + height: 32px; } .lte8 .delete-icon { background-image: url('../img/actions/delete.png'); } From 16e81c1d376dc1c75ad958b12f263c26db06e185 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 2 Jun 2014 15:26:18 +0200 Subject: [PATCH 02/10] shift files app breadcrumbs to account for missing app list --- core/css/mobile.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/css/mobile.css b/core/css/mobile.css index 01852613062..025bee6415a 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -111,11 +111,14 @@ -/* shift to account for missing navigation */ +/* shift to account for missing app list */ #body-user #controls, #body-settings #controls { padding-left: 0; } +#body-user .app-files #controls { + left: 230px !important; /* sidebar only */ +} /* don’t require a minimum width for controls bar */ #controls { From 72ba396905acca84a9e0ba4d08649aebcd713de0 Mon Sep 17 00:00:00 2001 From: raghunayyar Date: Sun, 20 Apr 2014 12:59:13 +0530 Subject: [PATCH 03/10] Adds Animation to Toggling Navigation on < 768px widths --- core/js/js.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/js/js.js b/core/js/js.js index 21a2d4c1b35..e1d7986f01e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -531,7 +531,7 @@ var OC={ $toggle.addClass('menutoggle'); $toggle.on('click.menu', function(event) { if ($menuEl.is(OC._currentMenu)) { - $menuEl.hide(); + $menuEl.slideUp(200); OC._currentMenu = null; OC._currentMenuToggle = null; return false; @@ -541,7 +541,7 @@ var OC={ // close it OC._currentMenu.hide(); } - $menuEl.show(); + $menuEl.slideToggle(200); OC._currentMenu = $menuEl; OC._currentMenuToggle = $toggle; return false; @@ -554,7 +554,7 @@ var OC={ unregisterMenu: function($toggle, $menuEl) { // close menu if opened if ($menuEl.is(OC._currentMenu)) { - $menuEl.hide(); + $menuEl.slideUp(200); OC._currentMenu = null; OC._currentMenuToggle = null; } @@ -1097,7 +1097,7 @@ function initCore() { return false; } if (OC._currentMenu) { - OC._currentMenu.hide(); + OC._currentMenu.slideUp(200); } OC._currentMenu = null; OC._currentMenuToggle = null; From de23ae735b61cc721537fade25e405b44aef1296 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 19 May 2014 15:44:19 +0200 Subject: [PATCH 04/10] add OC.menuSpeed to control the animation speed of menu toggle --- core/js/js.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/js/js.js b/core/js/js.js index e1d7986f01e..1ac183f0a8f 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -183,7 +183,8 @@ var OC={ appConfig: window.oc_appconfig || {}, theme: window.oc_defaults || {}, coreApps:['', 'admin','log','search','settings','core','3rdparty'], - + menuSpeed: 100, + /** * Get an absolute url to a file in an app * @param {string} app the id of the app the file belongs to @@ -531,7 +532,7 @@ var OC={ $toggle.addClass('menutoggle'); $toggle.on('click.menu', function(event) { if ($menuEl.is(OC._currentMenu)) { - $menuEl.slideUp(200); + $menuEl.slideUp(OC.menuSpeed); OC._currentMenu = null; OC._currentMenuToggle = null; return false; @@ -541,7 +542,7 @@ var OC={ // close it OC._currentMenu.hide(); } - $menuEl.slideToggle(200); + $menuEl.slideToggle(OC.menuSpeed); OC._currentMenu = $menuEl; OC._currentMenuToggle = $toggle; return false; @@ -554,7 +555,7 @@ var OC={ unregisterMenu: function($toggle, $menuEl) { // close menu if opened if ($menuEl.is(OC._currentMenu)) { - $menuEl.slideUp(200); + $menuEl.slideUp(OC.menuSpeed); OC._currentMenu = null; OC._currentMenuToggle = null; } @@ -1068,7 +1069,7 @@ function initCore() { } }); $('#settings #expand').click(function(event) { - $('#settings #expanddiv').slideToggle(200); + $('#settings #expanddiv').slideToggle(OC.menuSpeed); event.stopPropagation(); }); $('#settings #expanddiv').click(function(event){ @@ -1076,7 +1077,7 @@ function initCore() { }); //hide the user menu when clicking outside it $(document).click(function(){ - $('#settings #expanddiv').slideUp(200); + $('#settings #expanddiv').slideUp(OC.menuSpeed); }); // all the tipsy stuff needs to be here (in reverse order) to work @@ -1097,7 +1098,7 @@ function initCore() { return false; } if (OC._currentMenu) { - OC._currentMenu.slideUp(200); + OC._currentMenu.slideUp(OC.menuSpeed); } OC._currentMenu = null; OC._currentMenuToggle = null; From 708758f34e52b940d3e951d1ae5c2a66c9c73bdb Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 2 Jun 2014 15:52:57 +0200 Subject: [PATCH 05/10] remove unused table sizing CSS --- apps/files/css/files.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index decfdbd2cda..45cce864b10 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -155,8 +155,9 @@ tr:hover span.extension { color: #777; } -table tr.mouseOver td { background-color:#eee; } -table th { height:24px; padding:0 8px; } +table tr.mouseOver td { + background-color: #eee; +} table th, table th a { color: #999; } From a447caf8d3c75e09202d9b8e30ee1985957d809a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 2 Jun 2014 15:55:49 +0200 Subject: [PATCH 06/10] fix misalignment of modified dates, shift to right --- apps/files/css/files.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 45cce864b10..2eb668f11ca 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -267,7 +267,7 @@ table td.filename .nametext, .uploadtext, .modified { float:left; padding:14px 0 .modified { position: relative; - padding-left: 8px; + padding-left: 15px; overflow: hidden; text-overflow: ellipsis; width: 90%; From 3b4004f9e5da6cba878eddc4db97a5d38c0dc5d8 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 2 Jun 2014 16:23:22 +0200 Subject: [PATCH 07/10] more subtle hover effect on sortable column, text instead of background --- apps/files/css/files.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 2eb668f11ca..e3a6f8aa137 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -180,7 +180,7 @@ table th .columntitle.name { } /* hover effect on sortable column */ table th a.columntitle:hover { - background-color: #F0F0F0; + color: #000; } table th .sort-indicator { width: 10px; From bdfad3440cec88493870eb06d17ae45d551a61a4 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 2 Jun 2014 17:25:08 +0200 Subject: [PATCH 08/10] fix success status symbol to a circle --- apps/files_external/css/settings.css | 5 +++++ settings/css/settings.css | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css index ee2c0aae64b..01dd5aece8c 100644 --- a/apps/files_external/css/settings.css +++ b/apps/files_external/css/settings.css @@ -20,3 +20,8 @@ tr:hover>td.remove>img { visibility:visible; cursor:pointer; } position: relative; top: 3px; } + + +#externalStorage td.status .success { + border-radius: 50%; +} diff --git a/settings/css/settings.css b/settings/css/settings.css index be6cfe1e9bf..a265d12ba75 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -158,6 +158,10 @@ table.shareAPI .indent { padding-left: 2em; } vertical-align: text-bottom; } +.cronstatus.success { + border-radius: 50%; +} + #selectGroups select { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; From cd61fb06ebb59889a9368b34ab432f2f6a155d2e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 2 Jun 2014 17:32:36 +0200 Subject: [PATCH 09/10] move Deleted Files to bottom of sidebar --- apps/files/css/files.css | 6 ++++++ core/css/apps.css | 1 + 2 files changed, 7 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index e3a6f8aa137..11cbc4b7f57 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -116,6 +116,12 @@ width: 230px; } +/* move Deleted Files to bottom of sidebar */ +.nav-trashbin { + position: absolute !important; + bottom: 0; +} + .app-files #app-settings { width: 229px; /* DUH */ } diff --git a/core/css/apps.css b/core/css/apps.css index 377878467c0..83569398cec 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -19,6 +19,7 @@ padding-bottom: 44px; } #app-navigation > ul { + position: relative; height: 100%; overflow: auto; -moz-box-sizing: border-box; box-sizing: border-box; From fbe42a771f433a01e54f744998593ae4cf07ed82 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 2 Jun 2014 18:09:26 +0200 Subject: [PATCH 10/10] fix unit tests after introduction of animations - adds delays for click trigger --- core/js/tests/specs/coreSpec.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 233c4d5a0b4..b981eb579a7 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -359,8 +359,10 @@ describe('Core base tests', function() { var oldMatchMedia; var $toggle; var $navigation; + var clock; beforeEach(function() { + clock = sinon.useFakeTimers(); oldMatchMedia = OC._matchMedia; // a separate method was needed because window.matchMedia // cannot be stubbed due to a bug in PhantomJS: @@ -376,6 +378,7 @@ describe('Core base tests', function() { afterEach(function() { OC._matchMedia = oldMatchMedia; + clock.restore(); }); it('Sets up menu toggle in mobile mode', function() { OC._matchMedia.returns({matches: true}); @@ -413,8 +416,10 @@ describe('Core base tests', function() { $navigation.hide(); // normally done through media query triggered CSS expect($navigation.is(':visible')).toEqual(false); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(true); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(false); }); it('Clicking menu toggle does not toggle navigation in desktop mode', function() { @@ -448,6 +453,7 @@ describe('Core base tests', function() { window.initCore(); expect($navigation.is(':visible')).toEqual(false); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(true); mq.matches = false; $(window).trigger('resize'); @@ -456,6 +462,7 @@ describe('Core base tests', function() { $(window).trigger('resize'); expect($navigation.is(':visible')).toEqual(false); $toggle.click(); + clock.tick(1 * 1000); expect($navigation.is(':visible')).toEqual(true); }); });