diff options
| author | Julius Härtl <jus@bitgrid.net> | 2017-09-01 23:06:44 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-09-04 15:59:40 +0200 |
| commit | ed11c0d6e29e0fb6c8f42b81c4a1664693d87a28 (patch) | |
| tree | 0c0a996e748302a65d2f4531be3aec24a9c0625b /apps/theming | |
| parent | 0f2f19c65fbea41c316ceff74b75cbc3c8ad66f3 (diff) | |
| download | nextcloud-server-ed11c0d6e29e0fb6c8f42b81c4a1664693d87a28.tar.gz nextcloud-server-ed11c0d6e29e0fb6c8f42b81c4a1664693d87a28.zip | |
Fix tests for primary element color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/theming.scss | 2 | ||||
| -rw-r--r-- | apps/theming/tests/ThemingDefaultsTest.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index b2f70c1350d..1a34d63b153 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -62,7 +62,7 @@ input.primary { background-color: $color-primary-element; - border: 1px solid $color-primary-text; + border: 1px solid $color-primary; color: $color-primary-text; } diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php index 057229483e9..590ec7e1a91 100644 --- a/apps/theming/tests/ThemingDefaultsTest.php +++ b/apps/theming/tests/ThemingDefaultsTest.php @@ -507,8 +507,10 @@ class ThemingDefaultsTest extends TestCase { $this->config->expects($this->at(7))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary()); $this->config->expects($this->at(8))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary()); $this->config->expects($this->at(9))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary()); + $this->config->expects($this->at(10))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary()); $this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false); + $this->util->expects($this->any())->method('elementColor')->with($this->defaults->getColorPrimary())->willReturn('#aaaaaa'); $this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -538,7 +540,8 @@ class ThemingDefaultsTest extends TestCase { 'image-login-background' => "'absolute-custom-background?v=0'", 'color-primary' => $this->defaults->getColorPrimary(), 'color-primary-text' => '#ffffff', - 'image-login-plain' => 'false' + 'image-login-plain' => 'false', + 'color-primary-element' => '#aaaaaa' ]; $this->assertEquals($expected, $this->template->getScssVariables()); |