Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Commits
0e7e8f26
Commit
0e7e8f26
authored
6 years ago
by
Dominik Seeger
Browse files
Options
Downloads
Patches
Plain Diff
fixed submission toolbar styling
parent
150f024e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!135
Merge 127 ui improvements
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+96
-58
96 additions, 58 deletions
...ssion_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
with
96 additions
and
58 deletions
frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+
96
−
58
View file @
0e7e8f26
<!-- TODO: remove inline stylings -->
<
template
>
<
template
>
<v-toolbar
dense
class=
"bottom-toolbar"
>
<v-container
class=
"bottom-container"
>
<v-tooltip
top
v-if=
"skippable"
>
<v-layout
wrap
>
<v-btn
<v-flex
sm4
md4
lg2
>
slot=
"activator"
<v-tooltip
top
v-if=
"skippable"
>
id=
"skip-submission"
<v-btn
slot=
"activator"
outline
round
outline
round
color=
"grey darken-2"
id=
"skip-submission"
@
click=
"skipSubmission"
color=
"grey darken-2"
>
Skip
</v-btn>
@
click=
"skipSubmission"
>
Skip
</v-btn>
<span>
Skip this submission
</span>
<span>
Skip this submission
</span>
</v-tooltip>
</v-tooltip>
<v-spacer/>
<v-spacer
/>
<v-alert
<v-alert
class=
"score-alert ma-3"
class=
"score-alert ma-3"
color=
"error"
color=
"error"
icon=
"warning"
icon=
"warning"
:value=
"scoreError"
>
{{
scoreError
}}
</v-alert>
:value=
"scoreError"
</v-flex>
>
{{
scoreError
}}
</v-alert>
<v-flex>
<span
class=
"mr-2"
>
Score:
</span>
<v-layout
wrap
class=
"score-submit-container"
>
<input
<v-flex
xs5
class=
"score-flex"
>
class=
"score-text-field"
<span
class=
"mr-2"
>
Score:
</span>
type=
"number"
<input
class=
"score-text-field"
id=
"score-input"
id=
"score-input"
v-model=
"score"
type=
"number"
@
input=
"validateScore"
v-model=
"score"
@
change=
"validateScore"
@
input=
"validateScore"
/>
@
change=
"validateScore"
/>
<span>
/
{{
fullScore
}}
</span>
<span>
/
{{
fullScore
}}
</span>
<v-btn
<v-btn
outline
round
flat
outline
round
flat
id=
"score-zero"
id=
"score-zero"
class=
"score-button"
@
click=
"score = 0"
@
click=
"score=0"
color=
"red lighten-1"
color=
"red lighten-1"
>
0
class=
"score-button"
>
0
</v-btn>
</v-btn>
<v-btn
<v-btn
outline
round
flat
outline
round
flat
id=
"score-full"
id=
"score-full"
@
click=
"score=fullScore"
@
click=
"score = fullScore"
color=
"blue darken-3"
color=
"blue darken-3"
class=
"score-button"
>
{{
fullScore
}}
class=
"score-button"
>
{{
fullScore
}}
</v-btn>
</v-btn>
<v-tooltip
top
v-if=
"showFinalCheckbox"
>
</v-flex>
<v-toolbar-items
slot=
"activator"
style=
"margin-top: 28px;"
>
<v-flex
class=
"submit-flex"
xs3
sm3
>
<v-checkbox
slot=
"activator"
v-model=
"isFinal"
class=
"final-checkbox"
/>
<v-layout>
<span>
Final
</span>
<v-flex
xs4
>
</v-toolbar-items>
<v-tooltip
top
v-if=
"showFinalCheckbox"
>
<span>
Non final feedback will be sent to the reviewer.
</span>
<v-toolbar-items
class=
"final-container"
</v-tooltip>
slot=
"activator"
>
<v-tooltip
top
>
<label>
Final
</label>
<v-btn
<v-checkbox
slot=
"activator"
color=
"success"
v-model=
"isFinal"
slot=
"activator"
class=
"final-checkbox"
/>
id=
"submit-feedback"
</v-toolbar-items>
:loading=
"loading"
<span>
Non final feedback will be sent to the reviewer.
</span>
@
click=
"submit"
</v-tooltip>
>
Submit
<v-icon>
chevron_right
</v-icon></v-btn>
</v-flex>
<span>
Submit and continue
</span>
<v-flex
xs
>
</v-tooltip>
<v-tooltip
top
>
</v-toolbar>
<v-btn
color=
"success"
id=
"submit-feedback"
slot=
"activator"
:loading=
"loading"
@
click=
"submit"
>
Submit
<v-icon>
chevron_right
</v-icon>
</v-btn>
<span>
Submit and continue
</span>
</v-tooltip>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-container>
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -158,6 +175,9 @@ export default {
...
@@ -158,6 +175,9 @@ export default {
</
script
>
</
script
>
<
style
scoped
>
<
style
scoped
>
.bottom-container
{
padding
:
0px
;
}
.bottom-toolbar
{
.bottom-toolbar
{
font-size
:
large
;
font-size
:
large
;
}
}
...
@@ -174,7 +194,25 @@ export default {
...
@@ -174,7 +194,25 @@ export default {
.score-button
{
.score-button
{
min-width
:
0px
;
min-width
:
0px
;
}
}
.final-container
{
margin-top
:
15px
;
height
:
10px
;
}
.final-checkbox
{
.final-checkbox
{
float
:
left
;
margin-left
:
10px
;
padding-top
:
0
;
margin-top
:
0
;
}
.submit-flex
{
min-width
:
190px
;
margin-left
:
10px
;
}
.score-flex
{
margin-left
:
10px
;
min-width
:
250px
;
}
.score-submit-container
{
justify-content
:
space-between
;
}
}
</
style
>
</
style
>
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