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
3ae87eef
Commit
3ae87eef
authored
Apr 09, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace .btn-group-justified with .btn-group.d-flex
parent
917b7e0d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+1
-1
app/views/discussions/_notes.html.haml
app/views/discussions/_notes.html.haml
+1
-1
app/views/projects/jobs/_sidebar.html.haml
app/views/projects/jobs/_sidebar.html.haml
+2
-2
No files found.
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
3ae87eef
...
@@ -261,7 +261,7 @@ Please check your network connection and try again.`;
...
@@ -261,7 +261,7 @@ Please check your network connection and try again.`;
<div
class=
"discussion-reply-holder"
>
<div
class=
"discussion-reply-holder"
>
<template
v-if=
"!isReplying && canReply"
>
<template
v-if=
"!isReplying && canReply"
>
<div
<div
class=
"btn-group
-justified
discussion-with-resolve-btn"
class=
"btn-group
d-flex
discussion-with-resolve-btn"
role=
"group"
>
role=
"group"
>
<div
<div
class=
"btn-group"
class=
"btn-group"
...
...
app/views/discussions/_notes.html.haml
View file @
3ae87eef
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
-
if
discussion
.
potentially_resolvable?
-
if
discussion
.
potentially_resolvable?
-
line_type
=
local_assigns
.
fetch
(
:line_type
,
nil
)
-
line_type
=
local_assigns
.
fetch
(
:line_type
,
nil
)
.btn-group
-justified
.discussion-with-resolve-btn
{
role:
"group"
}
.btn-group
.d-flex
.discussion-with-resolve-btn
{
role:
"group"
}
.btn-group
{
role:
"group"
}
.btn-group
{
role:
"group"
}
=
link_to_reply_discussion
(
discussion
,
line_type
)
=
link_to_reply_discussion
(
discussion
,
line_type
)
...
...
app/views/projects/jobs/_sidebar.html.haml
View file @
3ae87eef
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
%span
=
time_ago_in_words
@build
.
artifacts_expire_at
%span
=
time_ago_in_words
@build
.
artifacts_expire_at
-
if
@build
.
artifacts?
-
if
@build
.
artifacts?
.btn-group.btn-group
-justified
{
role: :group
}
.btn-group.btn-group
.d-flex
{
role: :group
}
-
if
@build
.
has_expiring_artifacts?
&&
can?
(
current_user
,
:update_build
,
@build
)
-
if
@build
.
has_expiring_artifacts?
&&
can?
(
current_user
,
:update_build
,
@build
)
=
link_to
keep_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-secondary'
,
method: :post
do
=
link_to
keep_project_job_artifacts_path
(
@project
,
@build
),
class:
'btn btn-sm btn-secondary'
,
method: :post
do
Keep
Keep
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
-
if
@build
.
trigger_variables
.
any?
-
if
@build
.
trigger_variables
.
any?
%p
%p
%button
.btn.group.btn-group
-justified
.js-reveal-variables
Reveal Variables
%button
.btn.group.btn-group
.d-flex
.js-reveal-variables
Reveal Variables
%dl
.js-build-variables.trigger-build-variables.hide
%dl
.js-build-variables.trigger-build-variables.hide
-
@build
.
trigger_variables
.
each
do
|
trigger_variable
|
-
@build
.
trigger_variables
.
each
do
|
trigger_variable
|
...
...
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