From e36490c89e93c03ae9eab154451bc295935f7993 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Fri, 25 Nov 2022 16:37:54 +0100 Subject: [PATCH] resolve release merge conflicts --- sd-card/html/edit_config_param.html | 1005 ++++++++++++--------------- 1 file changed, 447 insertions(+), 558 deletions(-) diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index b84e4ae1..845331dd 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -9,65 +9,82 @@ h1 {font-size: 2em;} h2 {font-size: 1.5em; margin-block-start: 0.0em; margin-block-end: 0.2em;} h3 {font-size: 1.2em;} +h4 {font-size: 1em; margin-bottom: 0;} +h5 {font-size: 0.83em; margin-top: 0.2em; margin-bottom: 0;} + p {font-size: 1em;} +table { + border: 0pt; + border-collapse: collapse; +} + + +tr { + border-bottom: 1px solid lightgray; +} + +td { + padding: 10px; +} + .button { - padding: 5px 20px; + padding: 5px 20px; width: 211px; - font-size: 16px; + font-size: 16px; } textarea { - font-size: 14px; + font-size: 14px; } .description { - color: black; - font-size: 80%; + color: black; + font-size: 80%; } .disabled { - color:lightgrey; + color:lightgrey; } .smallSelect { - width: 30px; + width: 30px; } .invalid-input { - background-color: #FFAA00; + background-color: #FFAA00; } .hidden { - display: none; + display: none; } + +.expert { + background-color: #ffc5c5; +} + +.indent1 { + padding-left: 40px; +} + +.indent2 { + padding-left: 69px; +} + - - - - - -
-

Config.ini:

-
- - -
- -
- +

Configuration

+ + +