Skip to content

Commit ab06519

Browse files
authored
Merge pull request #2 from NickKoepr/lang-selector
Added animations and fixed a bug with the language selector.
2 parents 024daf1 + 8087e42 commit ab06519

File tree

7 files changed

+7
-9
lines changed

7 files changed

+7
-9
lines changed

src/app/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import {
1111
setLanguage,
1212
type Language,
1313
} from "../model/Game";
14-
import StatusMessage from "./components/message/StatusMessage";
1514
import DefaultButton from "./components/common/button/DefaultButton";
1615
import DefaultSelector from "./components/common/selector/DefaultSelector";
16+
import StatusMessage from "./components/common/message/StatusMessage";
1717

1818
function App() {
1919
const [gameState, setGameState] = useState(() => initGame());

src/app/components/common/button/DefaultButton.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,3 @@
77
border: 2px solid var(--outline-button-color);
88
border-radius: 10px;
99
}
10-
11-
.submit:hover {
12-
background-color: var(--input-color);
13-
}
File renamed without changes.
File renamed without changes.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
.default-selector {
22
margin: 20px;
3-
background: var(--selector-color);
3+
background-color: var(--selector-color);
44
padding: 10px 20px 10px 20px;
55
border: 2px solid var(--outline-selector-color);
6-
6+
font-family: var(--font);
7+
font-weight: 650;
78
/* Disable 'gradient' effect on Safari */
89
-webkit-appearance: none;
910
}

src/app/components/letterTile/LetterTile.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
background-color: var(--tile-color);
99
border-radius: 15%;
1010
border: 2px solid var(--outline-tile-color);
11+
transition-duration: 0.2s;
1112
}
1213

1314
.correct {

src/model/Game.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { words as wordsNL } from "../../words/words-nl.json";
44

55
export type Language = "nl" | "en";
66

7-
export let language: Language = "nl";
7+
export let language: Language = "en";
88

99
export function setLanguage(lang: Language) {
1010
language = lang;
@@ -81,7 +81,7 @@ export function isFinished(game: Game): boolean {
8181

8282
export function initGame(): Game {
8383
const word = getRandomWord(language).toLowerCase();
84-
console.log(word);
84+
8585
return {
8686
language: language,
8787
finalWord: word,

0 commit comments

Comments
 (0)