From b7427faa49752f97019d450980c53b8e2339f062 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Date: Thu, 3 Sep 2015 19:07:23 +0200 Subject: [PATCH] Improve starred and trending pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> --- app/assets/stylesheets/generic/blocks.scss | 4 ++++ app/assets/stylesheets/generic/common.scss | 2 +- app/assets/stylesheets/pages/projects.scss | 11 ---------- app/views/explore/projects/starred.html.haml | 8 +++++--- app/views/explore/projects/trending.html.haml | 20 ++++++++++--------- app/views/layouts/header/_public.html.haml | 2 +- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss index 01dec66e3d..e012ef2f06 100644 --- a/app/assets/stylesheets/generic/blocks.scss +++ b/app/assets/stylesheets/generic/blocks.scss @@ -30,4 +30,8 @@ .title { color: $gl-text-color; } + + .oneline { + line-height: 44px; + } } diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 1f5e972eed..11519268fe 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -301,7 +301,7 @@ table { } .btn-sign-in { - margin-top: 7px; + margin-top: 15px; text-shadow: none; } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 2095e73f55..24fc54ab30 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -259,17 +259,6 @@ pre.light-well { margin-bottom: 0px; border-top: 1px solid #e7e9ed; border-bottom: 1px solid #e7e9ed; - - - .projects-list-filter { - @include input-big; - padding: 5px 18px; - } - - .btn { - @include btn-big; - padding: 5px 18px; - } } /* diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml index 4a9fcae4be..a9df32f3d7 100644 --- a/app/views/explore/projects/starred.html.haml +++ b/app/views/explore/projects/starred.html.haml @@ -1,11 +1,13 @@ - page_title "Starred Projects" - if current_user = render 'dashboard/projects_head' + .explore-trending-block - .lead - %i.fa.fa-star - See most starred projects + .gray-content-block .pull-right = render 'explore/projects/dropdown' + .oneline + %i.fa.fa-star + See most starred projects = render 'projects', projects: @starred_projects = paginate @starred_projects, theme: 'gitlab' diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml index 1590bb9fc6..c1ef06f6cd 100644 --- a/app/views/explore/projects/trending.html.haml +++ b/app/views/explore/projects/trending.html.haml @@ -1,16 +1,18 @@ - page_title "Trending Projects" - if current_user = render 'dashboard/projects_head' - -.gray-content-block.explore-title - %h3 - Explore GitLab - %p.lead - Discover projects and groups. Share your projects with others +- else + .explore-title + %h3 + Explore GitLab + %p.lead + Discover projects and groups. Share your projects with others + %br .explore-trending-block - .lead - %i.fa.fa-comments-o - See most discussed projects for last month + .gray-content-block .pull-right = render 'explore/projects/dropdown' + .oneline + %i.fa.fa-comments-o + See most discussed projects for last month = render 'projects', projects: @trending_projects diff --git a/app/views/layouts/header/_public.html.haml b/app/views/layouts/header/_public.html.haml index 265937c7f4..a6a26518a0 100644 --- a/app/views/layouts/header/_public.html.haml +++ b/app/views/layouts/header/_public.html.haml @@ -3,7 +3,7 @@ .header-content - unless current_controller?('sessions') .pull-right - = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success btn-sm' + = link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success' %h1.title= title -- 2.30.9