Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
teknikattan-scoring-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tddd96-grupp1
teknikattan-scoring-system
Commits
e35eb028
Commit
e35eb028
authored
3 years ago
by
Albin Henriksson
Browse files
Options
Downloads
Patches
Plain Diff
increase size of buttons again
parent
df706284
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#45653
passed with warnings
3 years ago
Stage: setup
Stage: test
Stage: report
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
client/src/pages/views/OperatorViewPage.tsx
+6
-6
6 additions, 6 deletions
client/src/pages/views/OperatorViewPage.tsx
client/src/pages/views/styled.tsx
+4
-4
4 additions, 4 deletions
client/src/pages/views/styled.tsx
with
10 additions
and
10 deletions
client/src/pages/views/OperatorViewPage.tsx
+
6
−
6
View file @
e35eb028
...
...
@@ -284,11 +284,11 @@ const OperatorViewPage: React.FC = () => {
{
activeViewTypeId
&&
<
SlideDisplay
variant
=
"presentation"
activeViewTypeId
=
{
activeViewTypeId
}
/>
}
</
OperatorInnerContent
>
</
OperatorContent
>
{
<
div
style
=
{
{
minHeight
:
96
}
}
/>
}
{
<
div
style
=
{
{
minHeight
:
128
}
}
/>
}
<
OperatorFooter
position
=
"fixed"
>
<
Tooltip
title
=
"Föregående sida"
arrow
>
<
OperatorButton
onClick
=
{
handleSetPrevSlide
}
variant
=
"contained"
disabled
=
{
isFirstSlide
}
color
=
"primary"
>
<
ChevronLeftIcon
fontSize
=
"
small
"
/>
<
ChevronLeftIcon
fontSize
=
"
large
"
/>
</
OperatorButton
>
</
Tooltip
>
...
...
@@ -300,7 +300,7 @@ const OperatorViewPage: React.FC = () => {
disabled
=
{
timer
.
value
!==
null
&&
!
timer
.
enabled
}
color
=
"primary"
>
<
TimerIcon
fontSize
=
"
small
"
/>
<
TimerIcon
fontSize
=
"
large
"
/>
<
Timer
disableText
/>
</
OperatorButton
>
</
Tooltip
>
...
...
@@ -308,20 +308,20 @@ const OperatorViewPage: React.FC = () => {
<
Tooltip
title
=
"Visa ställning för publik"
arrow
>
<
OperatorButton
onClick
=
{
()
=>
socketSync
({
show_scoreboard
:
true
})
}
variant
=
"contained"
color
=
"primary"
>
<
AssignmentIcon
fontSize
=
"
small
"
/>
<
AssignmentIcon
fontSize
=
"
large
"
/>
</
OperatorButton
>
</
Tooltip
>
{
showScoreboard
&&
<
Scoreboard
isOperator
/>
}
<
Tooltip
title
=
"Visa koder"
arrow
>
<
OperatorButton
onClick
=
{
handleOpenCodes
}
variant
=
"contained"
color
=
"primary"
>
<
SupervisorAccountIcon
fontSize
=
"
small
"
/>
<
SupervisorAccountIcon
fontSize
=
"
large
"
/>
</
OperatorButton
>
</
Tooltip
>
<
Tooltip
title
=
"Nästa sida"
arrow
>
<
OperatorButton
onClick
=
{
handleSetNextSlide
}
variant
=
"contained"
disabled
=
{
isLastSlide
}
color
=
"primary"
>
<
ChevronRightIcon
fontSize
=
"
small
"
/>
<
ChevronRightIcon
fontSize
=
"
large
"
/>
</
OperatorButton
>
</
Tooltip
>
</
OperatorFooter
>
...
...
This diff is collapsed.
Click to expand it.
client/src/pages/views/styled.tsx
+
4
−
4
View file @
e35eb028
...
...
@@ -50,7 +50,7 @@ export const OperatorFooter = styled(AppBar)`
flex-direction: row;
justify-content: center;
align-items: center;
height:
96
px;
height:
128
px;
top: auto;
bottom: 0;
width: 100%;
...
...
@@ -62,8 +62,8 @@ export const OperatorQuitButton = styled(Button)`
`
export
const
OperatorButton
=
styled
(
Button
)
`
min-width:
64
px;
min-height:
64
px;
min-width:
90
px;
min-height:
90
px;
margin-left: 16px;
margin-right: 16px;
`
...
...
@@ -147,7 +147,7 @@ export const OperatorInnerContent = styled.div`
width: 100%;
/* Makes sure width is not bigger than where a 16:9 display can fit
without overlapping with header and footer */
max-width: calc(((100vh - 1
60
px) / 9) * 16);
max-width: calc(((100vh - 1
92
px) / 9) * 16);
`
export
const
PresentationContainer
=
styled
.
div
`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment