Download as
Browse Code »

Commit 1bde927750b60d17334e188b70959059f3b00060

Authored by Dmitriy Zaporozhets
1 parent 98416ec9
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Restyle git tags page 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 4 changed files with 15 additions and 21 deletions   Show diff stats
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @1bde927
@@ -179,11 +179,6 @@ ul.nav.nav-projects-tabs { @@ -179,11 +179,6 @@ ul.nav.nav-projects-tabs {
179 font-weight: normal; 179 font-weight: normal;
180 } 180 }
181 181
182 -.new-tag-btn {  
183 - position: relative;  
184 - top: -5px;  
185 -}  
186 -  
187 .public-projects .repo-info { 182 .public-projects .repo-info {
188 color: #777; 183 color: #777;
189 184
app/views/projects/tags/_tag.html.haml
  Diff comments   View file @1bde927
@@ -5,18 +5,15 @@ @@ -5,18 +5,15 @@
5 %i.icon-tag 5 %i.icon-tag
6 = tag.name 6 = tag.name
7 .pull-right 7 .pull-right
8 - %small.cdark  
9 - %i.icon-calendar  
10 - #{time_ago_with_tooltip(commit.committed_date)}  
11 - %p.prepend-left-20  
12 - = link_to commit.short_id(8), project_commit_path(@project, commit), class: "monospace"  
13 - &ndash;  
14 - = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "cdark"  
15 -  
16 - %span.pull-right  
17 - if can? current_user, :download_code, @project 8 - if can? current_user, :download_code, @project
18 = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small' 9 = render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small'
19 - if can?(current_user, :admin_project, @project) 10 - if can?(current_user, :admin_project, @project)
20 = 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 11 = 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
21 %i.icon-trash 12 %i.icon-trash
22 13
  14 + - if commit
  15 + %ul.list-unstyled
  16 + = render 'projects/commits/inline_commit', commit: commit, project: @project
  17 + - else
  18 + %p
  19 + Cant find HEAD commit for this tag
app/views/projects/tags/index.html.haml
  Diff comments   View file @1bde927
1 = render "projects/commits/head" 1 = render "projects/commits/head"
2 2
3 -- if can? current_user, :push_code, @project  
4 - .pull-right  
5 - = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do  
6 - %i.icon-add-sign  
7 - New tag 3 +%h3.page-title
  4 + Git Tags
  5 + - if can? current_user, :push_code, @project
  6 + .pull-right
  7 + = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do
  8 + %i.icon-add-sign
  9 + New tag
8 10
9 -%p 11 +%p.light
10 Tags give the ability to mark specific points in history as being important 12 Tags give the ability to mark specific points in history as being important
11 %hr 13 %hr
12 14
app/views/projects/tree/_tree.html.haml
  Diff comments   View file @1bde927
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %li 12 %li
13 = link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do 13 = link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do
14 %small 14 %small
15 - %i.icon-plus.light 15 + %i.icon-plus
16 16
17 %div#tree-content-holder.tree-content-holder 17 %div#tree-content-holder.tree-content-holder
18 %table#tree-slider{class: "table_#{@hex_path} tree-table" } 18 %table#tree-slider{class: "table_#{@hex_path} tree-table" }