From 57ab639c0dec366a7aecbe69490f0662f477ecd0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 31 Dec 2013 12:01:48 +0200 Subject: [PATCH] Dashboard css improvements Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/common.scss | 6 +++ app/assets/stylesheets/sections/dashboard.scss | 7 --- app/views/dashboard/projects.html.haml | 4 +- app/views/dashboard/show.html.haml | 4 +- app/views/shared/_filter.html.haml | 75 +++++++++++++------------- app/views/shared/_no_ssh.html.haml | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 01cdbb4e8..56ec8593c 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -395,3 +395,9 @@ table { font-weight: bolder; } } + +.side-filters { + fieldset { + margin-bottom: 15px; + } +} diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss index cc5c25ff9..1fd82c84f 100644 --- a/app/assets/stylesheets/sections/dashboard.scss +++ b/app/assets/stylesheets/sections/dashboard.scss @@ -1,11 +1,5 @@ .dashboard { - @extend .row; - .activities { - } - .side { - @extend .pull-right; - .ui-box { margin: 0px; box-shadow: none; @@ -108,7 +102,6 @@ padding: 8px 12px; border-radius: 50px; background: #f5f5f5; - width: 16px; text-align: center; i { diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml index 33bd40743..58812674b 100644 --- a/app/views/dashboard/projects.html.haml +++ b/app/views/dashboard/projects.html.haml @@ -25,7 +25,7 @@ All projects you have access to are listed here. Public projects are not included here unless you are a member %hr .row - .col-md-3 + .col-md-3.col-sm-4 %ul.nav.nav-pills.nav-stacked = nav_tab :scope, nil do = link_to projects_dashboard_filter_path(scope: nil) do @@ -81,7 +81,7 @@ %i.icon-tag = label.name - .col-md-9 + .col-md-9.col-sm-8 %ul.bordered-list.my-projects.top-list - @projects.each do |project| %li.my-project-row diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index b2198f76f..5a8abb25d 100644 --- a/app/views/dashboard/show.html.haml +++ b/app/views/dashboard/show.html.haml @@ -1,8 +1,8 @@ - if @has_authorized_projects - .dashboard + .dashboard.row .activities.col-md-8 = render 'activities' - .side.col-md-4 + .side.col-md-4.hidden-xs.hidden-sm = render 'sidebar' - else diff --git a/app/views/shared/_filter.html.haml b/app/views/shared/_filter.html.haml index 13bda305d..182836e93 100644 --- a/app/views/shared/_filter.html.haml +++ b/app/views/shared/_filter.html.haml @@ -1,41 +1,42 @@ -= form_tag filter_path(entity), method: 'get' do - %fieldset.scope-filter - %ul.nav.nav-pills.nav-stacked - %li{class: ("active" if params[:scope].blank?)} - = link_to filter_path(entity, scope: nil) do - Assigned to me - %li{class: ("active" if params[:scope] == 'authored')} - = link_to filter_path(entity, scope: 'authored') do - Created by me - %li{class: ("active" if params[:scope] == 'all')} - = link_to filter_path(entity, scope: 'all') do - All +.side-filters + = form_tag filter_path(entity), method: 'get' do + %fieldset.scope-filter + %ul.nav.nav-pills.nav-stacked + %li{class: ("active" if params[:scope].blank?)} + = link_to filter_path(entity, scope: nil) do + Assigned to me + %li{class: ("active" if params[:scope] == 'authored')} + = link_to filter_path(entity, scope: 'authored') do + Created by me + %li{class: ("active" if params[:scope] == 'all')} + = link_to filter_path(entity, scope: 'all') do + All - %fieldset.status-filter - %ul.nav.nav-pills.nav-stacked - %li{class: ("active" if params[:status].blank?)} - = link_to filter_path(entity, status: nil) do - Open - %li{class: ("active" if params[:status] == 'closed')} - = link_to filter_path(entity, status: 'closed') do - Closed - %li{class: ("active" if params[:status] == 'all')} - = link_to filter_path(entity, status: 'all') do - All + %fieldset.status-filter + %ul.nav.nav-pills.nav-stacked + %li{class: ("active" if params[:status].blank?)} + = link_to filter_path(entity, status: nil) do + Open + %li{class: ("active" if params[:status] == 'closed')} + = link_to filter_path(entity, status: 'closed') do + Closed + %li{class: ("active" if params[:status] == 'all')} + = link_to filter_path(entity, status: 'all') do + All - %fieldset - %legend Projects - %ul.nav.nav-pills.nav-pills-small.nav-stacked - - @projects.each do |project| - - unless entities_per_project(project, entity).zero? - %li{class: ("active" if params[:project_id] == project.id.to_s)} - = link_to filter_path(entity, project_id: project.id) do - = project.name_with_namespace - %small.pull-right= entities_per_project(project, entity) + %fieldset.hidden-xs.hidden-sm + %legend Projects + %ul.nav.nav-pills.nav-pills-small.nav-stacked + - @projects.each do |project| + - unless entities_per_project(project, entity).zero? + %li{class: ("active" if params[:project_id] == project.id.to_s)} + = link_to filter_path(entity, project_id: project.id) do + = project.name_with_namespace + %small.pull-right= entities_per_project(project, entity) - %fieldset - - if params[:status].present? || params[:project_id].present? - = link_to filter_path(entity, status: nil, project_id: nil), class: 'pull-right cgray' do - %i.icon-remove - %strong Clear filter + %fieldset + - if params[:status].present? || params[:project_id].present? + = link_to filter_path(entity, status: nil, project_id: nil), class: 'pull-right cgray' do + %i.icon-remove + %strong Clear filter diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml index 62093a294..077e6c6a8 100644 --- a/app/views/shared/_no_ssh.html.haml +++ b/app/views/shared/_no_ssh.html.haml @@ -1,4 +1,4 @@ -- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.gl-hide_no_ssh_key +- if cookies[:hide_no_ssh_message].blank? && current_user.require_ssh_key? && !current_user.hide_no_ssh_key .no-ssh-key-message .container You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile -- 2.11.0