diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-12-08 23:49:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 23:49:52 +0100 |
| commit | 79ed0d105dc3e5b8fde5e4d8a1ae0f183834349e (patch) | |
| tree | 7ad733e5486dfd9c4df642be65582af669a07b84 /apps | |
| parent | 3f34861d586e063238a1f9824eb0143f9f7a0c48 (diff) | |
| parent | 81f34e224c0e28ebc37ecd9bd7ea7e607fb98486 (diff) | |
| download | nextcloud-server-79ed0d105dc3e5b8fde5e4d8a1ae0f183834349e.tar.gz nextcloud-server-79ed0d105dc3e5b8fde5e4d8a1ae0f183834349e.zip | |
Merge pull request #7426 from nextcloud/Abijeet-master
Allows adding of hex color to the theme-color
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/js/settings-admin.js | 6 | ||||
| -rw-r--r-- | apps/theming/templates/settings-admin.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 44a799a19b4..7df1bbf1125 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -206,7 +206,11 @@ $(document).ready(function () { }); $('#theming-color').change(function (e) { - setThemingValue('color', '#' + $(this).val()); + var color = $(this).val(); + if (color.indexOf('#') !== 0) { + color = '#' + color; + } + setThemingValue('color', color); }); $('.theme-undo').click(function (e) { diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php index c7451e595d7..1b8ed87bb0d 100644 --- a/apps/theming/templates/settings-admin.php +++ b/apps/theming/templates/settings-admin.php @@ -62,7 +62,7 @@ style('theming', 'settings-admin'); <div> <label> <span><?php p($l->t('Color')) ?></span> - <input id="theming-color" type="text" class="jscolor" maxlength="6" value="<?php p($_['color']) ?>" /> + <input id="theming-color" type="text" class="jscolor" data-jscolor="{hash:true}" maxlength="7" value="<?php p($_['color']) ?>" /> <div data-setting="color" data-toggle="tooltip" data-original-title="<?php p($l->t('Reset to default')); ?>" class="theme-undo icon icon-history"></div> </label> </div> |