Skip to content
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

adding formatting for 200% magnification on standard screen #835

Merged
merged 9 commits into from
Feb 22, 2024
Merged

adding formatting for 200% magnification on standard screen #835

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6eaa1ac
adding formatting for 200% magnification on standard screen
AAloshine-scottlogic Feb 13, 2024
89b5d3e
eslint+format
AAloshine-scottlogic Feb 14, 2024
f7736dc
added some padding to the right header area so the reset progress/get…
AAloshine-scottlogic Feb 15, 2024
bdaa8be
converted from dpi to rem and added no wrap to the reset progress button
AAloshine-scottlogic Feb 16, 2024
3543dcb
lint
AAloshine-scottlogic Feb 16, 2024
1955075
changed media query to rem, magnification now working on laptop screen
AAloshine-scottlogic Feb 21, 2024
ddb8bde
eslint changing from fill avaliable
AAloshine-scottlogic Feb 21, 2024
36a8600
reverting uneccesary change
AAloshine-scottlogic Feb 21, 2024
a834fd0
added chris' changes
AAloshine-scottlogic Feb 22, 2024
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
16 changes: 15 additions & 1 deletion frontend/src/components/ChatBox/ChatBox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
width: 100%;
padding: 0.5rem 2rem 1.5rem;
padding: 2rem;
font-size: 0.75rem;
}

.chat-box .footer label {
Expand Down Expand Up @@ -67,3 +66,18 @@
.chat-box .footer .control-buttons > :focus-visible {
outline-offset: 0.1rem;
}

@media only screen and (width >= 37.5rem) {
.chat-box .footer {
gap: 0.5rem;
padding: 1rem;
}

.chat-box .footer .control-buttons {
gap: 0.5rem;
}

.chat-box .footer .messages textarea {
padding: 0.5rem;
}
}
1 change: 0 additions & 1 deletion frontend/src/components/ChatBox/ChatBoxFeed.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
gap: 0.75rem;
justify-content: stretch;
overflow-y: auto;
height: fit-content;
padding: 0.5rem 2rem;
scrollbar-width: thin;
}
2 changes: 1 addition & 1 deletion frontend/src/components/LevelSelectionBox/LevelSelectionBox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

.level-button.selected {
background-color: var(--level-button-background-colour-selected);
cursor: default;
color: var(--level-button-colour);
cursor: default;
}

.level-button.disabled {
Expand Down
16 changes: 16 additions & 0 deletions frontend/src/components/MainComponent/MainFooter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,19 @@
display: inline-block;
padding: 0 0.75rem;
}

@media only screen and (width >= 37.5rem) {
.main-footer {
height: 2rem;
}

.main-footer a svg {
height: 1.75rem;
}

.main-footer a svg,
.main-footer .links,
.main-footer .links a:not(:last-child)::after {
padding: 0 0.5rem;
}
}
54 changes: 54 additions & 0 deletions frontend/src/components/MainComponent/MainHeader.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,58 @@
align-items: center;
width: 100%;
height: 100%;
padding-left: 0.5rem;
}

@media only screen and (width >= 37.5rem) {
.main-header-left > .title-logo {
height: 80%;
}

.main-header {
gap: 0.5rem;
height: 3.5rem;
padding: 0 0.5rem;
}

.main-header .main-header-middle {
gap: 0.5rem;
}

.main-header .main-header-middle .main-header-level {
font-size: 1.5rem;
}

.main-header .themed-button.level-button {
height: 2.5rem;
padding: 0.5rem;
}

.main-header .main-header-right {
gap: 0.5rem;
}

button.level-mission-info-banner {
padding: 0 0.5rem;
border-width: 0.5rem 0.25rem;
}

span.level-title-area {
min-width: unset;
font-size: 1.25rem;
white-space: nowrap;
}

.main-header .header-button {
padding: 0.5rem;
white-space: normal;
}

.main-header .main-header-middle .header-button {
white-space: nowrap;
}

.themed-button > img {
display: none;
}
}
Loading