gnome-shell: Fix oversized screen keyboard on some displays

Thanks to @NicoVarg99's PR #315 Fixes #281
nana-4 · Nov 25, 2018 · a21df6e · a21df6e
1 parent 1d8bd14
commit a21df6e
Show file tree

Hide file tree

Showing 35 changed files with 84 additions and 119 deletions.
diff --git a/src/_sass/gnome-shell/_common-3.18.scss b/src/_sass/gnome-shell/_common-3.18.scss
@@ -1850,13 +1850,12 @@ $legacy_icon_size: 24px;
   .keyboard-row { spacing: 15px; }
 
   .keyboard-key {
-    min-height: $medium_size * 2;
-    min-width: $medium_size * 2;
+    min-height: 2em;
+    min-width: 2em;
     font-size: 2em;
     font-weight: 500;
     border-radius: $material_radius;
     border: none;
-    color: inherit;
     @include button(normal);
     &:focus { @include button(focus); }
     &:hover,&:checked { @include button(hover); }

diff --git a/src/_sass/gnome-shell/_common-3.24.scss b/src/_sass/gnome-shell/_common-3.24.scss
@@ -1865,13 +1865,12 @@ $legacy_icon_size: 24px;
   .keyboard-row { spacing: 15px; }
 
   .keyboard-key {
-    min-height: $medium_size * 2;
-    min-width: $medium_size * 2;
+    min-height: 2em;
+    min-width: 2em;
     font-size: 2em;
     font-weight: 500;
     border-radius: $material_radius;
     border: none;
-    color: inherit;
     @include button(normal);
     &:focus { @include button(focus); }
     &:hover,&:checked { @include button(hover); }

diff --git a/src/_sass/gnome-shell/_common-3.26.scss b/src/_sass/gnome-shell/_common-3.26.scss
@@ -1857,13 +1857,12 @@ StScrollBar {
   .keyboard-row { spacing: 15px; }
 
   .keyboard-key {
-    min-height: $medium_size * 2;
-    min-width: $medium_size * 2;
+    min-height: 2em;
+    min-width: 2em;
     font-size: 2em;
     font-weight: 500;
     border-radius: $material_radius;
     border: none;
-    color: inherit;
     @include button(normal);
     &:focus { @include button(focus); }
     &:hover,&:checked { @include button(hover); }

diff --git a/src/_sass/gnome-shell/_common-3.28.scss b/src/_sass/gnome-shell/_common-3.28.scss
@@ -1847,7 +1847,7 @@ StScrollBar {
 .word-suggestions {
     @include font(subheading);
     spacing: 12px;
-    min-height: 40px;
+    min-height: 20pt;
 }
 
 #keyboard {
@@ -1860,13 +1860,12 @@ StScrollBar {
   }
 
   .keyboard-key {
-    min-height: $medium_size * 2;
-    min-width: $medium_size * 2;
+    min-height: 2em;
+    min-width: 2em;
     font-size: 2em;
     font-weight: 500;
     border-radius: $material_radius;
     border: none;
-    color: inherit;
     @include button(normal);
     &:focus { @include button(focus); }
     &:hover,&:checked { @include button(hover); }

diff --git a/src/_sass/gnome-shell/_common-3.30.scss b/src/_sass/gnome-shell/_common-3.30.scss
@@ -1852,7 +1852,7 @@ StScrollBar {
 .word-suggestions {
     @include font(subheading);
     spacing: 12px;
-    min-height: 40px;
+    min-height: 20pt;
 }
 
 #keyboard {
@@ -1865,13 +1865,12 @@ StScrollBar {
   }
 
   .keyboard-key {
-    min-height: $medium_size * 2;
-    min-width: $medium_size * 2;
+    min-height: 2em;
+    min-width: 2em;
     font-size: 2em;
     font-weight: 500;
     border-radius: $material_radius;
     border: none;
-    color: inherit;
     @include button(normal);
     &:focus { @include button(focus); }
     &:hover,&:checked { @include button(hover); }

diff --git a/src/gnome-shell/3.18/gnome-shell-compact.css b/src/gnome-shell/3.18/gnome-shell-compact.css
@@ -2318,13 +2318,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.18/gnome-shell-dark-compact.css b/src/gnome-shell/3.18/gnome-shell-dark-compact.css
@@ -2318,13 +2318,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(255, 255, 255, 0.8);
   background-color: #424242;
   border-color: transparent;

diff --git a/src/gnome-shell/3.18/gnome-shell-dark.css b/src/gnome-shell/3.18/gnome-shell-dark.css
@@ -2318,13 +2318,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(255, 255, 255, 0.8);
   background-color: #424242;
   border-color: transparent;

diff --git a/src/gnome-shell/3.18/gnome-shell-light-compact.css b/src/gnome-shell/3.18/gnome-shell-light-compact.css
@@ -2318,13 +2318,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.18/gnome-shell-light.css b/src/gnome-shell/3.18/gnome-shell-light.css
@@ -2318,13 +2318,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.18/gnome-shell.css b/src/gnome-shell/3.18/gnome-shell.css
@@ -2318,13 +2318,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.24/gnome-shell-compact.css b/src/gnome-shell/3.24/gnome-shell-compact.css
@@ -2360,13 +2360,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.24/gnome-shell-dark-compact.css b/src/gnome-shell/3.24/gnome-shell-dark-compact.css
@@ -2360,13 +2360,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(255, 255, 255, 0.8);
   background-color: #424242;
   border-color: transparent;

diff --git a/src/gnome-shell/3.24/gnome-shell-dark.css b/src/gnome-shell/3.24/gnome-shell-dark.css
@@ -2360,13 +2360,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(255, 255, 255, 0.8);
   background-color: #424242;
   border-color: transparent;

diff --git a/src/gnome-shell/3.24/gnome-shell-light-compact.css b/src/gnome-shell/3.24/gnome-shell-light-compact.css
@@ -2360,13 +2360,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.24/gnome-shell-light.css b/src/gnome-shell/3.24/gnome-shell-light.css
@@ -2360,13 +2360,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.24/gnome-shell.css b/src/gnome-shell/3.24/gnome-shell.css
@@ -2360,13 +2360,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.26/gnome-shell-compact.css b/src/gnome-shell/3.26/gnome-shell-compact.css
@@ -2339,13 +2339,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.26/gnome-shell-dark-compact.css b/src/gnome-shell/3.26/gnome-shell-dark-compact.css
@@ -2339,13 +2339,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(255, 255, 255, 0.8);
   background-color: #424242;
   border-color: transparent;

diff --git a/src/gnome-shell/3.26/gnome-shell-dark.css b/src/gnome-shell/3.26/gnome-shell-dark.css
@@ -2339,13 +2339,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(255, 255, 255, 0.8);
   background-color: #424242;
   border-color: transparent;

diff --git a/src/gnome-shell/3.26/gnome-shell-light-compact.css b/src/gnome-shell/3.26/gnome-shell-light-compact.css
@@ -2339,13 +2339,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 64px;
-  min-width: 64px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.26/gnome-shell-light.css b/src/gnome-shell/3.26/gnome-shell-light.css
@@ -2339,13 +2339,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;

diff --git a/src/gnome-shell/3.26/gnome-shell.css b/src/gnome-shell/3.26/gnome-shell.css
@@ -2339,13 +2339,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .keyboard-key {
-  min-height: 72px;
-  min-width: 72px;
+  min-height: 2em;
+  min-width: 2em;
   font-size: 2em;
   font-weight: 500;
   border-radius: 4px;
   border: none;
-  color: inherit;
   color: rgba(0, 0, 0, 0.62);
   background-color: #FAFAFA;
   border-color: transparent;