Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9cc341e2
Commit
9cc341e2
authored
Oct 04, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI consistency fixes for font weight and color
parent
11f672d3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
19 deletions
+13
-19
app/assets/javascripts/boards/components/board_form.vue
app/assets/javascripts/boards/components/board_form.vue
+0
-6
app/assets/javascripts/boards/components/labels_select.vue
app/assets/javascripts/boards/components/labels_select.vue
+1
-1
app/assets/javascripts/boards/components/user_select.vue
app/assets/javascripts/boards/components/user_select.vue
+4
-1
app/assets/javascripts/boards/components/weight_select.vue
app/assets/javascripts/boards/components/weight_select.vue
+1
-1
app/assets/javascripts/vue_shared/components/popup_dialog.vue
...assets/javascripts/vue_shared/components/popup_dialog.vue
+4
-3
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+3
-0
app/assets/stylesheets/framework/modal.scss
app/assets/stylesheets/framework/modal.scss
+0
-7
No files found.
app/assets/javascripts/boards/components/board_form.vue
View file @
9cc341e2
...
@@ -56,12 +56,6 @@
...
@@ -56,12 +56,6 @@
</p>
</p>
<div
v-if=
"!collapseScope || expanded"
>
<div
v-if=
"!collapseScope || expanded"
>
<div
class=
"list-item"
>
<div
class=
"list-item"
>
<div
v-if=
"board.milestone"
slot=
"currentValue"
>
{{
board
.
milestone
.
title
}}
</div>
<board-milestone-select
<board-milestone-select
:board=
"board"
:board=
"board"
:milestone-path=
"milestonePath"
:milestone-path=
"milestonePath"
...
...
app/assets/javascripts/boards/components/labels_select.vue
View file @
9cc341e2
...
@@ -65,7 +65,7 @@ export default {
...
@@ -65,7 +65,7 @@ export default {
<div
class=
"value issuable-show-labels"
>
<div
class=
"value issuable-show-labels"
>
<span
<span
v-if=
"board.labels.length === 0"
v-if=
"board.labels.length === 0"
class=
"
no-value
"
class=
"
text-secondary
"
>
>
Any label
Any label
</span>
</span>
...
...
app/assets/javascripts/boards/components/user_select.vue
View file @
9cc341e2
...
@@ -115,7 +115,10 @@ export default {
...
@@ -115,7 +115,10 @@ export default {
</div>
</div>
</div>
</div>
</div>
</div>
<div
v-else
>
<div
v-else
class=
"text-secondary"
>
{{
anyUserText
}}
{{
anyUserText
}}
</div>
</div>
</div>
</div>
...
...
app/assets/javascripts/boards/components/weight_select.vue
View file @
9cc341e2
...
@@ -44,7 +44,7 @@ export default {
...
@@ -44,7 +44,7 @@ export default {
computed
:
{
computed
:
{
valueClass
()
{
valueClass
()
{
if
(
this
.
value
===
'
Any Weight
'
)
{
if
(
this
.
value
===
'
Any Weight
'
)
{
return
'
placeholder
'
;
return
'
text-secondary
'
;
}
}
return
'
bold
'
;
return
'
bold
'
;
},
},
...
...
app/assets/javascripts/vue_shared/components/popup_dialog.vue
View file @
9cc341e2
...
@@ -52,12 +52,10 @@ export default {
...
@@ -52,12 +52,10 @@ export default {
class=
"modal popup-dialog"
class=
"modal popup-dialog"
role=
"dialog"
role=
"dialog"
tabindex=
"-1"
tabindex=
"-1"
@
click=
"close"
>
>
<div
<div
class=
"modal-dialog modal-md"
class=
"modal-dialog modal-md"
role=
"document"
role=
"document"
@
click
.
stop
>
>
<div
class=
"modal-content"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<div
class=
"modal-header"
>
...
@@ -103,6 +101,9 @@ export default {
...
@@ -103,6 +101,9 @@ export default {
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"modal-backdrop fade in"
/>
<div
class=
"modal-backdrop fade in"
@
click=
"close"
/>
</div>
</div>
</
template
>
</
template
>
app/assets/stylesheets/framework/common.scss
View file @
9cc341e2
...
@@ -4,6 +4,9 @@
...
@@ -4,6 +4,9 @@
.cred
{
color
:
$common-red
;
}
.cred
{
color
:
$common-red
;
}
.cgreen
{
color
:
$common-green
;
}
.cgreen
{
color
:
$common-green
;
}
.cdark
{
color
:
$common-gray-dark
;
}
.cdark
{
color
:
$common-gray-dark
;
}
.text-secondary
{
color
:
$gl-text-color-secondary
;
}
/** COMMON CLASSES **/
/** COMMON CLASSES **/
.prepend-top-0
{
margin-top
:
0
;
}
.prepend-top-0
{
margin-top
:
0
;
}
...
...
app/assets/stylesheets/framework/modal.scss
View file @
9cc341e2
...
@@ -46,13 +46,6 @@ body.modal-open {
...
@@ -46,13 +46,6 @@ body.modal-open {
padding
:
$gl-padding
;
padding
:
$gl-padding
;
}
}
.modal-header
,
.modal-footer
{
padding
:
$gl-padding
;
background-color
:
$gray-light
;
border-top
:
1px
solid
$border-color
;
}
.modal.popup-dialog
{
.modal.popup-dialog
{
display
:
block
;
display
:
block
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment