Commit 50c38980 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'remove-tags-scss' into 'master'

Remove tags.scss

Remove `tags.scss`

See merge request !7935
parents f8526a7f 9c149094
...@@ -268,6 +268,16 @@ ...@@ -268,6 +268,16 @@
width: auto; width: auto;
} }
} }
&.multi-line {
.nav-text {
line-height: 20px;
}
.nav-controls {
padding: 17px 0;
}
}
} }
.layout-nav { .layout-nav {
......
.tag-buttons {
line-height: 40px;
.btn:not(.dropdown-toggle) {
margin-left: 10px;
}
}
- if !project.empty_repo? && can?(current_user, :download_code, project) - if !project.empty_repo? && can?(current_user, :download_code, project)
%span{class: 'download-button'} .dropdown.inline.download-button
.dropdown.inline %button.btn{ 'data-toggle' => 'dropdown' }
%button.btn{ 'data-toggle' => 'dropdown' } = icon('download')
= icon('download') = icon("caret-down")
= icon("caret-down") %span.sr-only
%span.sr-only Select Archive Format
Select Archive Format %ul.dropdown-menu.dropdown-menu-align-right{ role: 'menu' }
%ul.dropdown-menu.dropdown-menu-align-right{ role: 'menu' } %li.dropdown-header Source code
%li.dropdown-header Source code %li
%li = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), rel: 'nofollow' do
= link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), rel: 'nofollow' do %i.fa.fa-download
%i.fa.fa-download %span Download zip
%span Download zip %li
%li = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
= link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do %i.fa.fa-download
%i.fa.fa-download %span Download tar.gz
%span Download tar.gz %li
%li = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
= link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do %i.fa.fa-download
%i.fa.fa-download %span Download tar.bz2
%span Download tar.bz2 %li
%li = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar'), rel: 'nofollow' do
= link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar'), rel: 'nofollow' do %i.fa.fa-download
%i.fa.fa-download %span Download tar
%span Download tar
- pipeline = project.pipelines.latest_successful_for(ref) - pipeline = project.pipelines.latest_successful_for(ref)
- if pipeline - if pipeline
- artifacts = pipeline.builds.latest.with_artifacts - artifacts = pipeline.builds.latest.with_artifacts
- if artifacts.any? - if artifacts.any?
%li.dropdown-header Artifacts %li.dropdown-header Artifacts
- unless pipeline.latest? - unless pipeline.latest?
- latest_pipeline = project.pipeline_for(ref) - latest_pipeline = project.pipeline_for(ref)
%li %li
.unclickable= ci_status_for_statuseable(latest_pipeline) .unclickable= ci_status_for_statuseable(latest_pipeline)
%li.dropdown-header Previous Artifacts %li.dropdown-header Previous Artifacts
- artifacts.each do |job| - artifacts.each do |job|
%li %li
= link_to latest_succeeded_namespace_project_artifacts_path(project.namespace, project, "#{ref}/download", job: job.name), rel: 'nofollow' do = link_to latest_succeeded_namespace_project_artifacts_path(project.namespace, project, "#{ref}/download", job: job.name), rel: 'nofollow' do
%i.fa.fa-download %i.fa.fa-download
%span Download '#{job.name}' %span Download '#{job.name}'
...@@ -3,8 +3,16 @@ ...@@ -3,8 +3,16 @@
= render "projects/commits/head" = render "projects/commits/head"
%div{ class: container_class } %div{ class: container_class }
.sub-header-block .top-area.multi-line
.pull-right.tag-buttons .nav-text
.title
%span.item-title= @tag.name
- if @commit
= render 'projects/branches/commit', commit: @commit, project: @project
- else
Cant find HEAD commit for this tag
.nav-controls
- if can?(current_user, :push_code, @project) - if can?(current_user, :push_code, @project)
= link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn has-tooltip', title: 'Edit release notes' do = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn has-tooltip', title: 'Edit release notes' do
= icon("pencil") = icon("pencil")
...@@ -15,15 +23,8 @@ ...@@ -15,15 +23,8 @@
= render 'projects/buttons/download', project: @project, ref: @tag.name = render 'projects/buttons/download', project: @project, ref: @tag.name
- if can?(current_user, :admin_project, @project) - if can?(current_user, :admin_project, @project)
.pull-right .pull-right
= link_to namespace_project_tag_path(@project.namespace, @project, @tag.name), class: 'btn btn-remove remove-row grouped has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{@tag.name}' tag cannot be undone. Are you sure?" } do = link_to namespace_project_tag_path(@project.namespace, @project, @tag.name), class: 'btn btn-remove remove-row has-tooltip', title: "Delete tag", method: :delete, data: { confirm: "Deleting the '#{@tag.name}' tag cannot be undone. Are you sure?" } do
%i.fa.fa-trash-o %i.fa.fa-trash-o
.tag-info.append-bottom-10
.title
%span.item-title= @tag.name
- if @commit
= render 'projects/branches/commit', commit: @commit, project: @project
- else
Cant find HEAD commit for this tag
- if @tag.message.present? - if @tag.message.present?
%pre.body %pre.body
= strip_gpg_signature(@tag.message) = strip_gpg_signature(@tag.message)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment