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
Jérome Perrin
gitlab-ce
Commits
abe35457
Commit
abe35457
authored
Nov 17, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create global secondary inverted button
parent
4ce2ca4d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+4
-2
app/views/projects/builds/_header.html.haml
app/views/projects/builds/_header.html.haml
+1
-1
app/views/projects/pipelines/_info.html.haml
app/views/projects/pipelines/_info.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
abe35457
...
@@ -345,8 +345,10 @@
...
@@ -345,8 +345,10 @@
}
}
}
}
.retry-build-btn
{
.btn-inverted
{
&
-secondary
{
@include
btn-outline
(
$white-light
,
$blue-normal
,
$blue-normal
,
$blue-light
,
$white-light
,
$blue-light
);
@include
btn-outline
(
$white-light
,
$blue-normal
,
$blue-normal
,
$blue-light
,
$white-light
,
$blue-light
);
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
...
...
app/views/projects/builds/_header.html.haml
View file @
abe35457
...
@@ -14,6 +14,6 @@
...
@@ -14,6 +14,6 @@
=
render
"user"
=
render
"user"
=
time_ago_with_tooltip
(
@build
.
created_at
)
=
time_ago_with_tooltip
(
@build
.
created_at
)
-
if
can?
(
current_user
,
:update_build
,
@build
)
&&
@build
.
retryable?
-
if
can?
(
current_user
,
:update_build
,
@build
)
&&
@build
.
retryable?
=
link_to
"Retry build"
,
retry_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn
retry-build-btn
pull-right'
,
method: :post
=
link_to
"Retry build"
,
retry_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn
btn-inverted-secondary
pull-right'
,
method: :post
%button
.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle
{
role:
"button"
,
type:
"button"
}
%button
.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle
{
role:
"button"
,
type:
"button"
}
=
icon
(
'angle-double-left'
)
=
icon
(
'angle-double-left'
)
app/views/projects/pipelines/_info.html.haml
View file @
abe35457
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
.header-action-buttons
.header-action-buttons
-
if
can?
(
current_user
,
:update_pipeline
,
@pipeline
.
project
)
-
if
can?
(
current_user
,
:update_pipeline
,
@pipeline
.
project
)
-
if
@pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
-
if
@pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
=
link_to
"Retry failed"
,
retry_namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
class:
'btn
retry-build-btn
'
,
method: :post
=
link_to
"Retry failed"
,
retry_namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
class:
'btn
btn-inverted-secondary
'
,
method: :post
-
if
@pipeline
.
builds
.
running_or_pending
.
any?
-
if
@pipeline
.
builds
.
running_or_pending
.
any?
=
link_to
"Cancel running"
,
cancel_namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
=
link_to
"Cancel running"
,
cancel_namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
...
...
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