Merge branch 'placeholder-buttons' into 'main'

Add placeholder-buttons to emoji-layout

See merge request World/Phosh/squeekboard!636
This commit is contained in:
Marge Bot
2024-04-10 15:10:39 +00:00
4 changed files with 30 additions and 4 deletions

View File

@ -1,11 +1,12 @@
--- ---
outlines: outlines:
default: { width: 52, height: 52 } default: { width: 52, height: 52 }
placeholder: { width: 52, height: 52 }
special: { width: 52, height: 52 } special: { width: 52, height: 52 }
change-view: { width: 52, height: 52 } change-view: { width: 52, height: 52 }
change-view-2: { width: 36.4, height: 56 } change-view-2: { width: 36.4, height: 56 }
emoji-group: { width: 52, height: 52 } emoji-group: { width: 52, height: 52 }
infobar: { width: 260, height: 52 } placeholder-2: { width: 260, height: 52 }
views: views:
base: base:
@ -854,10 +855,11 @@ buttons:
icon: "edit-clear-symbolic" icon: "edit-clear-symbolic"
keysym: BackSpace keysym: BackSpace
InfoBar: InfoBar:
outline: "infobar" outline: "placeholder-2"
text: "" text: ""
label: "🧘 + 🏾 = 🧘🏾" label: "🧘 + 🏾 = 🧘🏾"
0: 0:
outline: "placeholder"
text: "" text: ""
label: "" label: ""
1: 1:

View File

@ -1,11 +1,12 @@
--- ---
outlines: outlines:
default: { width: 104, height: 52 } default: { width: 104, height: 52 }
placeholder: { width: 104, height: 52 }
special: { width: 104, height: 52 } special: { width: 104, height: 52 }
change-view: { width: 104, height: 52 } change-view: { width: 104, height: 52 }
change-view-2: { width: 72.8, height: 56 } change-view-2: { width: 72.8, height: 56 }
emoji-group: { width: 104, height: 52 } emoji-group: { width: 104, height: 52 }
infobar: { width: 520, height: 52 } placeholder-2: { width: 520, height: 52 }
views: views:
base: base:
@ -854,10 +855,11 @@ buttons:
icon: "edit-clear-symbolic" icon: "edit-clear-symbolic"
keysym: BackSpace keysym: BackSpace
InfoBar: InfoBar:
outline: "infobar" outline: "placeholder-2"
text: "" text: ""
label: "🧘 + 🏾 = 🧘🏾" label: "🧘 + 🏾 = 🧘🏾"
0: 0:
outline: "placeholder"
text: "" text: ""
label: "" label: ""
1: 1:

View File

@ -43,6 +43,17 @@ sq_button.change-view-2:active {
border-color: alpha(white, 0.5); border-color: alpha(white, 0.5);
} }
sq_button.placeholder,
sq_button.placeholder-2 {
background: #171618;
}
sq_button.placeholder:active,
sq_button.placeholder-2:active {
background: initial;
box-shadow: initial;
}
sq_button.altline, sq_button.altline,
sq_button.special, sq_button.special,
sq_button.wide { sq_button.wide {

View File

@ -44,6 +44,17 @@ sq_button.change-view-2:active {
border-color: alpha(@theme_fg_color, 0.275); border-color: alpha(@theme_fg_color, 0.275);
} }
sq_button.placeholder,
sq_button.placeholder-2 {
background: alpha(@theme_fg_color, 0.035);
}
sq_button.placeholder:active,
sq_button.placeholder-2:active {
background: initial;
box-shadow: initial;
}
sq_button.altline, sq_button.altline,
sq_button.special, sq_button.special,
sq_button.wide { sq_button.wide {