Update style of snippets pages

This commit is contained in:
Douwe Maan 2015-10-18 13:03:26 +02:00
parent b371b6d139
commit 946f00ed7f
6 changed files with 15 additions and 44 deletions

View file

@ -59,7 +59,7 @@ v 8.1.0 (unreleased)
- Fix position of hamburger in header for smaller screens (Han Loong Liauw) - Fix position of hamburger in header for smaller screens (Han Loong Liauw)
- Fix bug where Emojis in Markdown would truncate remaining text (Sakata Sinji) - Fix bug where Emojis in Markdown would truncate remaining text (Sakata Sinji)
- Persist filters when sorting on admin user page (Jerry Lukins) - Persist filters when sorting on admin user page (Jerry Lukins)
- Update style of snippet detail page (Han Loong Liauw) - Update style of snippets pages (Han Loong Liauw)
- Allow dashboard and group issues/MRs to be filtered by label - Allow dashboard and group issues/MRs to be filtered by label
- Add spellcheck=false to certain input fields - Add spellcheck=false to certain input fields
- Invalidate stored service password if the endpoint URL is changed - Invalidate stored service password if the endpoint URL is changed

View file

@ -1,8 +1,3 @@
.my-snippets li:first-child {
h4 { margin-top: 0; }
padding-top: 0;
}
.snippet-form-holder .file-holder .file-title { .snippet-form-holder .file-holder .file-title {
padding: 2px; padding: 2px;
} }

View file

@ -21,6 +21,7 @@ class Projects::SnippetsController < Projects::ApplicationController
filter: :by_project, filter: :by_project,
project: @project project: @project
}) })
@snippets = @snippets.page(params[:page]).per(PER_PAGE)
end end
def new def new

View file

@ -6,33 +6,11 @@
.gray-content-block .gray-content-block
.pull-right .pull-right
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
Add new snippet = icon('plus')
New Snippet
.oneline .oneline
Share code pastes with others out of git repository Share code pastes with others out of git repository
%ul.nav.nav-tabs.prepend-top-20 = render 'snippets/snippets'
= nav_tab :scope, nil do
= link_to dashboard_snippets_path do
All
%span.badge
= current_user.snippets.count
= nav_tab :scope, 'are_private' do
= link_to dashboard_snippets_path(scope: 'are_private') do
Private
%span.badge
= current_user.snippets.are_private.count
= nav_tab :scope, 'are_internal' do
= link_to dashboard_snippets_path(scope: 'are_internal') do
Internal
%span.badge
= current_user.snippets.are_internal.count
= nav_tab :scope, 'are_public' do
= link_to dashboard_snippets_path(scope: 'are_public') do
Public
%span.badge
= current_user.snippets.are_public.count
.my-snippets
= render 'snippets/snippets'

View file

@ -10,7 +10,8 @@
- if current_user - if current_user
.pull-right .pull-right
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
Add new snippet = icon('plus')
New Snippet
.oneline .oneline
Public snippets created by you and other users are listed here Public snippets created by you and other users are listed here

View file

@ -1,17 +1,13 @@
- page_title "Snippets" - page_title "Snippets"
= render "header_title" = render "header_title"
%h3.page-title .gray-content-block.top-block
Snippets .pull-right
- if can? current_user, :create_project_snippet, @project = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new", title: "New Snippet" do
= link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new pull-right", title: "New Snippet" do = icon('plus')
Add new snippet New Snippet
%p.light .oneline
Share code pastes with others out of git repository Share code pastes with others out of git repository
%ul.bordered-list = render 'snippets/snippets'
= render partial: "shared/snippets/snippet", collection: @snippets
- if @snippets.empty?
%li
.nothing-here-block Nothing here.