diff --git a/package.json b/package.json index 2bd38de3..f0868367 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nighttab", - "version": "3.75.2", + "version": "3.76.0", "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.", "main": "index.js", "scripts": { diff --git a/src/index.html b/src/index.html index 276f721a..f3f7fd09 100644 --- a/src/index.html +++ b/src/index.html @@ -1051,7 +1051,10 @@
- +
+ + +

Take care as some colours may make the Clock, Date and other text unreadable.

diff --git a/src/js/background.js b/src/js/background.js index e1fbe45e..84e8ad51 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -115,8 +115,13 @@ var background = (function() { render.input = { clear: function() { - var input = helper.e(".control-background-image-file"); - input.value = ""; + helper.e(".control-background-image-file").value = ""; + }, + picker: function() { + helper.e(".control-background-color-custom-current-picker").value = helper.rgbToHex(state.get().background.color.custom); + }, + hex: function() { + helper.e(".control-background-color-custom-current-hex").value = helper.rgbToHex(state.get().background.color.custom); } }; diff --git a/src/js/control.js b/src/js/control.js index 2eccb40d..2223b077 100644 --- a/src/js/control.js +++ b/src/js/control.js @@ -2137,11 +2137,21 @@ var control = (function() { render.class(); } }, { - element: helper.e(".control-background-color-custom-current"), + element: helper.e(".control-background-color-custom-current-picker"), path: "background.color.custom", type: "color", func: function() { background.render.color(); + background.render.input.hex(); + } + }, { + element: helper.e(".control-background-color-custom-current-hex"), + path: "background.color.custom", + type: "text", + valueMod: ["hexTextString"], + func: function() { + background.render.color(); + background.render.input.picker(); } }, { element: helper.e(".control-background-image-show"), @@ -3071,10 +3081,12 @@ var control = (function() { _disable.element(".control-background-image-url-helper", true); }; if (state.get().background.color.by == "theme") { - _disable.input(".control-background-color-custom-current", true); + _disable.input(".control-background-color-custom-current-picker", true); + _disable.input(".control-background-color-custom-current-hex", true); _disable.element(".control-background-color-theme-helper", true); } else if (state.get().background.color.by == "custom") { - _disable.input(".control-background-color-custom-current", false); + _disable.input(".control-background-color-custom-current-picker", false); + _disable.input(".control-background-color-custom-current-hex", false); _disable.element(".control-background-color-theme-helper", false); }; }; diff --git a/src/js/version.js b/src/js/version.js index d1326f70..b86c4350 100644 --- a/src/js/version.js +++ b/src/js/version.js @@ -1,6 +1,6 @@ var version = (function() { - var current = "3.75.2"; + var current = "3.76.0"; var compare = function(a, b) { var pa = a.split("."); diff --git a/src/manifest.json b/src/manifest.json index b7663b1c..95eb8820 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "name": "nightTab", "short_name": "nightTab", "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.", - "version": "3.75.2", + "version": "3.76.0", "manifest_version": 2, "chrome_url_overrides": { "newtab": "index.html"