Skip to content

Commit

Permalink
Re-align with Keypicker.js due to changes in #474 (#475)
Browse files Browse the repository at this point in the history
Signed-off-by: Johan Eklund <hello@johaneklund.com>
Co-authored-by: AlexDygma <70891884+AlexDygma@users.noreply.github.com>
  • Loading branch information
jreklund and AlexDygma authored Aug 2, 2023
1 parent 07f8b1a commit 95558d1
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 19 deletions.
9 changes: 5 additions & 4 deletions src/renderer/modules/KeyPickerKeyboard/KeyPicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ import KR from "@Renderer/modules/KeyPickerKeyboard/KR.json";
import SWGR from "@Renderer/modules/KeyPickerKeyboard/SWGR.json";
import EU from "@Renderer/modules/KeyPickerKeyboard/EU.json";


const Style = Styled.div`
width: 100%;
@media screen and (min-width: 1980px) and (min-height: 980px) {
Expand Down Expand Up @@ -233,10 +234,10 @@ width: 100%;
}
.keysContainerGrid {
display: grid;
grid-template-columns: repeat(12, 1fr);
display: grid;
grid-template-columns: repeat(12, 1fr);
grid-template-rows: repeat(2, 1fr);
gap: 2px 4px;
gap: 2px 4px;
}
.KeysWrapper.notWireless {
Expand Down Expand Up @@ -279,7 +280,7 @@ width: 100%;
}
.KeysWrapper.super.isWireless {
.keysContainerGrid {
grid-template-columns: repeat(12, 1fr);
grid-template-columns: repeat(12, 1fr);
grid-template-rows: repeat(2, 1fr);
}
.keysMacros { grid-area: 1 / 1 / 2 / 5; }
Expand Down
31 changes: 16 additions & 15 deletions src/renderer/modules/KeyPickerKeyboard/KeyPickerReduced.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,23 @@ import {
AiOutlineForward,
} from "react-icons/ai";
import { MdKeyboardReturn, MdSpaceBar, MdKeyboardCapslock, MdInfoOutline, MdEject } from "react-icons/md";
import i18n from "../../i18n";

import Key from "./Key";
import ES from "./ES.json";
import ENi from "./ENi.json";
import ENa from "./ENa.json";
import GR from "./GR.json";
import FR from "./FR.json";
import SW from "./SW.json";
import DN from "./DN.json";
import NW from "./NW.json";
import IC from "./IC.json";
import JP from "./JP.json";
import KR from "./KR.json";
import SWGR from "./SWGR.json";
import EU from "./EU.json";
import i18n from "@Renderer/i18n";

import Key from "@Renderer/modules/KeyPickerKeyboard/Key";
import ES from "@Renderer/modules/KeyPickerKeyboard/ES.json";
import ENi from "@Renderer/modules/KeyPickerKeyboard/ENi.json";
import ENa from "@Renderer/modules/KeyPickerKeyboard/ENa.json";
import GR from "@Renderer/modules/KeyPickerKeyboard/GR.json";
import FR from "@Renderer/modules/KeyPickerKeyboard/FR.json";
import SW from "@Renderer/modules/KeyPickerKeyboard/SW.json";
import DN from "@Renderer/modules/KeyPickerKeyboard/DN.json";
import NW from "@Renderer/modules/KeyPickerKeyboard/NW.json";
import IC from "@Renderer/modules/KeyPickerKeyboard/IC.json";
import JP from "@Renderer/modules/KeyPickerKeyboard/JP.json";
import KR from "@Renderer/modules/KeyPickerKeyboard/KR.json";
import SWGR from "@Renderer/modules/KeyPickerKeyboard/SWGR.json";
import EU from "@Renderer/modules/KeyPickerKeyboard/EU.json";
// import SelectSuperKeys from "../../component/Select/SelectSuperKey";

const Style = Styled.div`
Expand Down

0 comments on commit 95558d1

Please # to comment.