diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-12 23:08:54 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-12 23:08:54 +0400 |
commit | 1bde927750b60d17334e188b70959059f3b00060 (patch) | |
tree | 9010054ff31bb61c334a8d8d5eecc735878a7d79 /app | |
parent | 98416ec9ab805b0afb994972e073b743b8204312 (diff) |
Restyle git tags page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/sections/projects.scss | 5 | ||||
-rw-r--r-- | app/views/projects/tags/_tag.html.haml | 15 | ||||
-rw-r--r-- | app/views/projects/tags/index.html.haml | 14 | ||||
-rw-r--r-- | app/views/projects/tree/_tree.html.haml | 2 |
4 files changed, 15 insertions, 21 deletions
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 9fbed704baa..71f5f1663cc 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -179,11 +179,6 @@ ul.nav.nav-projects-tabs { font-weight: normal; } -.new-tag-btn { - position: relative; - top: -5px; -} - .public-projects .repo-info { color: #777; diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml index 67d771c9707..9ed737b181f 100644 --- a/app/views/projects/tags/_tag.html.haml +++ b/app/views/projects/tags/_tag.html.haml @@ -5,18 +5,15 @@ %i.icon-tag = tag.name .pull-right - %small.cdark - %i.icon-calendar - #{time_ago_with_tooltip(commit.committed_date)} - %p.prepend-left-20 - = link_to commit.short_id(8), project_commit_path(@project, commit), class: "monospace" - – - = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "cdark" - - %span.pull-right - if can? current_user, :download_code, @project = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small' - if can?(current_user, :admin_project, @project) = link_to project_tag_path(@project, tag.name), class: 'btn btn-small btn-remove remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do %i.icon-trash + - if commit + %ul.list-unstyled + = render 'projects/commits/inline_commit', commit: commit, project: @project + - else + %p + Cant find HEAD commit for this tag diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml index 08122fb884f..dc3188d43b8 100644 --- a/app/views/projects/tags/index.html.haml +++ b/app/views/projects/tags/index.html.haml @@ -1,12 +1,14 @@ = render "projects/commits/head" -- if can? current_user, :push_code, @project - .pull-right - = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do - %i.icon-add-sign - New tag +%h3.page-title + Git Tags + - if can? current_user, :push_code, @project + .pull-right + = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do + %i.icon-add-sign + New tag -%p +%p.light Tags give the ability to mark specific points in history as being important %hr diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml index dbb74a1cafb..fe572260e0c 100644 --- a/app/views/projects/tree/_tree.html.haml +++ b/app/views/projects/tree/_tree.html.haml @@ -12,7 +12,7 @@ %li = link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do %small - %i.icon-plus.light + %i.icon-plus %div#tree-content-holder.tree-content-holder %table#tree-slider{class: "table_#{@hex_path} tree-table" } |