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
601b5adf
Commit
601b5adf
authored
Feb 21, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use a btn-group to group all action buttons
parent
51546e26
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
39 deletions
+42
-39
app/assets/javascripts/environments/components/environment_actions.js.es6
...cripts/environments/components/environment_actions.js.es6
+19
-19
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+6
-19
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+17
-1
No files found.
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @
601b5adf
...
@@ -15,12 +15,12 @@ module.exports = Vue.component('actions-component', {
...
@@ -15,12 +15,12 @@ module.exports = Vue.component('actions-component', {
},
},
template: `
template: `
<div class="
inline
">
<div class="
btn-group" role="group
">
<
div class
="dropdown">
<
button class="dropdown btn btn-default dropdown-new" data-toggle
="dropdown">
<
a class="dropdown-new btn btn-default" data-toggle="dropdown"
>
<
span
>
<span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
<span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
<i class="fa fa-caret-down"></i>
<i class="fa fa-caret-down"></i>
</
a
>
</
span
>
<ul class="dropdown-menu dropdown-menu-align-right">
<ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions">
<li v-for="action in actions">
...
@@ -37,7 +37,7 @@ module.exports = Vue.component('actions-component', {
...
@@ -37,7 +37,7 @@ module.exports = Vue.component('actions-component', {
</a>
</a>
</li>
</li>
</ul>
</ul>
</div
>
</button
>
</div>
</div>
`,
`,
});
});
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
601b5adf
...
@@ -505,39 +505,26 @@ module.exports = Vue.component('environment-item', {
...
@@ -505,39 +505,26 @@ module.exports = Vue.component('environment-item', {
<td class="hidden-xs">
<td class="hidden-xs">
<div v-if="!model.isFolder">
<div v-if="!model.isFolder">
<div v-if="hasManualActions && canCreateDeployment"
<div class="btn-group" role="group">
class="inline js-manual-actions-container">
<actions-component v-if="hasManualActions && canCreateDeployment"
<actions-component
:play-icon-svg="playIconSvg"
:play-icon-svg="playIconSvg"
:actions="manualActions">
:actions="manualActions">
</actions-component>
</actions-component>
</div>
<div v-if="externalURL && canReadEnvironment"
<external-url-component v-if="externalURL && canReadEnvironment"
class="inline js-external-url-container">
<external-url-component
:external-url="externalURL">
:external-url="externalURL">
</external-url-component>
</external-url-component>
</div>
<div v-if="hasStopAction && canCreateDeployment"
<stop-component v-if="hasStopAction && canCreateDeployment"
class="inline js-stop-component-container">
<stop-component
:stop-url="model.stop_path">
:stop-url="model.stop_path">
</stop-component>
</stop-component>
</div>
<div v-if="model && model.terminal_path"
<terminal-button-component v-if="model && model.terminal_path"
class="inline js-terminal-button-container">
<terminal-button-component
:terminal-icon-svg="terminalIconSvg"
:terminal-icon-svg="terminalIconSvg"
:terminal-path="model.terminal_path">
:terminal-path="model.terminal_path">
</terminal-button-component>
</terminal-button-component>
</div>
<div v-if="canRetry && canCreateDeployment"
<rollback-component v-if="canRetry && canCreateDeployment"
class="inline js-rollback-component-container">
<rollback-component
:is-last-deployment="isLastDeployment"
:is-last-deployment="isLastDeployment"
:retry-url="retryUrl">
:retry-url="retryUrl">
</rollback-component>
</rollback-component>
...
...
app/assets/stylesheets/pages/environments.scss
View file @
601b5adf
...
@@ -35,7 +35,6 @@
...
@@ -35,7 +35,6 @@
display
:
table-cell
;
display
:
table-cell
;
}
}
.environments-name
,
.environments-commit
,
.environments-commit
,
.environments-actions
{
.environments-actions
{
width
:
20%
;
width
:
20%
;
...
@@ -45,6 +44,7 @@
...
@@ -45,6 +44,7 @@
width
:
10%
;
width
:
10%
;
}
}
.environments-name
,
.environments-deploy
,
.environments-deploy
,
.environments-build
{
.environments-build
{
width
:
15%
;
width
:
15%
;
...
@@ -62,6 +62,22 @@
...
@@ -62,6 +62,22 @@
}
}
}
}
.btn-group
{
>
a
{
color
:
$gl-text-color-secondary
;
}
svg
path
{
fill
:
$gl-text-color-secondary
;
}
.dropdown
{
outline
:
none
;
}
}
.commit-title
{
.commit-title
{
margin
:
0
;
margin
:
0
;
}
}
...
...
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