diff options
| author | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-10-11 23:43:10 +0200 |
|---|---|---|
| committer | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-10-11 23:43:10 +0200 |
| commit | 7ca77debf39f5990440bf29c162969895f21b54b (patch) | |
| tree | 28a16b69a45ffd9888ee1ff32f6f96f7cfeb6987 | |
| parent | dfecbf06b7f39a1ed4a40a77fa3782cce13e8b1d (diff) | |
| download | gitlab-ce-7ca77debf39f5990440bf29c162969895f21b54b.tar.gz | |
fixed terminal button
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/deployments/_actions.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/icons/_icon_terminal.svg | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index d11b2fe7ec2..371f1dfe1bb 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -219,6 +219,13 @@ } } +.btn-terminal{ + svg{ + height: 14px; + width: 18px; + } +} + .btn-lg { padding: 12px 20px; } diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index cc0264a8ab4..9f249c43673 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -1,14 +1,14 @@ - if can?(current_user, :create_deployment, deployment) && deployment.deployable .pull-right - + - external_url = deployment.environment.external_url - if external_url = link_to external_url, target: '_blank', class: 'btn external-url' do = icon('external-link') - + - actions = deployment.manual_actions - if actions.present? - %a.btn.btn-default{href: 'deployments/1/terminal'} + %a.btn.btn-default.btn-terminal{href: 'deployments/1/terminal'} = custom_icon('icon_terminal') .inline .dropdown diff --git a/app/views/shared/icons/_icon_terminal.svg b/app/views/shared/icons/_icon_terminal.svg index 0f56540b684..c80f44c3edf 100644 --- a/app/views/shared/icons/_icon_terminal.svg +++ b/app/views/shared/icons/_icon_terminal.svg @@ -1 +1 @@ -<svg width="19" height="14" viewBox="0 0 19 14" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><title>Icon</title><defs><rect id="a" width="19" height="14" rx="2.5"/><mask id="b" x="0" y="0" width="19" height="14" fill="#fff"><use xlink:href="#a"/></mask></defs><g fill="none" fill-rule="evenodd"><rect fill="#848484" x="7.2" y="9.25" width="6.46" height="1.5" rx=".5"/><path d="M5.851 7.016L3.81 9.103a.503.503 0 0 0 .017.709l.35.334c.207.198.524.191.717-.006l2.687-2.748a.493.493 0 0 0 .137-.376.493.493 0 0 0-.137-.376L4.894 3.892a.507.507 0 0 0-.717-.006l-.35.334a.503.503 0 0 0-.017.709L5.85 7.016z" fill="#848484"/><use stroke="#848484" mask="url(#b)" stroke-width="2.5" xlink:href="#a"/></g></svg> +<svg width="19" height="14" viewBox="0 0 19 14" xmlns="http://www.w3.org/2000/svg"><rect fill="#848484" x="7.2" y="9.25" width="6.46" height="1.5" rx=".5"/><path d="M5.851 7.016L3.81 9.103a.503.503 0 0 0 .017.709l.35.334c.207.198.524.191.717-.006l2.687-2.748a.493.493 0 0 0 .137-.376.493.493 0 0 0-.137-.376L4.894 3.892a.507.507 0 0 0-.717-.006l-.35.334a.503.503 0 0 0-.017.709L5.85 7.016z"/><path d="M1.25 11.497c0 .691.562 1.253 1.253 1.253h13.994c.694 0 1.253-.56 1.253-1.253V2.503c0-.691-.562-1.253-1.253-1.253H2.503c-.694 0-1.253.56-1.253 1.253v8.994zM2.503 0h13.994A2.504 2.504 0 0 1 19 2.503v8.994A2.501 2.501 0 0 1 16.497 14H2.503A2.504 2.504 0 0 1 0 11.497V2.503A2.501 2.501 0 0 1 2.503 0z"/></svg> |
