resolve conflivt
This commit is contained in:
committed by
github-actions[bot]
parent
d801899376
commit
959d83bd6d
@@ -436,8 +436,13 @@ parse_config:
|
||||
RCMD: $$mdi:apple-keyboard-command$$
|
||||
RGUI: $$mdi:apple-keyboard-command$$
|
||||
LS(LC(LALT)): $$mdi:triangle$$ # Meh
|
||||
LOWER: ⇣
|
||||
RAISE: ⇡
|
||||
|
||||
RC(RS(TAB)): "↤"
|
||||
RC(TAB): "↦"
|
||||
LG(LS(J)): "✢"
|
||||
LG(LA(SPACE)): "‡"
|
||||
LOWER: "⤓"
|
||||
RAISE: "⤒"
|
||||
|
||||
# Arrows
|
||||
UP: $$mdi:arrow-up-bold$$
|
||||
|
||||
@@ -512,17 +512,15 @@ rect.held, rect.combo.held {
|
||||
</g>
|
||||
<g transform="translate(196, 84)" class="key keypos-15">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<use href="#mdi:keyboard-tab" xlink:href="#mdi:keyboard-tab" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:keyboard-tab"/>
|
||||
<text x="0" y="0" class="key tap">↤</text>
|
||||
</g>
|
||||
<g transform="translate(252, 91)" class="key keypos-16">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<use href="#mdi:keyboard-tab" xlink:href="#mdi:keyboard-tab" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:keyboard-tab"/>
|
||||
<text x="0" y="0" class="key tap">↦</text>
|
||||
</g>
|
||||
<g transform="translate(308, 98)" class="key keypos-17">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<text x="0" y="0" class="key tap">
|
||||
<tspan x="0" dy="-0.6em">Gui+</tspan><tspan x="0" dy="1.2em">Sft+J</tspan>
|
||||
</text>
|
||||
<text x="0" y="0" class="key tap">✢</text>
|
||||
</g>
|
||||
<g transform="translate(532, 98)" class="key keypos-18">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
@@ -565,7 +563,7 @@ rect.held, rect.combo.held {
|
||||
</g>
|
||||
<g transform="translate(308, 154)" class="key keypos-29">
|
||||
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
|
||||
<use href="#mdi:keyboard-space" xlink:href="#mdi:keyboard-space" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:keyboard-space"/>
|
||||
<text x="0" y="0" class="key tap">‡</text>
|
||||
</g>
|
||||
<g transform="translate(532, 154)" class="key keypos-30">
|
||||
<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 |
@@ -19,9 +19,9 @@ layers:
|
||||
- $$mdi:apple-keyboard-control$$
|
||||
- ''
|
||||
- ''
|
||||
- Ctl+Sft+$$mdi:keyboard-tab$$
|
||||
- Ctl+$$mdi:keyboard-tab$$
|
||||
- Gui+Sft+J
|
||||
- ↤
|
||||
- ↦
|
||||
- ✢
|
||||
- $$mdi:arrow-left-bold$$
|
||||
- $$mdi:arrow-down-bold$$
|
||||
- $$mdi:arrow-up-bold$$
|
||||
@@ -33,7 +33,7 @@ layers:
|
||||
- ''
|
||||
- ''
|
||||
- ''
|
||||
- Gui+Alt+$$mdi:keyboard-space$$
|
||||
- ‡
|
||||
- $$mdi:volume-low$$
|
||||
- $$mdi:volume-high$$
|
||||
- ''
|
||||
|
||||
Reference in New Issue
Block a user