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
b0aab84b
Commit
b0aab84b
authored
6 years ago
by
Dominik Seeger
Browse files
Options
Downloads
Patches
Plain Diff
fixed linewrapping with only vuetify components
parent
b88e33fd
No related branches found
Branches containing commit
No related tags found
4 merge requests
!135
Merge 127 ui improvements
,
!134
WIP Merge 127 ui improvements
,
!133
WIP Merge 127 ui improvements
,
!132
Merge "UI Improvements"
Pipeline
#85376
passed
6 years ago
Stage: build
Stage: test
Stage: build_image
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+27
-16
27 additions, 16 deletions
...ssion_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
with
27 additions
and
16 deletions
frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+
27
−
16
View file @
b0aab84b
<!-- TODO: remove inline stylings -->
<
template
>
<v-layout
>
<div
class=
"tb-container"
>
<div
style=
"margin-top: 10px;"
>
<v-container
>
<v-layout
wrap
>
<v-flex
sm4
md4
lg3
>
<v-tooltip
top
v-if=
"skippable"
>
<v-btn
slot=
"activator"
...
...
@@ -19,8 +19,8 @@
icon=
"warning"
:value=
"scoreError"
>
{{
scoreError
}}
</v-alert>
</
div
>
<
div
style=
"margin-top: 10px;"
>
</
v-flex
>
<
v-flex
xs
>
<span
class=
"mr-2"
>
Score:
</span>
<input
class=
"score-text-field"
...
...
@@ -40,15 +40,19 @@
@
click=
"score = fullScore"
color=
"blue darken-3"
class=
"score-button"
>
{{
fullScore
}}
</v-btn>
</div>
<div
style=
"display: flex; flex-wrap: wrap; margin-left: 20px; margin-top: 10px;"
>
</v-flex>
<v-flex
class=
"submit-container"
xs4
sm4
>
<v-layout
wrap
>
<v-flex
xs4
md3
>
<v-tooltip
top
v-if=
"showFinalCheckbox"
>
<v-toolbar-items
slot=
"activator"
>
<v-toolbar-items
class=
"final-container"
slot=
"activator"
>
<label>
Final
</label>
<v-checkbox
slot=
"activator"
v-model=
"isFinal"
class=
"final-checkbox"
/>
<label
style=
"margin-top: 25%; margin-right: 20px;"
>
Final
</label>
</v-toolbar-items>
<span>
Non final feedback will be sent to the reviewer.
</span>
</v-tooltip>
</v-flex>
<v-flex
xs
>
<v-tooltip
top
>
<v-btn
color=
"success"
...
...
@@ -58,9 +62,11 @@
>
Submit
<v-icon>
chevron_right
</v-icon></v-btn>
<span>
Submit and continue
</span>
</v-tooltip>
</div>
</div>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-container>
</
template
>
<
script
>
...
...
@@ -169,7 +175,6 @@ export default {
.score-text-field
{
max-width
:
50px
;
box-sizing
:
border-box
;
height
:
2.5vh
;
border
:
1px
solid
grey
;
border-radius
:
2px
;
padding
:
3px
;
...
...
@@ -180,11 +185,17 @@ export default {
.score-button
{
min-width
:
0px
;
}
.final-container
{
margin-top
:
15px
;
height
:
10px
;
}
.final-checkbox
{
margin-top
:
10px
;
margin-left
:
10px
;
padding-top
:
0
;
margin-top
:
0
;
}
.t
b
-container
{
display
:
fle
x
;
flex-wrap
:
wrap
;
.
submi
t-container
{
min-width
:
260p
x
;
margin-left
:
10px
;
}
</
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