resolve conflivt
This commit is contained in:
committed by
github-actions[bot]
parent
2f5a50d778
commit
0d8498b82b
@@ -436,6 +436,8 @@ parse_config:
|
||||
RCMD: $$mdi:apple-keyboard-command$$
|
||||
RGUI: $$mdi:apple-keyboard-command$$
|
||||
LS(LC(LALT)): $$mdi:triangle$$ # Meh
|
||||
lower_layer: ⇣
|
||||
raise_layer: ⇡
|
||||
|
||||
# Arrows
|
||||
UP: $$mdi:arrow-up-bold$$
|
||||
@@ -451,6 +453,7 @@ parse_config:
|
||||
BSPC: $$mdi:backspace$$
|
||||
RET: $$mdi:keyboard-return$$
|
||||
DEL: $$mdi:backspace-reverse-outline$$
|
||||
DELETE: $$mdi:backspace-reverse-outline$$
|
||||
INS: Insert
|
||||
HOME: Home
|
||||
END: End
|
||||
@@ -573,4 +576,5 @@ parse_config:
|
||||
combo_slsh:
|
||||
draw_separate: true
|
||||
zmk_preamble: "#define KEYMAP_DRAWER"
|
||||
zmk_additional_includes: []
|
||||
zmk_additional_includes: []
|
||||
|
||||
|
||||
@@ -27,6 +27,9 @@
|
||||
<svg id="mdi:backspace-outline">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-outline" viewBox="0 0 24 24"><path d="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5H7L2.28,12L7,19H22V5Z" /></svg>
|
||||
</svg>
|
||||
<svg id="mdi:backspace-reverse-outline">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-reverse-outline" viewBox="0 0 24 24"><path d="M5,15.59L6.41,17L10,13.41L13.59,17L15,15.59L11.41,12L15,8.41L13.59,7L10,10.59L6.41,7L5,8.41L8.59,12L5,15.59M2,3A2,2 0 0,0 0,5V19A2,2 0 0,0 2,21H17C17.69,21 18.23,20.64 18.59,20.11L24,12L18.59,3.88C18.23,3.35 17.69,3 17,3H2M2,5H17L21.72,12L17,19H2V5Z" /></svg>
|
||||
</svg>
|
||||
<svg id="mdi:keyboard-esc">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-esc" viewBox="0 0 24 24"><path d="M1 7H7V9H3V11H7V13H3V15H7V17H1V7M11 7H15V9H11V11H13C14.11 11 15 11.9 15 13V15C15 16.11 14.11 17 13 17H9V15H13V13H11C9.9 13 9 12.11 9 11V9C9 7.9 9.9 7 11 7M19 7H21C22.11 7 23 7.9 23 9V10H21V9H19V15H21V14H23V15C23 16.11 22.11 17 21 17H19C17.9 17 17 16.11 17 15V9C17 7.9 17.9 7 19 7Z" /></svg>
|
||||
</svg>
|
||||
@@ -495,7 +498,7 @@ rect.held, rect.combo.held {
|
||||
</g>
|
||||
<g transform="translate(812, 49)" class="key keypos-11">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<text x="0" y="0" class="key tap">DELETE</text>
|
||||
<use href="#mdi:backspace-reverse-outline" xlink:href="#mdi:backspace-reverse-outline" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:backspace-reverse-outline"/>
|
||||
</g>
|
||||
<g transform="translate(28, 105)" class="key keypos-12">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
@@ -662,7 +665,7 @@ rect.held, rect.combo.held {
|
||||
</g>
|
||||
<g transform="translate(812, 49)" class="key keypos-11">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<text x="0" y="0" class="key tap">DELETE</text>
|
||||
<use href="#mdi:backspace-reverse-outline" xlink:href="#mdi:backspace-reverse-outline" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:backspace-reverse-outline"/>
|
||||
</g>
|
||||
<g transform="translate(28, 105)" class="key keypos-12">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
@@ -15,7 +15,7 @@ layers:
|
||||
- '8'
|
||||
- '9'
|
||||
- '0'
|
||||
- DELETE
|
||||
- $$mdi:backspace-reverse-outline$$
|
||||
- $$mdi:apple-keyboard-control$$
|
||||
- ''
|
||||
- ''
|
||||
@@ -58,7 +58,7 @@ layers:
|
||||
- '*'
|
||||
- +
|
||||
- '='
|
||||
- DELETE
|
||||
- $$mdi:backspace-reverse-outline$$
|
||||
- $$mdi:apple-keyboard-control$$
|
||||
- '`'
|
||||
- '~'
|
||||
|
||||
Reference in New Issue
Block a user