Merge remote-tracking branch 'upstream/master'

This commit is contained in:
2025-08-11 21:30:42 -04:00
3 changed files with 6 additions and 6 deletions

View File

@@ -10,13 +10,13 @@ CONFIG_EC11=y
CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
# Uncomment this line below to add rgb underglow / backlight support
CONFIG_ZMK_RGB_UNDERGLOW=y
#CONFIG_ZMK_RGB_UNDERGLOW=y
# Uncomment the line below to disable external power toggling by the underglow.
# By default toggling the underglow on and off also toggles external power
# on and off. This also causes the display to turn off.
CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER=n
CONFIG_ZMK_STUDIO_LOCKING=n
CONFIG_NICE_OLED_GEM_WPM_FIXED_RANGE=n
# Deactivate numlock behavior
CONFIG_NICE_OLED_WIDGET_HID_INDICATORS=n

View File

@@ -599,9 +599,9 @@ path.combo {
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans"/>
<text x="0" y="0" class="key trans tap"></text>
</g>
<g transform="translate(140, 259)" class="key trans keypos-50">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans"/>
<text x="0" y="0" class="key trans tap"></text>
<g transform="translate(140, 259)" class="key keypos-50">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
<text x="0" y="0" class="key tap"><tspan style="font-size: 64%">&amp;studio_un…</tspan></text>
</g>
<g transform="translate(196, 252)" class="key trans keypos-51">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key trans"/>

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View File

@@ -112,7 +112,7 @@ layers:
- ':'
- \
- {t: ▽, type: trans}
- {t: ▽, type: trans}
- '&studio_unlock'
- {t: ▽, type: trans}
- {t: ▽, type: trans}
- {type: held}