Skip to content

pulling changes from main #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dceu wants to merge 3 commits into
base: d-u-2025-02-05
Choose a base branch
from
Open

pulling changes from main #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0a8148
Update question page font and formatting
Lindsey-Ipson Feb 9, 2025
fd4a4e6
Merge branch 'main' into question-font-change
dceu Feb 11, 2025
de5f2c9
Merge pull request #33 from Quizzy-News/question-font-change
dceu Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export default function App() {
LexendBlack: require("./public/fonts/Lexend-Black.ttf"),
Jost: require("./public/fonts/Jost-Regular.ttf"),
FuturaMedium: require("./public/fonts/Futura-Medium.otf"),
FuturaBold: require("./public/fonts/Futura-Bold.otf"),
});


Expand Down
244 changes: 231 additions & 13 deletions nativewind-output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,21 @@ _NativeWindStyleSheet.create({
"right-[-5]": {
"right": -5
},
"z-10": {
"zIndex": 10
},
"m-[10px]": {
"marginTop": 10,
"marginRight": 10,
"marginBottom": 10,
"marginLeft": 10
},
"m-auto": {
"marginTop": "auto",
"marginRight": "auto",
"marginBottom": "auto",
"marginLeft": "auto"
},
"mb-[10px]": {
"marginBottom": 10
},
Expand All @@ -61,8 +70,8 @@ _NativeWindStyleSheet.create({
"h-timer-height": {
"height": 60
},
"w-[103%]": {
"width": "103%"
"w-[100%]": {
"width": "100%"
},
"w-full": {
"width": "100%"
Expand Down Expand Up @@ -93,9 +102,6 @@ _NativeWindStyleSheet.create({
"justify-between": {
"justifyContent": "space-between"
},
"self-start": {
"alignSelf": "flex-start"
},
"rounded-lg": {
"borderTopLeftRadius": "0.5rem",
"borderTopRightRadius": "0.5rem",
Expand Down Expand Up @@ -168,8 +174,8 @@ _NativeWindStyleSheet.create({
"pt-[5px]": {
"paddingTop": 5
},
"text-left": {
"textAlign": "left"
"text-center": {
"textAlign": "center"
},
"font-futura-medium": {
"fontFamily": "FuturaMedium"
Expand All @@ -180,9 +186,9 @@ _NativeWindStyleSheet.create({
"font-lexend-bold": {
"fontFamily": "LexendBold"
},
"text-4xl": {
"fontSize": "2.25rem",
"lineHeight": "2.5rem"
"text-5xl": {
"fontSize": "3rem",
"lineHeight": 1
},
"text-[12px]": {
"fontSize": 12
Expand Down Expand Up @@ -342,12 +348,224 @@ _NativeWindStyleSheet.create({
},
"container@39": {
"maxWidth": 1536
},
"container@40": {
"maxWidth": 640
},
"container@41": {
"maxWidth": 768
},
"container@42": {
"maxWidth": 1024
},
"container@43": {
"maxWidth": 1280
},
"container@44": {
"maxWidth": 1536
},
"container@45": {
"maxWidth": 640
},
"container@46": {
"maxWidth": 768
},
"container@47": {
"maxWidth": 1024
},
"container@48": {
"maxWidth": 1280
},
"container@49": {
"maxWidth": 1536
},
"container@50": {
"maxWidth": 640
},
"container@51": {
"maxWidth": 768
},
"container@52": {
"maxWidth": 1024
},
"container@53": {
"maxWidth": 1280
},
"container@54": {
"maxWidth": 1536
},
"container@55": {
"maxWidth": 640
},
"container@56": {
"maxWidth": 768
},
"container@57": {
"maxWidth": 1024
},
"container@58": {
"maxWidth": 1280
},
"container@59": {
"maxWidth": 1536
},
"font-futura-bold": {
"fontFamily": "FuturaBold"
},
"container@60": {
"maxWidth": 640
},
"container@61": {
"maxWidth": 768
},
"container@62": {
"maxWidth": 1024
},
"container@63": {
"maxWidth": 1280
},
"container@64": {
"maxWidth": 1536
},
"container@65": {
"maxWidth": 640
},
"container@66": {
"maxWidth": 768
},
"container@67": {
"maxWidth": 1024
},
"container@68": {
"maxWidth": 1280
},
"container@69": {
"maxWidth": 1536
},
"container@70": {
"maxWidth": 640
},
"container@71": {
"maxWidth": 768
},
"container@72": {
"maxWidth": 1024
},
"container@73": {
"maxWidth": 1280
},
"container@74": {
"maxWidth": 1536
},
"container@75": {
"maxWidth": 640
},
"container@76": {
"maxWidth": 768
},
"container@77": {
"maxWidth": 1024
},
"container@78": {
"maxWidth": 1280
},
"container@79": {
"maxWidth": 1536
},
"container@80": {
"maxWidth": 640
},
"container@81": {
"maxWidth": 768
},
"container@82": {
"maxWidth": 1024
},
"container@83": {
"maxWidth": 1280
},
"container@84": {
"maxWidth": 1536
},
"container@85": {
"maxWidth": 640
},
"container@86": {
"maxWidth": 768
},
"container@87": {
"maxWidth": 1024
},
"container@88": {
"maxWidth": 1280
},
"container@89": {
"maxWidth": 1536
},
"container@90": {
"maxWidth": 640
},
"container@91": {
"maxWidth": 768
},
"container@92": {
"maxWidth": 1024
},
"container@93": {
"maxWidth": 1280
},
"container@94": {
"maxWidth": 1536
},
"container@95": {
"maxWidth": 640
},
"container@96": {
"maxWidth": 768
},
"container@97": {
"maxWidth": 1024
},
"container@98": {
"maxWidth": 1280
},
"container@99": {
"maxWidth": 1536
},
"container@100": {
"maxWidth": 640
},
"container@101": {
"maxWidth": 768
},
"container@102": {
"maxWidth": 1024
},
"container@103": {
"maxWidth": 1280
},
"container@104": {
"maxWidth": 1536
},
"container@105": {
"maxWidth": 640
},
"container@106": {
"maxWidth": 768
},
"container@107": {
"maxWidth": 1024
},
"container@108": {
"maxWidth": 1280
},
"container@109": {
"maxWidth": 1536
}
},
atRules: {
"container": [[["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]]]

},
"container": [[["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]], [["media", "(min-width: 640px)"]], [["media", "(min-width: 768px)"]], [["media", "(min-width: 1024px)"]], [["media", "(min-width: 1280px)"]], [["media", "(min-width: 1536px)"]]]
},
topics: {
"container": ["width"],
"h-screen": ["height"]
Expand Down
8 changes: 4 additions & 4 deletions pages/GamePageChildren/ChoiceDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ export default function ChoiceDisplay ({choice, onPressIn, onPressOut, choiceSta

const getTextStyle = () => {
if (choiceState === "Disabled") {
return "font-futura-medium text-xl text-grey-1 ";
return "font-futura-bold text-xl text-grey-1 leading-6";
} else if (choiceState.includes("Correct")) {
return "font-futura-medium text-xl text-white ";
return "font-futura-bold text-xl text-light-green leading-6";
} else if (choiceState.includes("Incorrect")) {
return "font-futura-medium text-xl text-light-red ";
return "font-futura-bold text-xl text-light-red leading-6";
} else {
return "font-futura-medium text-xl text-grey-4 ";
return "font-futura-bold text-xl text-grey-4 leading-6";
}
}

Expand Down
2 changes: 1 addition & 1 deletion pages/GamePageChildren/QuestionDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const StyledText = styled(Text);

export default function QuestionDisplay ({currentQuestion}) {
return (
<StyledText className="text-grey-4 font-lexend-bold text-[22px] leading-6">
<StyledText className="text-grey-4 font-lexend text-[22px] leading-6">
{currentQuestion}
</StyledText>
);
Expand Down
Binary file added public/fonts/Futura-Bold.otf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = {
'lexend-black': ['LexendBlack', 'sans-serif'],
'jost': ['Jost', 'sans-serif'],
'futura-medium': ['FuturaMedium', 'sans-serif'],
'futura-bold': ['FuturaBold', 'sans-serif'],
},

colors: {
Expand Down