diff options
author | Abijeet <abijeetpatro@gmail.com> | 2017-12-03 18:26:54 +0530 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2017-12-08 10:42:41 +0100 |
commit | 81f34e224c0e28ebc37ecd9bd7ea7e607fb98486 (patch) | |
tree | 9e0be31109674bda8e890e43585228b2bd425865 /tests/acceptance/features/app-theming.feature | |
parent | ef2b0969dd022ed900d01a7567c52635773d6509 (diff) | |
download | nextcloud-server-81f34e224c0e28ebc37ecd9bd7ea7e607fb98486.tar.gz nextcloud-server-81f34e224c0e28ebc37ecd9bd7ea7e607fb98486.zip |
Allows adding of hex color to the theme-color
Fixes #7158. Adds a # on the color if missing.
Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event.
Since the input element now allows a hex code, changed values to hexcode.
In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison.
Also changed the way we were determining whether the jscolor component had loaded.
Changed the control to use data-jscolor rather than defining opts in the class.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
Diffstat (limited to 'tests/acceptance/features/app-theming.feature')
-rw-r--r-- | tests/acceptance/features/app-theming.feature | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/acceptance/features/app-theming.feature b/tests/acceptance/features/app-theming.feature index 9f5ac3f6a42..375e2bc1cae 100644 --- a/tests/acceptance/features/app-theming.feature +++ b/tests/acceptance/features/app-theming.feature @@ -5,19 +5,19 @@ Feature: app-theming And I visit the settings page And I open the "Theming" section And I see that the color selector in the Theming app has loaded - And I see that the header color is "0082C9" - When I set the "Color" parameter in the Theming app to "C9C9C9" + And I see that the header color is "#0082C9" + When I set the "Color" parameter in the Theming app to "#C9C9C9" Then I see that the parameters in the Theming app are eventually saved - And I see that the header color is "C9C9C9" + And I see that the header color is "#C9C9C9" Scenario: resetting the color updates the header color Given I am logged in as the admin And I visit the settings page And I open the "Theming" section And I see that the color selector in the Theming app has loaded - And I set the "Color" parameter in the Theming app to "C9C9C9" + And I set the "Color" parameter in the Theming app to "#C9C9C9" And I see that the parameters in the Theming app are eventually saved - And I see that the header color is "C9C9C9" + And I see that the header color is "#C9C9C9" When I reset the "Color" parameter in the Theming app to its default value Then I see that the parameters in the Theming app are eventually saved - And I see that the header color is "0082C9" + And I see that the header color is "#0082C9" |