Fixed merge conflict

Author: makermelissa

.tool-versions

@@ -1 +1 @@
-ruby 3.4.2
+ruby 3.4.7

_board/waveshare_esp32_s3_touch_lcd_2_8.md

@@ -1,15 +1,13 @@
 ---
 layout: download
 board_id: "waveshare_esp32_s3_touch_lcd_2_8"
-title: "ESP32-S3-Touch-LCD-2.8 Download"
-name: "ESP32-S3-Touch-LCD-2.8"
+title: "ESP32S3-TOUCH-LCD-2.8 Download"
+name: "ESP32S3-TOUCH-LCD-2.8"
 manufacturer: "Waveshare"
 board_url:
  - "https://www.waveshare.com/esp32-s3-touch-lcd-2.8.htm"
 board_image: "waveshare_esp32_s3_touch_lcd_2_8.jpg"
-date_added: 2025-11-17
-bootloader_id: waveshare_esp32_s3_touch_lcd_2_8
-downloads_display: true
+date_added: 2025-10-29
 family: esp32s3
 features:
   - USB-C
@@ -19,16 +17,20 @@ features:
   - Bluetooth/BTLE
 ---
 
-This product is a microcontroller development board with 2.4GHz WiFi and Bluetooth BLE 5 support, integrates high-capacity Flash and PSRAM. Onboard 2.8inch LCD screen (optional for touch function) can smoothly run GUI programs such as LVGL. Combined with various peripheral interfaces, suitable for the quick development of the HMI and other ESP32-S3 applications.
+The ESP32-S3-Touch-LCD-2.8 is a microcontroller development board with 2.4GHz WiFi and Bluetooth BLE 5 support, integrates high-capacity Flash and PSRAM. Onboard 2.8inch touch LCD screen can smoothly run GUI programs. Combined with various peripheral interfaces, suitable for the quick development of the HMI and other ESP32-S3 applications.
 
-- Equipped with high-performance Xtensa 32-bit LX7 dual-core processor, up to 240MHz main frequency
-- Supports 2.4GHz Wi-Fi (802.11 b/g/n) and Bluetooth 5 (LE), with onboard antenna
-- Built-in 512KB SRAM and 384KB ROM, with onboard 16MB Flash and 8MB PSRAM
-- Onboard 2.8inch LCD display, 240×320 resolution, 262K color
-- Optional for capacitive touch function controlled via I2C interface, 5-point touch, with interrupt support
-- Adapting UART, I2C and some IO interfaces, integrates full-speed USB port
-- Onboard speaker, QMI8658 6-axis sensor, RTC sensor, TF card slot and battery recharge management module, etc.
-- Supports accurate control such as flexible clock and multiple power modes to realize low power consumption in different scenarios
+**Technical details**
+
+ - Equipped with high-performance Xtensa 32-bit LX7 dual-core processor, up to 240MHz main frequency
+ - Supports 2.4GHz Wi-Fi (802.11 b/g/n) and Bluetooth 5 (LE), with onboard antenna
+ - Built-in 512KB SRAM and 384KB ROM, with onboard 16MB Flash and 8MB PSRAM
+ - Onboard 2.8inch touch LCD display, 240×320 resolution, 262K color
+ - CST328 capacitive touch chip controlled via I2C interface, 5-point touch, with interrupt support
+ - Supports exapnsion via UART, I2C and some IO interfaces, integrates full-speed USB-C port
+ - Onboard speaker via I2S, QMI8658 6-axis sensor, RTC sensor, TF card slot and battery recharge management module, etc.
+ - Onboard 3.7V MX1.25 Lithium battery recharge/discharge header
 
 ## Purchase
+
 * [Waveshare](https://www.waveshare.com/esp32-s3-touch-lcd-2.8.htm)
+* [Amazon](https://www.amazon.com/dp/B0D8KKRV5V?ref=ppx_yo2ov_dt_b_fed_asin_title)

assets/images/boards/large/waveshare_esp32_s3_touch_lcd_2_8.jpg

@@ -124,6 +124,15 @@
       grid-column: main;
       display: grid;
       grid-template-columns: repeat(3, minmax(200px, 1fr));
+
+      .manufacturers {
+        contain: size;
+
+        fieldset {
+          height: 100%;
+          overflow-y: scroll;
+        }
+      }
     }
 
     h2 {
@@ -235,10 +244,6 @@
       }
     }
   }
-  .manufacturers ul {
-    max-height: 300px;
-    overflow-y: scroll;
-  }
 }
 
 @media (max-width: variables.$screen-md) {