jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

CSS uses named colors variables (#23597)

Browse Source
This commit is contained in:
s-hadinger 2025-07-05 15:19:45 +02:00 committed by GitHub
parent c5aced3dd0
commit 99b73aaaf8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 174 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
- BLE updates for esp-nimble-cpp v2.x (#23553)
- Library names (#23560)
- ESP32 LoRaWan decoding won't duplicate non-decoded message if `SO147 0`
- CSS uses named colors variables
### Fixed
- LVGL restore `lv_chart.set_range` removed in LVGL 9.3.0 in favor of `lv_chart.set_axis_range` (#23567)

33
tasmota/html_compressed/HTTP_HEAD_STYLE1.h
View File

@ -1,25 +1,26 @@
/////////////////////////////////////////////////////////////////////
// compressed by tools/unishox/compress-html-uncompressed.py
// input sha256: 8c22c19284fa41f8eb66b1f50cb94cc3fe14369f900031e791107fe56d583c2f
// input sha256: a92df5da4ce64371d708d5b7f3d01034e2593d4b183bdbc689b47a77764de0c1
/////////////////////////////////////////////////////////////////////
const size_t HTTP_HEAD_STYLE1_SIZE = 591; // compressed size 330 bytes
const size_t HTTP_HEAD_STYLE1_SIZE = 646; // compressed size 348 bytes
const char HTTP_HEAD_STYLE1_COMPRESSED[] PROGMEM = "\x3D\x3D\x46\x41\x33\xF0\x4D\x33\x3A\x8C\x6B\x08\x4F\x3A\x3A\xB7\x86\x0B\xA3\xAB"
"\xCC\x26\x1D\x1E\xD1\x96\x20\x9B\xC3\xC7\x99\xCD\x21\x86\xC3\xC1\x8C\xEA\x3A\xFD"
"\xA6\xD6\x79\x9C\x84\xC6\x9E\x0F\x70\x21\xE1\xA7\xB4\x75\x86\x68\x3D\xFC\x17\xC2"
"\x1E\x67\x91\xF4\x71\xF1\x1B\x0F\x07\xB8\x61\xED\x1B\x7F\x1E\xDE\x3C\xCE\x33\xA6"
"\x93\x1A\x8E\x33\xC1\xEE\x2D\xE1\x82\xE8\xF6\x8F\xE8\x94\x28\xF3\x39\x1B\x3E\x8F"
"\xA3\xC1\x0E\xC3\x61\xD7\xED\x36\xEF\x0F\x1E\x63\xB3\xE2\x3F\x9D\x63\xB0\xD8\x78"
"\x3A\xC7\xD8\xE3\x4D\xA3\xAC\x14\xAD\x0D\xC3\x68\x29\x57\x04\xCD\x84\x3C\x0B\x3E"
"\x08\x7B\x6E\xF0\xC1\x74\x7B\xD4\x64\x31\x9F\x03\x14\xC3\x34\x1D\x86\xC3\xDF\x04"
"\x1E\x11\x41\x06\x8F\xEC\x4D\xC3\xDF\x04\x3D\xF1\x8D\x3C\x02\x0F\x03\x87\x5F\xF4"
"\x78\x55\x1E\x67\x38\x86\x1B\x0F\x06\x6F\xF5\xA1\xD8\x47\x5D\x85\xA3\xDC\x79\x9D"
"\x67\x21\x0C\x04\x9C\xCF\xF7\xC3\xCC\x10\xF1\xE3\x89\x1F\x47\xD1\xE0\xF7\x10\x21"
"\x71\x3E\x09\x1C\x28\x82\xC7\x2A\x01\x54\xCD\x95\x7F\x76\x7B\x7E\xFD\xA6\xD6\x79"
"\x82\x1E\xA0\x78\x04\x2C\xC8\xE7\xCF\xA3\xE8\xF0\x42\x9E\x8F\x0A\xA3\xCC\xE5\xCF"
"\x90\xC3\x61\xE0\x11\xF8\xFA\xC3\x37\xF3\x01\x60\xF9\xE7\x62\xEB\x01\x6B\x45\x1D"
"\x82\x19\x1E\xDA\x66\xCA\x04\x2E\x0A\x83\x7D\x4F\xE0\x83\xC9\xE9\x8B\x1B\xA1\x19"
"\x1E\x66\x6F\xE2\x5F\x59\xD5\xEB\xEF\x1D\x7E\x7F\xD3\x2A\x01\x9B\x98\x1E\xEA\x10"
"\x11\x39\x7D\x38\xC8\x61\xB0\xF0\x7B\x8D";
"\x1E\x66\x77\xF3\xBA\x75\x9D\x61\x9F\xB3\x1F\x1A\x77\x8F\x07\xB8\x61\xED\x1B\x7F"
"\x1E\xDE\x3C\xCE\x33\xA6\x93\x1A\x8E\x33\xC1\xEE\x2D\xE1\x82\xE8\xF6\x8F\xE8\x94"
"\x28\xF3\x39\x1B\x3E\x8F\x04\x3B\x0D\x87\x5F\xB4\xDB\xBC\x3C\x79\x8E\xCF\x88\xFE"
"\x75\x8E\xC3\x61\xE0\xEB\x1F\x63\x8D\x36\x8E\xB0\x52\xB4\x37\x0D\xA0\xA5\x5C\x13"
"\xB6\x7D\xE3\xBC\x78\x0F\x02\xCF\x82\x34\xEA\x36\x51\xDE\x04\x2D\xA4\xF7\xA8\xC8"
"\x63\x3E\x06\x29\x86\x68\x3B\x0D\x87\xBE\x08\x3C\x2D\x02\x0D\x1F\xD8\x9B\x87\xBE"
"\x08\x7C\x05\x31\xA7\x80\x41\xE0\xA8\xEB\xFE\x8F\x0A\xA3\xCC\xE7\x10\xC3\x61\xE0"
"\xCD\xFE\xB4\x3B\x08\xEB\xB0\xB4\x7B\x8F\x33\xAC\xE4\x21\x86\xC0\x48\xCC\xFF\x7C"
"\x3C\xC1\x0F\x1E\x38\x91\xF4\x78\x3D\xC4\x08\x5C\x59\x82\x3F\x0B\xC0\xC1\xF8\x0F"
"\xA6\x6C\xAB\xFB\xB3\xDB\xF7\xED\x36\xB3\xCC\x10\xF5\xD3\xC0\x21\x67\xE7\x3E\x7D"
"\x1E\x08\x53\xD1\xE1\x54\x79\x9C\xB9\xF2\x18\x6C\x3C\x02\x3F\x23\x78\x66\xFE\x60"
"\x2C\x1F\x3C\xEC\x5D\x60\x27\xEA\x63\x87\x81\x2F\x53\x0F\xC1\x02\x0E\xA8\x3B\x04"
"\x32\x3D\xB4\xCD\x94\x08\x5C\x23\x06\xFA\x9F\xC1\x07\x96\xE3\x16\x37\x42\x32\x3C"
"\xCC\xDF\xC4\xBE\xB3\xAB\xD7\xDE\x3A\xFC\xFF\xA6\x01\x4F\x40\x3D\xD4\x20\x22\x73"
"\x68\x71\x90\xC3\x61\xE0\xF7\x1B";
#define HTTP_HEAD_STYLE1 Decompress(HTTP_HEAD_STYLE1_COMPRESSED,HTTP_HEAD_STYLE1_SIZE).c_str()

31
tasmota/html_compressed/HTTP_HEAD_STYLE2.h
View File

@ -1,22 +1,23 @@
/////////////////////////////////////////////////////////////////////
// compressed by tools/unishox/compress-html-uncompressed.py
// input sha256: cff4350b756f01fb7866cbbffa2d169d4fe9eaca6ba45634f368ca1d714cd582
// input sha256: 1819f01fe0cb407b7b2ff8618fa7e187ae6ebc34dea1d5e7ec6c21e21b589ca6
/////////////////////////////////////////////////////////////////////
const size_t HTTP_HEAD_STYLE2_SIZE = 496; // compressed size 262 bytes
const size_t HTTP_HEAD_STYLE2_SIZE = 573; // compressed size 295 bytes
const char HTTP_HEAD_STYLE2_COMPRESSED[] PROGMEM = "\x1C\x2E\xAB\x38\xF6\x8E\xCF\x88\xFE\x79\x9C\x67\x82\x04\x18\xA7\x5F\xEC\x4D\x17"
"\xE3\xCC\xE3\x3A\x59\x7D\x8D\x3C\x0E\xB0\xCD\x07\xBF\x82\xF8\x43\xCC\xF2\x3E\x8E"
"\x3E\x23\x61\xE0\x3C\x0B\x3E\x08\x52\x02\xDE\x67\x58\xA7\xA3\xC2\xA8\xF3\x39\x47"
"\x4C\x2F\xB1\xA7\x83\x19\xD4\x75\xFB\x4D\xAC\xF3\x39\x0E\x94\x5F\x63\x4F\x03\xFA"
"\x25\x0A\x3C\xCE\x46\xCF\xA3\xE8\xF0\x75\x90\xFB\x1C\x69\xB4\x75\xD7\xEF\xBD\xB5"
"\xB9\xC7\x58\x82\xFF\x75\xB9\xC7\x99\xC6\x74\xC2\xF1\xE0\x15\x2A\x2B\x86\x2F\xFE"
"\xCF\x9E\x63\x33\x7A\x9F\xCF\x07\xB8\x10\x78\x18\x3C\xC5\x61\x9B\xF9\xED\x04\xCE"
"\x2A\x01\x0F\x71\xD0\x77\xD8\x80\xA7\x50\x15\xB1\x21\xEF\xF0\x29\xD4\x05\x4C\x4A"
"\xCF\x68\x23\xF0\xDF\x4C\xD9\x47\x58\x8C\x3C\x04\x2E\x06\xBB\x39\x9E\x0F\x71\xD0"
"\x61\xED\x30\x16\x5D\x1E\x61\x33\x14\x08\x38\x05\x85\xA3\xDC\x08\x33\x0F\x71\xD0"
"\xD4\x08\x56\xFF\xA3\xC2\x81\x22\xE0\x20\xCD\x3D\xC7\x4F\x82\x17\x20\x60\x8D\xC7"
"\xD3\x1A\x78\x19\x62\x09\xBC\x3C\x79\x9C\xA2\x18\x6C\x3C\x0D\xBF\x8F\x6F\x1E\x67"
"\x30\x86\x1B\x11\xCA\x21\x86\xC3\xC1\xEE\x3A\x0A\x30\x7B\x44\xDF\x0C\x0A\xCC\x81"
"\x0B\x61";
"\xE3\xCC\xE3\x3A\x59\x7D\x8D\x3C\x0E\xB0\xCD\x07\xBF\x82\xF8\x43\xCC\xCE\xFE\x77"
"\x4E\xB3\xAC\x33\xF6\x3A\xB8\xEF\x1E\x03\xC0\xB3\xE0\x8F\x3E\x8D\x94\x77\x8F\x01"
"\x6F\x33\xAC\x53\xD1\xE1\x54\x79\x9C\xA3\xA6\x17\xD8\xD3\xC1\x8C\xEA\x3A\xFD\xA6"
"\xD6\x79\x9C\x87\x4A\x2F\xB1\xA7\x81\xFD\x12\x85\x1E\x67\x23\x67\xD1\xE0\xEB\x21"
"\xF6\x38\xD3\x68\xEB\xAF\xDF\x7B\x6B\x73\x8E\xB1\x05\xFE\xEB\x73\x8F\x33\x8C\xE9"
"\x85\xE3\xC0\x2A\x2B\x55\x0C\x5F\xFD\x9F\x3C\xC6\x66\xF5\x3F\x9E\x0F\x70\x20\xF0"
"\x50\x79\x8A\xC3\x37\xF3\xDA\x0A\x3C\x08\x0A\x33\xF9\xDE\x3C\x1E\xE3\xA0\xEF\xB1"
"\x01\x4A\xF7\xFD\x40\x87\x78\x16\x32\x6F\xFA\x81\x0F\x29\x1E\xFF\x02\x96\x03\xE3"
"\x30\x43\xBA\x0B\x19\x47\x8C\xC1\x07\x27\xB3\xDA\x09\x9C\x57\x1D\xE3\xC5\x33\x65"
"\x1D\x62\x30\xF0\x10\xB8\x57\xEC\xE6\x78\x3D\xC7\x41\x87\xB4\xC0\x59\x74\x79\x84"
"\xCC\x50\x20\xE0\x16\x16\x8F\x70\x20\xCC\x3D\xC7\x43\x50\x21\x5B\xFE\x8F\x0A\x04"
"\x8B\x80\x83\x34\xF7\x1D\x3E\x08\x5C\xA8\x02\x37\x28\xEC\x69\xE0\x65\x88\x26\xF0"
"\xF1\xE6\x72\x88\x61\xB0\xF0\x36\xFE\x3D\xBC\x79\x9C\xC2\x18\x6C\x47\x28\x86\x1B"
"\x0F\x07\xB8\xE8\x28\xC1\xED\x13\x7C\x30\x2B\x32\x04\x2D\x84";
#define HTTP_HEAD_STYLE2 Decompress(HTTP_HEAD_STYLE2_COMPRESSED,HTTP_HEAD_STYLE2_SIZE).c_str()

17
tasmota/html_compressed/HTTP_HEAD_STYLE3.h Normal file
View File

@ -0,0 +1,17 @@
/////////////////////////////////////////////////////////////////////
// compressed by tools/unishox/compress-html-uncompressed.py
// input sha256: a209b9067518627d964ff47dbef752032f0399605ca7180131f33baa69a6aacf
/////////////////////////////////////////////////////////////////////
const size_t HTTP_HEAD_STYLE3_SIZE = 248; // compressed size 173 bytes
const char HTTP_HEAD_STYLE3_COMPRESSED[] PROGMEM = "\x3D\x0E\xCF\x51\x90\x4C\xFC\x3D\x0E\xC1\x4E\xC4\x3F\x0F\x41\xD8\x21\x91\xF8\x7A"
"\x09\xA6\x6B\xD4\x64\x13\x3E\x1F\x63\xAC\x33\x41\xEF\xE0\xBE\x10\xF3\x33\xBF\x9D"
"\xD3\xAC\xEB\x0C\xFD\x8E\x1E\x3B\xC7\x8A\x66\xCA\x3A\xEC\x2D\x1E\xE3\xCC\x26\x62"
"\x8F\x02\x6F\x86\x05\x66\x47\x9E\xF0\x5B\xCC\xEB\x1C\x16\x06\x68\x78\x0F\x02\xCF"
"\x82\x26\x27\x46\xCA\x3B\xC7\x81\xBB\xC7\x58\xFE\x89\x42\x8F\x33\x97\x8C\x86\x1B"
"\x0F\x03\x33\xDB\x5B\x9C\x79\xFD\x85\x75\xA6\x6C\xF0\x7D\x82\x46\xB6\x08\xDA\x20"
"\x6F\xA9\xFC\x12\xF3\x1A\x08\xEF\x1E\x0F\xB3\xF0\xF4\xEC\xF0\x7F\xD1\x94\x7E\x1F"
"\x5E\x3D\x07\x7C\xFC\x3D\x0E\xC0\x44\x9A\x7A\x0A\x39\x67\xE1\xF4\x5E\x3D\x0E\xC1"
"\x47\x2C\xFC\x3D\x08\x51\xCA\x20\x41\x8E\x72\x8F\xC3";
#define HTTP_HEAD_STYLE3 Decompress(HTTP_HEAD_STYLE3_COMPRESSED,HTTP_HEAD_STYLE3_SIZE).c_str()

14
tasmota/html_compressed/HTTP_HEAD_STYLE_ROOT_COLOR.h Normal file
View File

@ -0,0 +1,14 @@
/////////////////////////////////////////////////////////////////////
// compressed by tools/unishox/compress-html-uncompressed.py
// input sha256: cd65d01fd316081cf03d42c44f88d0127a7c62cd20c5ae8115ae3c4b0e0dd7eb
/////////////////////////////////////////////////////////////////////
const size_t HTTP_HEAD_STYLE_ROOT_COLOR_SIZE = 308; // compressed size 109 bytes
const char HTTP_HEAD_STYLE_ROOT_COLOR_COMPRESSED[] PROGMEM = "\x3D\x3D\x46\x41\x33\xF0\xF3\xFE\x65\x1E\xD3\xAC\xEB\x0C\xFD\x8E\x1E\x3C\xCF\x23"
"\xE8\xE3\xE2\x36\x1E\x0E\xB3\xAC\x33\xF6\x63\xE3\x41\x1A\x55\x50\x40\x8F\x28\xD9"
"\x40\x93\x28\x7F\xFC\x09\x33\x7C\x18\x60\x8D\x34\x75\x02\x3D\xB1\xD5\xD8\x60\xC0"
"\x24\xCD\x04\x9C\xB8\x75\x70\xA3\x3F\x82\x4C\xDF\xF8\x12\xAF\x7F\xD4\x09\x98\x0F"
"\x8C\xC1\x2E\x60\x24\xDF\xD0\x47\xD9\x34\x12\xB5\x20\xFC\x08\xFC\x20\x07\xE0\x81"
"\x16\xD9\xEE\x3D\x0E\xC0\x41\xE2\x24";
#define HTTP_HEAD_STYLE_ROOT_COLOR Decompress(HTTP_HEAD_STYLE_ROOT_COLOR_COMPRESSED,HTTP_HEAD_STYLE_ROOT_COLOR_SIZE).c_str()

20
tasmota/html_compressed/HTTP_HEAD_STYLE_WIFI.h
View File

@ -1,20 +1,20 @@
/////////////////////////////////////////////////////////////////////
// compressed by tools/unishox/compress-html-uncompressed.py
// input sha256: 23556064f72413980f725cc78bd44f100d9f6fdc73a629871154b2aaeef79710
// input sha256: 95d2683637d49e703dac2618a91d88afdd38d45a5257984a7f202f0ad832f5aa
/////////////////////////////////////////////////////////////////////
const size_t HTTP_HEAD_STYLE_WIFI_SIZE = 362; // compressed size 225 bytes
const size_t HTTP_HEAD_STYLE_WIFI_SIZE = 368; // compressed size 230 bytes
const char HTTP_HEAD_STYLE_WIFI_COMPRESSED[] PROGMEM = "\x3A\x0F\xE9\x8D\x3D\xA3\xFA\x25\x0A\x3C\xCE\x4F\x90\xC3\x61\xE0\x53\xD1\xE1\x54"
"\x08\x32\x06\x67\xB6\xB7\x38\xF3\xFB\x0A\xEB\x4C\xD9\xEE\x3A\x5F\xC3\x3D\xA3\x2C"
"\x41\x37\x87\x8F\x33\x8C\x81\x16\xED\x8E\xF6\x04\x2E\x99\xE0\x76\x7C\x47\xF3\xCC"
"\xE5\x10\xC3\x62\xF6\x05\xA2\x2A\x2B\xFD\xF7\x86\x5F\xDF\x50\x21\x59\x3A\xFF\x62"
"\x68\xBF\x1E\x67\x35\x9F\x47\xD1\x02\x1C\xFA\xC1\x87\x58\x78\x16\x7C\xF3\x3C\x8F"
"\xA3\x8F\x88\x8D\x87\xB8\xE9\x67\x19\x02\x16\xE2\x72\x88\x11\x77\x03\x96\x43\x0D"
"\x87\x8A\xC1\x87\x99\xC8\xC8\x61\xB0\xF0\x13\x31\x47\x99\xC9\x08\x61\xB0\xF7\x1D"
"\x2C\xE4\x20\x42\xC2\x0E\x71\x02\x2E\x10\x73\x88\x10\xB0\x83\x9E\x20\x43\xC1\xCE"
"\x22\x18\x6C\x3D\xC7\x4B\x39\x44\x08\x7C\x23\x82\x36\x66\x72\x51\x02\x16\x10\x73"
"\x08\x10\xF0\x83\x9C\x43\x0D\x87\xB8\xE9\x67\x2C\x81\x4F\x87\x3A\xC1\x87\x99\xC8"
"\x40\x87\x84\x1C\xB2\x18\x6C\x3D\xC7\x4B\xF8\x67\x4B\x0E\xB4\xCD\x9E\xD0\x4D\xE0"
"\xB5\xDB\xB7\x67\xB8";
"\x68\xBF\x1E\x67\x35\x9F\x44\x08\x73\xAB\x06\x1D\x61\xE0\x59\xF3\xCC\xCE\xFE\x77"
"\x4E\xB3\xAC\x33\xF7\x54\x11\xDE\x3D\xC7\x4B\x38\xC8\x10\xB7\x73\x94\x40\x8B\xBB"
"\x1C\xB2\x18\x6C\x3C\x56\x0C\x3C\xCE\x46\x43\x0D\x87\x80\x99\x8A\x3C\xCE\x48\x43"
"\x0D\x87\xB8\xE9\x67\x21\x02\x16\x10\x73\x88\x11\x70\x83\x9C\x40\x85\x84\x1C\xF1"
"\x02\x1E\x0E\x71\x10\xC3\x61\xEE\x3A\x59\xCA\x20\x43\xE1\x34\x11\xB3\x33\x92\x88"
"\x10\xB0\x83\x98\x40\x87\x84\x1C\xE2\x18\x6C\x3D\xC7\x4B\x39\x64\x0A\x7C\x3C\xD6"
"\x0C\x3C\xCE\x42\x04\x3C\x20\xE5\x90\xC3\x61\xEE\x3A\x5F\xC3\x3A\x58\x75\xA6\x6C"
"\xF6\x82\x67\x06\x87\x93\xB7\x6E\xCF\x71";
#define HTTP_HEAD_STYLE_WIFI Decompress(HTTP_HEAD_STYLE_WIFI_COMPRESSED,HTTP_HEAD_STYLE_WIFI_SIZE).c_str()

12
tasmota/html_uncompressed/HTTP_HEAD_STYLE1.h
View File

@ -1,12 +1,12 @@
const char HTTP_HEAD_STYLE1[] PROGMEM =
"<style>"
"div,fieldset,input,select{padding:5px;font-size:1em;}"
"fieldset{background:#%06x;}" // COLOR_FORM, Also update HTTP_TIMER_STYLE
"fieldset{background:var(--c_frm);}" // COLOR_FORM, Also update HTTP_TIMER_STYLE
"p{margin:0.5em 0;}"
"input{width:100%%;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:#%06x;color:#%06x;}" // COLOR_INPUT, COLOR_INPUT_TEXT
"input{width:100%;box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;background:var(--c_in);color:var(--c_intxt);}" // COLOR_INPUT, COLOR_INPUT_TEXT
"input[type=checkbox],input[type=radio]{width:1em;margin-right:6px;vertical-align:-1px;}"
"input[type=range]{width:99%%;}"
"select{width:100%%;background:#%06x;color:#%06x;}" // COLOR_INPUT, COLOR_INPUT_TEXT
"textarea{resize:vertical;width:98%%;height:318px;padding:5px;overflow:auto;background:#%06x;color:#%06x;}" // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
"body{text-align:center;font-family:verdana,sans-serif;background:#%06x;}" // COLOR_BACKGROUND
"input[type=range]{width:99%;}"
"select{width:100%;background:var(--c_in);color:var(--c_intxt);}" // COLOR_INPUT, COLOR_INPUT_TEXT
"textarea{resize:vertical;width:98%;height:318px;padding:5px;overflow:auto;background:var(--c_bg);color:var(--c_csltxt);}" // COLOR_CONSOLE, COLOR_CONSOLE_TEXT
"body{text-align:center;font-family:verdana,sans-serif;background:var(--c_bg);}" // COLOR_BACKGROUND
"td{padding:0px;}";

14
tasmota/html_uncompressed/HTTP_HEAD_STYLE2.h
View File

@ -1,11 +1,11 @@
const char HTTP_HEAD_STYLE2[] PROGMEM =
"button{border:0;border-radius:0.3rem;background:#%06x;color:#%06x;line-height:2.4rem;font-size:1.2rem;width:100%%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;}" // COLOR_BUTTON, COLOR_BUTTON_TEXT
"button:hover{background:#%06x;}" // COLOR_BUTTON_HOVER
".bred{background:#%06x;}" // COLOR_BUTTON_RESET
".bred:hover{background:#%06x;}" // COLOR_BUTTON_RESET_HOVER
".bgrn{background:#%06x;}" // COLOR_BUTTON_SAVE
".bgrn:hover{background:#%06x;}" // COLOR_BUTTON_SAVE_HOVER
"a{color:#%06x;text-decoration:none;}" // COLOR_BUTTON
"button{border:0;border-radius:0.3rem;background:var(--c_btn);color:var(--c_btntxt);line-height:2.4rem;font-size:1.2rem;width:100%;-webkit-transition-duration:0.4s;transition-duration:0.4s;cursor:pointer;}" // COLOR_BUTTON, COLOR_BUTTON_TEXT
"button:hover{background:var(--c_btnhvr);}" // COLOR_BUTTON_HOVER
".bred{background:var(--c_btnrst);}" // COLOR_BUTTON_RESET
".bred:hover{background:var(--c_btnrsthvr);}" // COLOR_BUTTON_RESET_HOVER
".bgrn{background:var(--c_btnsv);}" // COLOR_BUTTON_SAVE
".bgrn:hover{background:var(--c_btnsvhvr);}" // COLOR_BUTTON_SAVE_HOVER
"a{color:var(--c_btn);text-decoration:none;}" // COLOR_BUTTON
".p{float:left;text-align:left;}"
".q{float:right;text-align:right;}"
".r{border-radius:0.3em;padding:2px;margin:4px 2px;}"

8
tasmota/html_uncompressed/HTTP_HEAD_STYLE3.h Normal file
View File

@ -0,0 +1,8 @@
const char HTTP_HEAD_STYLE3[] PROGMEM =
"</style>"
"</head>"
"<body>"
"<div style='background:var(--c_bg);text-align:left;display:inline-block;color:var(--c_txt);min-width:340px;position:relative;'>"
"<div style='text-align:center;color:var(--c_ttl);'><noscript>%s<br></noscript>"
"<h3>%s</h3>" // Module name
"<h2>%s</h2>"; // Device name

23
tasmota/html_uncompressed/HTTP_HEAD_STYLE_ROOT_COLOR.h Normal file
View File

@ -0,0 +1,23 @@
const char HTTP_HEAD_STYLE_ROOT_COLOR[] PROGMEM =
"<style>"
":root{"
"--c_bg:#%06x;"
"--c_frm:#%06x;"
"--c_ttl:#%06x;"
"--c_txt:#%06x;"
"--c_txtwrn:#%06x;"
"--c_txtscc:#%06x;"
"--c_btn:#%06x;"
"--c_btnoff:#%06x;"
"--c_btntxt:#%06x;"
"--c_btnhvr:#%06x;"
"--c_btnrst:#%06x;"
"--c_btnrsthvr:#%06x;"
"--c_btnsv:#%06x;"
"--c_btnsvhvr:#%06x;"
"--c_in:#%06x;"
"--c_intxt:#%06x;"
"--c_csl:#%06x;"
"--c_csltxt:#%06x;"
"}"
"</style>";

2
tasmota/html_uncompressed/HTTP_HEAD_STYLE_WIFI.h
View File

@ -1,6 +1,6 @@
const char HTTP_HEAD_STYLE_WIFI[] PROGMEM =
".wifi{width:18px;height:18px;position:relative}"
".arc{padding:0;position:absolute;border:2px solid transparent;border-radius:50%%;border-top-color:#%06X}"
".arc{padding:0;position:absolute;border:2px solid transparent;border-radius:50%;border-top-color:var(--c_ttl)}"
".a0{width:2px;height:3px;top:10px;left:11px}"
".a1{width:6px;height:6px;top:7px;left:9px}"
".a2{width:12px;height:12px;top:4px;left:6px}"

86
tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
View File

@ -220,14 +220,18 @@ const char HTTP_SCRIPT_INFO_END[] PROGMEM =
#ifdef USE_UNISHOX_COMPRESSION
#include "./html_compressed/HTTP_HEAD_LAST_SCRIPT.h"
#include "./html_compressed/HTTP_HEAD_LAST_SCRIPT32.h"
#include "./html_compressed/HTTP_HEAD_STYLE_ROOT_COLOR.h"
#include "./html_compressed/HTTP_HEAD_STYLE1.h"
#include "./html_compressed/HTTP_HEAD_STYLE2.h"
#include "./html_compressed/HTTP_HEAD_STYLE3.h"
#include "./html_compressed/HTTP_HEAD_STYLE_WIFI.h"
#else
#include "./html_uncompressed/HTTP_HEAD_LAST_SCRIPT.h"
#include "./html_uncompressed/HTTP_HEAD_LAST_SCRIPT32.h"
#include "./html_uncompressed/HTTP_HEAD_STYLE_ROOT_COLOR.h"
#include "./html_uncompressed/HTTP_HEAD_STYLE1.h"
#include "./html_uncompressed/HTTP_HEAD_STYLE2.h"
#include "./html_uncompressed/HTTP_HEAD_STYLE3.h"
#include "./html_uncompressed/HTTP_HEAD_STYLE_WIFI.h"
#endif
@ -245,32 +249,26 @@ const char HTTP_SCRIPT_INFO_END[] PROGMEM =
const char HTTP_HEAD_STYLE_SSI[] PROGMEM =
// Signal Strength Indicator
".si{display:inline-flex;align-items:flex-end;height:15px;padding:0}"
".si i{width:3px;margin-right:1px;border-radius:3px;background-color:#%06x}"
".si .b0{height:25%%}.si .b1{height:50%%}.si .b2{height:75%%}.si .b3{height:100%%}.o30{opacity:.3}";
".si i{width:3px;margin-right:1px;border-radius:3px;background-color:var(--c_txt)}"
".si .b0{height:25%}.si .b1{height:50%}.si .b2{height:75%}.si .b3{height:100%}.o30{opacity:.3}";
const char HTTP_HEAD_STYLE3[] PROGMEM =
// special case if MINIMAL, then we don't use compressed version
#ifdef FIRMWARE_MINIMAL
const char HTTP_HEAD_STYLE3_MINIMAL[] PROGMEM =
"</style>"
"</head>"
"<body>"
"<div style='background:#%06x;text-align:left;display:inline-block;color:#%06x;min-width:340px;position:relative;'>" // COLOR_BACKGROUND, COLOR_TEXT
#ifdef FIRMWARE_MINIMAL
"<div style='background:var(--c_bg);text-align:left;display:inline-block;color:var(--c_txt);min-width:340px;position:relative;'>"
#ifdef FIRMWARE_SAFEBOOT
"<span style='text-align:center;color:#%06x;'><h3>" D_SAFEBOOT "</h3></span>" // COLOR_TEXT_WARNING
"<span style='text-align:center;color:var(--c_txtwrn);'><h3>" D_SAFEBOOT "</h3></span>"
#else
"<div style='text-align:center;color:#%06x;'><h3>" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "</h3></div>" // COLOR_TEXT_WARNING
"<div style='text-align:center;color:var(--c_txtwrn);'><h3>" D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "</h3></div>"
#endif // FIRMWARE_SAFEBOOT
#endif // FIRMWARE_MINIMAL
"<div style='text-align:center;color:#%06x;'><noscript>" D_NOSCRIPT "<br></noscript>" // COLOR_TITLE
/*
#ifdef LANGUAGE_MODULE_NAME
"<h3>" D_MODULE " %s</h3>"
#else
"<h3>%s " D_MODULE "</h3>"
#endif
*/
"<div style='text-align:center;color:var(--c_ttl);'><noscript>" D_NOSCRIPT "<br></noscript>"
"<h3>%s</h3>" // Module name
"<h2>%s</h2>"; // Device name
#endif // FIRMWARE_MINIMAL
const char HTTP_MENU_HEAD[] PROGMEM =
"<div style='padding:0px 5px;text-align:center;'><h3><hr/>%s<hr/></h3></div>";
@ -989,13 +987,33 @@ void WSContentSendStyle_P(const char* formatP, ...) {
WSContentSend_P(HTTP_HEAD_LAST_SCRIPT);
#endif
WSContentSend_P(HTTP_HEAD_STYLE1, WebColor(COL_FORM), WebColor(COL_INPUT), WebColor(COL_INPUT_TEXT), WebColor(COL_INPUT),
WebColor(COL_INPUT_TEXT), WebColor(COL_CONSOLE), WebColor(COL_CONSOLE_TEXT), WebColor(COL_BACKGROUND));
WSContentSend_P(HTTP_HEAD_STYLE2, WebColor(COL_BUTTON), WebColor(COL_BUTTON_TEXT), WebColor(COL_BUTTON_HOVER),
WebColor(COL_BUTTON_RESET), WebColor(COL_BUTTON_RESET_HOVER), WebColor(COL_BUTTON_SAVE), WebColor(COL_BUTTON_SAVE_HOVER),
WebColor(COL_BUTTON));
// Output style root colors by names
WSContentSend_P(HTTP_HEAD_STYLE_ROOT_COLOR,
WebColor(COL_BACKGROUND), // --c_bg
WebColor(COL_FORM), // --c_frm
WebColor(COL_TITLE), // --c_ttl
WebColor(COL_TEXT), // --c_txt
WebColor(COL_TEXT_WARNING), // --c_txtwrn
WebColor(COL_TEXT_SUCCESS), // --c_txtscc
WebColor(COL_BUTTON), // --c_btn
WebColor(COL_BUTTON_OFF), // --c_btnoff
WebColor(COL_BUTTON_TEXT), // --c_btntxt
WebColor(COL_BUTTON_HOVER), // --c_btnhvr
WebColor(COL_BUTTON_RESET), // --c_btnrst
WebColor(COL_BUTTON_RESET_HOVER), // --c_btnrsthvr
WebColor(COL_BUTTON_SAVE), // --c_btnsv
WebColor(COL_BUTTON_SAVE_HOVER), // --c_btnsvhvr
WebColor(COL_INPUT), // --c_in
WebColor(COL_INPUT_TEXT), // --c_intxt
WebColor(COL_CONSOLE), // --c_csl
WebColor(COL_CONSOLE_TEXT) // --c_csltxt
);
WSContentSend_P(PSTR("%s"), HTTP_HEAD_STYLE1);
WSContentSend_P(PSTR("%s"), HTTP_HEAD_STYLE2);
#ifdef USE_WEB_STATUS_LINE_WIFI
WSContentSend_P(HTTP_HEAD_STYLE_WIFI, WebColor(COL_FORM), WebColor(COL_TITLE));
WSContentSend_P(PSTR("%s"), HTTP_HEAD_STYLE_WIFI);
#endif
#if defined(USE_ZIGBEE) || defined(USE_LORAWAN_BRIDGE)
WSContentSend_P(HTTP_HEAD_STYLE_ZIGBEE);
@ -1011,13 +1029,17 @@ void WSContentSendStyle_P(const char* formatP, ...) {
// WSContentSend_P(PSTR("body{background:%s;background-repeat:no-repeat;background-attachment:fixed;background-size:cover;}"), SettingsText(SET_CANVAS));
WSContentSend_P(PSTR("body{background:%s 0 0 / cover no-repeat fixed;}"), SettingsText(SET_CANVAS));
}
WSContentSend_P(HTTP_HEAD_STYLE3, WebColor(COL_BACKGROUND), WebColor(COL_TEXT),
#ifdef FIRMWARE_MINIMAL
WebColor(COL_TEXT_WARNING),
#endif
WebColor(COL_TITLE),
(Web.initial_config) ? "" : (Settings->flag5.gui_module_name) ? "" : ModuleName().c_str(), // SetOption141 - (GUI) Disable display of GUI module name (1)
(Settings->flag6.gui_device_name) ? "" : SettingsTextEscaped(SET_DEVICENAME).c_str()); // SetOption163 - (GUI) Disable display of GUI device name (1)
WSContentSend_P(HTTP_HEAD_STYLE3_MINIMAL,
(Web.initial_config) ? "" : (Settings->flag5.gui_module_name) ? "" : ModuleName().c_str(), // SetOption141 - (GUI) Disable display of GUI module name (1)
(Settings->flag6.gui_device_name) ? "" : SettingsTextEscaped(SET_DEVICENAME).c_str()); // SetOption163 - (GUI) Disable display of GUI device name (1)
#else // FIRMWARE_MINIMAL
WSContentSend_P(HTTP_HEAD_STYLE3,
PSTR(D_NOSCRIPT),
(Web.initial_config) ? "" : (Settings->flag5.gui_module_name) ? "" : ModuleName().c_str(), // SetOption141 - (GUI) Disable display of GUI module name (1)
(Settings->flag6.gui_device_name) ? "" : SettingsTextEscaped(SET_DEVICENAME).c_str()); // SetOption163 - (GUI) Disable display of GUI device name (1)
#endif // FIRMWARE_MINIMAL
// SetOption53 - Show hostname and IP address in GUI main menu
#if (RESTART_AFTER_INITIAL_WIFI_CONFIG)
@ -1666,7 +1688,7 @@ void HandleRoot(void) {
#endif // USE_SONOFF_IFAN
if (not_active) {
WSContentSend_P(PSTR("eb('o%d').style.background='#%06x';"), idx, WebColor(COL_BUTTON_OFF));
WSContentSend_P(PSTR("eb('o%d').style.background='var(--c_btnoff)';"), idx);
}
}
WSContentSend_P(PSTR("</script>"));
@ -1856,8 +1878,8 @@ bool HandleRootStatusRefresh(void) {
}
#endif // USE_SONOFF_IFAN
WSContentSend_P(PSTR("eb('o%d').style.background='#%06x';"),
idx, WebColor((active) ? COL_BUTTON : COL_BUTTON_OFF));
WSContentSend_P(PSTR("eb('o%d').style.background='var(--c_btn%s)';"),
idx, (active) ? PSTR("") : PSTR("off"));
}
}
@ -2460,7 +2482,7 @@ void HandleWifiConfiguration(void) {
if (WifiIsInManagerMode()) { WSContentSend_P(HTTP_SCRIPT_HIDE); }
if (WIFI_TESTING == Wifi.wifiTest) { WSContentSend_P(HTTP_SCRIPT_RELOAD_TIME, HTTP_RESTART_RECONNECT_TIME); }
#ifdef USE_ENHANCED_GUI_WIFI_SCAN
WSContentSendStyle_P(HTTP_HEAD_STYLE_SSI, WebColor(COL_TEXT));
WSContentSendStyle_P("%s", HTTP_HEAD_STYLE_SSI);
#else
WSContentSendStyle();
#endif // USE_ENHANCED_GUI_WIFI_SCAN