Commit 57ab639c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Dashboard css improvements

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 0392669c
...@@ -395,3 +395,9 @@ table { ...@@ -395,3 +395,9 @@ table {
font-weight: bolder; font-weight: bolder;
} }
} }
.side-filters {
fieldset {
margin-bottom: 15px;
}
}
.dashboard { .dashboard {
@extend .row;
.activities {
}
.side { .side {
@extend .pull-right;
.ui-box { .ui-box {
margin: 0px; margin: 0px;
box-shadow: none; box-shadow: none;
...@@ -108,7 +102,6 @@ ...@@ -108,7 +102,6 @@
padding: 8px 12px; padding: 8px 12px;
border-radius: 50px; border-radius: 50px;
background: #f5f5f5; background: #f5f5f5;
width: 16px;
text-align: center; text-align: center;
i { i {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
All projects you have access to are listed here. Public projects are not included here unless you are a member All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr %hr
.row .row
.col-md-3 .col-md-3.col-sm-4
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
= nav_tab :scope, nil do = nav_tab :scope, nil do
= link_to projects_dashboard_filter_path(scope: nil) do = link_to projects_dashboard_filter_path(scope: nil) do
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
%i.icon-tag %i.icon-tag
= label.name = label.name
.col-md-9 .col-md-9.col-sm-8
%ul.bordered-list.my-projects.top-list %ul.bordered-list.my-projects.top-list
- @projects.each do |project| - @projects.each do |project|
%li.my-project-row %li.my-project-row
......
- if @has_authorized_projects - if @has_authorized_projects
.dashboard .dashboard.row
.activities.col-md-8 .activities.col-md-8
= render 'activities' = render 'activities'
.side.col-md-4 .side.col-md-4.hidden-xs.hidden-sm
= render 'sidebar' = render 'sidebar'
- else - else
......
= form_tag filter_path(entity), method: 'get' do .side-filters
= form_tag filter_path(entity), method: 'get' do
%fieldset.scope-filter %fieldset.scope-filter
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
%li{class: ("active" if params[:scope].blank?)} %li{class: ("active" if params[:scope].blank?)}
...@@ -23,7 +24,7 @@ ...@@ -23,7 +24,7 @@
= link_to filter_path(entity, status: 'all') do = link_to filter_path(entity, status: 'all') do
All All
%fieldset %fieldset.hidden-xs.hidden-sm
%legend Projects %legend Projects
%ul.nav.nav-pills.nav-pills-small.nav-stacked %ul.nav.nav-pills.nav-pills-small.nav-stacked
- @projects.each do |project| - @projects.each do |project|
......
- 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 .no-ssh-key-message
.container .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 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