diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-26 09:16:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-26 09:16:39 +0000 |
| commit | de9f348dfa43ebb1a1c10e8c25ebbbbdb8121be5 (patch) | |
| tree | 730079c5f817836ed089ebe725e9648ea2ca24f4 | |
| parent | 068dcefc8645c6abbcf1b7f6fa23ea49e526c501 (diff) | |
| parent | 735978388f62787dc69c97cd267359693fde6415 (diff) | |
| download | gitlab-ce-de9f348dfa43ebb1a1c10e8c25ebbbbdb8121be5.tar.gz | |
Merge branch 'ui-improvements' into 'master'
Ui improvements
* Improve project name/description look on project page
* Increase width of sidebar for several pages
See merge request !1206
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 3 | ||||
| -rw-r--r-- | app/views/dashboard/projects/starred.html.haml | 4 | ||||
| -rw-r--r-- | app/views/groups/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 4 |
5 files changed, 10 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 33ebaae34ad..4d065c3bdf6 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -39,9 +39,12 @@ margin: 0; margin-bottom: 10px; font-size: 26px; + font-weight: bold; } p { + font-size: 18px; + color: #666; display: inline; } } diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml index 027387028b9..6dcfd497ed2 100644 --- a/app/views/dashboard/projects/starred.html.haml +++ b/app/views/dashboard/projects/starred.html.haml @@ -5,9 +5,9 @@ = render 'shared/show_aside' .dashboard.row - %section.activities.col-md-8 + %section.activities.col-md-7 = render 'dashboard/activities' - %aside.col-md-4 + %aside.col-md-5 .panel.panel-default.projects-list-holder .panel-heading.clearfix .input-group diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index d31dae7d648..0577f4ec142 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -17,7 +17,7 @@ = render 'shared/show_aside' .row - %section.activities.col-md-8 + %section.activities.col-md-7 .hidden-xs - if current_user = render "events/event_last_push", event: @last_push @@ -33,5 +33,5 @@ .content_list = spinner - %aside.side.col-md-4 + %aside.side.col-md-5 = render "projects", projects: @projects diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index bec40ec27a5..b93036e78e6 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -2,7 +2,7 @@ .project-home-panel.clearfix{:class => ("empty-project" if empty_repo)} .project-identicon-holder = project_icon(@project, alt: '', class: 'project-avatar avatar s90') - .project-home-desc.lead + .project-home-desc %h1= @project.name - if @project.description.present? = markdown(@project.description, pipeline: :description) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 64b7f25ad37..aa4e8722fb1 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -7,7 +7,7 @@ = render 'shared/show_aside' .row - %section.col-md-8 + %section.col-md-7 .header-with-avatar = link_to avatar_icon(@user.email, 400), target: '_blank' do = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' @@ -59,7 +59,7 @@ .content_list = spinner - %aside.col-md-4 + %aside.col-md-5 = render 'profile', user: @user = render 'projects', projects: @projects, contributed_projects: @contributed_projects |