diff options
| -rw-r--r-- | apps/files/js/filelist.js | 9 | ||||
| -rw-r--r-- | apps/theming/css/settings-admin.scss | 6 | ||||
| -rw-r--r-- | core/css/guest.css | 29 | ||||
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 2 | ||||
| -rw-r--r-- | tests/Settings/Controller/CheckSetupControllerTest.php | 34 |
5 files changed, 68 insertions, 12 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 83510762c1a..94fdada937d 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -99,7 +99,14 @@ * @return {int} page size */ pageSize: function() { - return Math.max(Math.ceil(this.$container.height() / 50), 1); + var isGridView = this.$showGridView.is(':checked'); + var columns = 1; + var rows = Math.ceil(this.$container.height() / 50); + if (isGridView) { + columns = Math.ceil(this.$container.width() / 160); + rows = Math.ceil(this.$container.height() / 160); + } + return Math.max(columns*rows, columns); }, /** diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss index f8f2a0e33ac..504760d4596 100644 --- a/apps/theming/css/settings-admin.scss +++ b/apps/theming/css/settings-admin.scss @@ -18,14 +18,16 @@ .theme-undo { position: absolute; - top: -7px; - right: 7px; + top: -7px; // input padding + right: 4px; // input right margin + border cursor: pointer; opacity: .3; padding: 7px; vertical-align: top; display: inline-block; visibility: hidden; + height: 32px; // height of input + width: 32px; // height of input } form.uploadButton { width: 411px; diff --git a/core/css/guest.css b/core/css/guest.css index 6a3b8c633e0..af6b31a99f1 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -144,23 +144,28 @@ form #datadirField legend { /* Buttons and input */ #submit-wrapper, #reset-password-wrapper { + display: flex; + align-items: center; + justify-content: center; position: relative; /* Make the wrapper the containing block of its absolutely positioned descendant icons */ } #submit-wrapper .submit-icon { position: absolute; - height: 22px; + top: 22px; right: 24px; - top: 18px; + transition: right 100ms ease-in-out; pointer-events: none; /* The submit icon is positioned on the submit button. From the user point of view the icon is part of the button, so the clicks on the icon have to be applied to the button instead. */ } -/* Properly position any loader */ -#submit-wrapper .submit-icon::after { - margin: -10px; + +#submit-wrapper:hover .submit-icon.icon-confirm-white, +#submit-wrapper:focus .submit-icon.icon-confirm-white, +#submit-wrapper:active .submit-icon.icon-confirm-white { + right: 20px; } #reset-password-submit { @@ -173,6 +178,12 @@ form #datadirField legend { display: none; } +#submit-wrapper .icon-loading-small { + position: absolute; + top: 22px; + right: 24px; +} + input, textarea, select, button, div[contenteditable=true] { font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; @@ -220,7 +231,8 @@ input[type='email'] { font-weight: normal; } input.login { - width: 269px; + width: 260px; + height: 50px; background-position: right 16px center; } input[type='submit'], @@ -253,6 +265,7 @@ a.primary { border: 1px solid #fff; background-color: #0082c9; color: #fff; + transition: color 100ms ease-in-out; } input.primary:not(:disabled):hover, @@ -260,8 +273,8 @@ input.primary:not(:disabled):focus, button.primary:not(:disabled):hover, button.primary:not(:disabled):focus, a.primary:not(:disabled):hover, -a.primary:not(:disabled):focus{ - background-color: #17adff; +a.primary:not(:disabled):focus { + color: rgba(255, 255, 255, .8); } /* Checkboxes - white only for login */ diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index fa4ed57ab95..ba56c72dccf 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -530,7 +530,7 @@ Raw output } protected function isPhpMailerUsed(): bool { - return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php'; + return $this->config->getSystemValue('mail_smtpmode', 'smtp') === 'php'; } protected function hasOpcacheLoaded(): bool { diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php index 34c7d19bd8d..ff565f3734b 100644 --- a/tests/Settings/Controller/CheckSetupControllerTest.php +++ b/tests/Settings/Controller/CheckSetupControllerTest.php @@ -520,6 +520,40 @@ class CheckSetupControllerTest extends TestCase { $this->assertEquals($expected, $this->checkSetupController->check()); } + public function testIsPhpMailerUsed() { + $checkSetupController = $this->getMockBuilder('\OC\Settings\Controller\CheckSetupController') + ->setConstructorArgs([ + 'settings', + $this->request, + $this->config, + $this->clientService, + $this->urlGenerator, + $this->util, + $this->l10n, + $this->checker, + $this->logger, + $this->dispatcher, + $this->db, + $this->lockingProvider, + $this->dateTimeFormatter, + $this->memoryInfo, + $this->secureRandom, + ]) + ->setMethods(null)->getMock(); + + $this->config->expects($this->at(0)) + ->method('getSystemValue') + ->with('mail_smtpmode', 'smtp') + ->will($this->returnValue('php')); + $this->config->expects($this->at(1)) + ->method('getSystemValue') + ->with('mail_smtpmode', 'smtp') + ->will($this->returnValue('not-php')); + + $this->assertTrue($this->invokePrivate($checkSetupController, 'isPhpMailerUsed')); + $this->assertFalse($this->invokePrivate($checkSetupController, 'isPhpMailerUsed')); + } + public function testGetCurlVersion() { $checkSetupController = $this->getMockBuilder('\OC\Settings\Controller\CheckSetupController') ->setConstructorArgs([ |