Unverified Commit 57ab639c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Dashboard css improvements


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 95427becaaba
......@@ -395,3 +395,9 @@ table {
font-weight: bolder;
}
}
.side-filters {
fieldset {
margin-bottom: 15px;
}
}
.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 {
......
......@@ -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
......
- 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
......
= 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
- 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment