Fix wrong placement of show-aside link
This commit is contained in:
parent
f0c4c51f83
commit
f28f5e49f6
10 changed files with 22 additions and 19 deletions
|
@ -1,6 +1,6 @@
|
|||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
%aside.col-md-3
|
||||
.admin-filter
|
||||
= form_tag admin_namespaces_projects_path, method: :get, class: '' do
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
%aside.col-md-3
|
||||
.admin-filter
|
||||
%ul.nav.nav-pills.nav-stacked
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
- if @projects.any?
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.dashboard.row
|
||||
%section.activities.col-md-8
|
||||
= render 'dashboard/activities'
|
||||
|
@ -15,9 +17,6 @@
|
|||
= render 'shared/projects_list', projects: @projects,
|
||||
projects_limit: 20, stars: true, avatar: false
|
||||
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
|
||||
- else
|
||||
%h3 You don't have starred projects yet
|
||||
%p.slead Visit project page and press on star icon and it will appear on this page.
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
= auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
|
||||
|
||||
- if @projects.any?
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.dashboard.row
|
||||
%section.activities.col-md-8
|
||||
= render 'activities'
|
||||
%aside.col-md-4
|
||||
= render 'sidebar'
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
|
||||
- else
|
||||
= render "zero_authorized_projects"
|
||||
|
|
|
@ -13,6 +13,9 @@
|
|||
.description
|
||||
= escaped_autolink(@group.description)
|
||||
%hr
|
||||
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
%section.activities.col-md-8
|
||||
.hidden-xs
|
||||
|
@ -33,5 +36,3 @@
|
|||
= spinner
|
||||
%aside.side.col-md-4
|
||||
= render "projects", projects: @projects
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
|
|
|
@ -4,6 +4,9 @@
|
|||
= link_to 'Reopen Issue', issue_path(@issue, issue: {state_event: :reopen }, status_only: true), method: :put, class: "btn btn-grouped btn-reopen js-note-target-reopen", title: 'Reopen Issue'
|
||||
- else
|
||||
= link_to 'Close Issue', issue_path(@issue, issue: {state_event: :close }, status_only: true), method: :put, class: "btn btn-grouped btn-close js-note-target-close", title: "Close Issue"
|
||||
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
%section.col-md-9
|
||||
.votes-holder.pull-right
|
||||
|
@ -29,5 +32,3 @@
|
|||
- @issue.labels.each do |label|
|
||||
= link_to namespace_project_issues_path(@project.namespace, @project, label_name: label.name) do
|
||||
= render_colored_label(label)
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
- if @merge_request.closed?
|
||||
= link_to 'Reopen', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request"
|
||||
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
%section.col-md-9
|
||||
.votes-holder.pull-right
|
||||
|
@ -27,5 +29,3 @@
|
|||
- @merge_request.labels.each do |label|
|
||||
= link_to namespace_project_merge_requests_path(@project.namespace, @project, label_name: label.name) do
|
||||
= render_colored_label(label)
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
|
|
|
@ -37,9 +37,9 @@
|
|||
|
||||
.tab-content
|
||||
.tab-pane.active#tab-activity
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
%section.col-md-9
|
||||
.hidden-xs
|
||||
= render "events/event_last_push", event: @last_push
|
||||
|
|
2
app/views/shared/_show_aside.html.haml
Normal file
2
app/views/shared/_show_aside.html.haml
Normal file
|
@ -0,0 +1,2 @@
|
|||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
|
@ -1,9 +1,9 @@
|
|||
= content_for :meta_tags do
|
||||
= auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity")
|
||||
|
||||
= render 'shared/show_aside'
|
||||
|
||||
.row
|
||||
= link_to '#aside', class: 'show-aside' do
|
||||
%i.fa.fa-angle-left
|
||||
%section.col-md-8
|
||||
.header-with-avatar
|
||||
= image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
|
||||
|
|
Loading…
Reference in a new issue