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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
639b7189
Commit
639b7189
authored
Apr 13, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] col-*-push and col-*-pull => order-*
parent
9b9d0f39
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/boards/components/modal/empty_state.js
...assets/javascripts/boards/components/modal/empty_state.js
+2
-2
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
...rge_request_widget/components/states/nothing_to_merge.vue
+2
-2
app/views/admin/conversational_development_index/_disabled.html.haml
...dmin/conversational_development_index/_disabled.html.haml
+1
-1
app/views/admin/conversational_development_index/_no_data.html.haml
...admin/conversational_development_index/_no_data.html.haml
+1
-1
No files found.
app/assets/javascripts/boards/components/modal/empty_state.js
View file @
639b7189
...
...
@@ -41,10 +41,10 @@ gl.issueBoards.ModalEmptyState = Vue.extend({
template
:
`
<section class="empty-state">
<div class="row">
<div class="col-xs-12 col-sm-6
col-sm-push-6
">
<div class="col-xs-12 col-sm-6
order-sm-last
">
<aside class="svg-content"><img :src="emptyStateSvg"/></aside>
</div>
<div class="col-xs-12 col-sm-6
col-sm-pull-6
">
<div class="col-xs-12 col-sm-6
order-sm-first
">
<div class="text-content">
<h4>{{ contents.title }}</h4>
<p v-html="contents.content"></p>
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue
View file @
639b7189
...
...
@@ -18,10 +18,10 @@ export default {
<
template
>
<div
class=
"mr-widget-body mr-widget-empty-state"
>
<div
class=
"row"
>
<div
class=
"artwork col-
sm-5 col-sm-push-7
col-12 text-center"
>
<div
class=
"artwork col-
md-5 order-md-last
col-12 text-center"
>
<span
v-html=
"emptyStateSVG"
></span>
</div>
<div
class=
"text col-
sm-7 col-sm-pull-5
col-12"
>
<div
class=
"text col-
md-7 order-md-first
col-12"
>
<span>
Merge requests are a place to propose changes you have made to a project
and discuss those changes with others.
...
...
app/views/admin/conversational_development_index/_disabled.html.haml
View file @
639b7189
.container.convdev-empty
.col-sm-
6.col-sm-push-3
.text-center
.col-sm-
12.justify-content-center
.text-center
=
custom_icon
(
'convdev_no_index'
)
%h4
Usage ping is not enabled
%p
...
...
app/views/admin/conversational_development_index/_no_data.html.haml
View file @
639b7189
.container.convdev-empty
.col-sm-
6.col-sm-push-3
.text-center
.col-sm-
12.justify-content-center
.text-center
=
custom_icon
(
'convdev_no_data'
)
%h4
Data is still calculating...
%p
...
...
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