Merge branch 'targets' into 'master'
buttons: Buttons are next to each other, padding is visual only Closes #110 See merge request Librem5/squeekboard!209
This commit is contained in:
		@ -2,16 +2,15 @@
 | 
			
		||||
# University of the Aegean, Department of Mathematics, atsol@aegean.gr
 | 
			
		||||
# Sep 2019
 | 
			
		||||
---
 | 
			
		||||
row_spacing: 11.33
 | 
			
		||||
button_spacing: 4.67
 | 
			
		||||
 | 
			
		||||
bounds: { x: 0, y: 6.33, width: 426, height: 250 }
 | 
			
		||||
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 | 
			
		||||
 | 
			
		||||
outlines:
 | 
			
		||||
    default:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 32, height: 52 }
 | 
			
		||||
    altline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
 | 
			
		||||
    wide:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 62, height: 52 }
 | 
			
		||||
    outline7:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
 | 
			
		||||
    spaceline:
 | 
			
		||||
@ -22,7 +21,7 @@ views:
 | 
			
		||||
        - "; ς ε ρ τ υ θ ι ο π !"
 | 
			
		||||
        - "α σ δ φ γ η ξ κ λ show_accented"
 | 
			
		||||
        - "Shift_L ζ χ ψ ω β ν μ , BackSpace"
 | 
			
		||||
        - "show_numbers preferences space . Return"
 | 
			
		||||
        - "show_numbers preferences space period Return"
 | 
			
		||||
    upper:
 | 
			
		||||
        - ": EuroSign Ε Ρ Τ Υ Θ Ι Ο Π"
 | 
			
		||||
        - "Α Σ Δ Φ Γ Η Ξ Κ Λ show_accented"
 | 
			
		||||
@ -86,13 +85,13 @@ buttons:
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        label: "αι"
 | 
			
		||||
    period:
 | 
			
		||||
        outline: altline
 | 
			
		||||
        outline: "altline"
 | 
			
		||||
        label: "."
 | 
			
		||||
    space:
 | 
			
		||||
        outline: spaceline
 | 
			
		||||
        label: " "
 | 
			
		||||
    Return:
 | 
			
		||||
        outline: outline7
 | 
			
		||||
        outline: "wide"
 | 
			
		||||
        icon: "key-enter"
 | 
			
		||||
    aring:
 | 
			
		||||
        label: "å"
 | 
			
		||||
 | 
			
		||||
@ -1,20 +1,17 @@
 | 
			
		||||
---
 | 
			
		||||
row_spacing: 11.33
 | 
			
		||||
button_spacing: 4.67
 | 
			
		||||
 | 
			
		||||
bounds: { x: 0, y: 1, width: 360, height: 198 }
 | 
			
		||||
bounds: { x: 0, y: 1, width: 360, height: 210 }
 | 
			
		||||
 | 
			
		||||
outlines:
 | 
			
		||||
    default:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 30.67, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
 | 
			
		||||
    altline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 48, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
 | 
			
		||||
    wide:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 57.33, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 62, height: 52 }
 | 
			
		||||
    spaceline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 95.00, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
 | 
			
		||||
    special:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 39.33, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 44, height: 52 }
 | 
			
		||||
 | 
			
		||||
views:
 | 
			
		||||
    base:
 | 
			
		||||
@ -93,4 +90,4 @@ buttons:
 | 
			
		||||
    colon:
 | 
			
		||||
        label: ":"
 | 
			
		||||
    "\"":
 | 
			
		||||
        keysym: "quotedbl"
 | 
			
		||||
        keysym: "quotedbl"
 | 
			
		||||
 | 
			
		||||
@ -1,22 +1,19 @@
 | 
			
		||||
# Italian layout created by Antonio Pandolfo
 | 
			
		||||
# 03 october 2019
 | 
			
		||||
---
 | 
			
		||||
row_spacing: 11.33
 | 
			
		||||
button_spacing: 4.67
 | 
			
		||||
 | 
			
		||||
bounds: { x: 0, y: 1, width: 360, height: 198 }
 | 
			
		||||
bounds: { x: 0, y: 1, width: 360, height: 210 }
 | 
			
		||||
 | 
			
		||||
outlines:
 | 
			
		||||
    default:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 30.67, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
 | 
			
		||||
    altline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 48, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
 | 
			
		||||
    wide:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 57.33, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 62, height: 52 }
 | 
			
		||||
    spaceline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 95.00, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 99.67, height: 52 }
 | 
			
		||||
    special:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 39.33, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 44, height: 52 }
 | 
			
		||||
 | 
			
		||||
views:
 | 
			
		||||
    base:
 | 
			
		||||
@ -97,4 +94,4 @@ buttons:
 | 
			
		||||
    colon:
 | 
			
		||||
        label: ":"
 | 
			
		||||
    "\"":
 | 
			
		||||
        keysym: "quotedbl"
 | 
			
		||||
        keysym: "quotedbl"
 | 
			
		||||
 | 
			
		||||
@ -1,14 +1,13 @@
 | 
			
		||||
---
 | 
			
		||||
row_spacing: 11.33
 | 
			
		||||
button_spacing: 4.67
 | 
			
		||||
 | 
			
		||||
bounds: { x: 0, y: 6.33, width: 426, height: 250 }
 | 
			
		||||
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 | 
			
		||||
 | 
			
		||||
outlines:
 | 
			
		||||
    default:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 32, height: 52 }
 | 
			
		||||
    altline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 48.39024, height: 52 }
 | 
			
		||||
    wide:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 62, height: 52 }
 | 
			
		||||
    outline7:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 88.97561, height: 52 }
 | 
			
		||||
    spaceline:
 | 
			
		||||
@ -73,7 +72,7 @@ buttons:
 | 
			
		||||
        outline: spaceline
 | 
			
		||||
        label: " "
 | 
			
		||||
    Return:
 | 
			
		||||
        outline: outline7
 | 
			
		||||
        outline: "wide"
 | 
			
		||||
        icon: "key-enter"
 | 
			
		||||
    aring:
 | 
			
		||||
        label: "å"
 | 
			
		||||
 | 
			
		||||
@ -1,8 +1,5 @@
 | 
			
		||||
---
 | 
			
		||||
row_spacing: 11.33
 | 
			
		||||
button_spacing: 4.67
 | 
			
		||||
 | 
			
		||||
bounds: { x: 0, y: 6.33, width: 410, height: 250 }
 | 
			
		||||
bounds: { x: 0, y: 0.33, width: 360, height: 210 }
 | 
			
		||||
 | 
			
		||||
outlines:
 | 
			
		||||
    default:
 | 
			
		||||
 | 
			
		||||
@ -1,20 +1,17 @@
 | 
			
		||||
---
 | 
			
		||||
row_spacing: 11.33
 | 
			
		||||
button_spacing: 4.67
 | 
			
		||||
 | 
			
		||||
bounds: { x: 0, y: 1, width: 360, height: 198 }
 | 
			
		||||
bounds: { x: 0, y: 1, width: 360, height: 210 }
 | 
			
		||||
 | 
			
		||||
outlines:
 | 
			
		||||
    default:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 30.67, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 35.33, height: 52 }
 | 
			
		||||
    altline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 48, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 52.67, height: 52 }
 | 
			
		||||
    wide:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 57.33, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 62, height: 52 }
 | 
			
		||||
    spaceline:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 137.33, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 142, height: 52 }
 | 
			
		||||
    special:
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 39.33, height: 40.67 }
 | 
			
		||||
        bounds: { x: 0, y: 0, width: 44, height: 52 }
 | 
			
		||||
 | 
			
		||||
views:
 | 
			
		||||
    base:
 | 
			
		||||
 | 
			
		||||
@ -11,6 +11,7 @@ sq_button {
 | 
			
		||||
    border-width: 1px;
 | 
			
		||||
    border-color: #5e5c64;
 | 
			
		||||
    border-radius: 3px;
 | 
			
		||||
    margin: 4px 2px 4px 2px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
sq_button:active {
 | 
			
		||||
@ -22,7 +23,7 @@ sq_button.altline,
 | 
			
		||||
sq_button.special,
 | 
			
		||||
sq_button.wide {
 | 
			
		||||
    background: #2b292f;
 | 
			
		||||
    border-color: #3e3a44
 | 
			
		||||
    border-color: #3e3a44;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
sq_button.locked {
 | 
			
		||||
@ -32,7 +33,7 @@ sq_button.locked {
 | 
			
		||||
 | 
			
		||||
#Return {
 | 
			
		||||
    background: #1c71d8;
 | 
			
		||||
    border-color: #1a5fb4
 | 
			
		||||
    border-color: #1a5fb4;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#Return:active {
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user