From ef646928e4f89586d7057c91aee2678c3f89f363 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 1 Mar 2013 16:26:26 +0200 Subject: [PATCH] better presenting for group description --- app/assets/stylesheets/gitlab_bootstrap/common.scss | 2 ++ app/views/groups/new.html.haml | 3 +-- app/views/groups/show.html.haml | 8 +++----- app/views/teams/new.html.haml | 1 - app/views/teams/show.html.haml | 8 +++----- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index dcfd610e..9e015eb2 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -30,6 +30,8 @@ border-color: #DDD; } +.well { padding: 15px; } + /** HELPERS **/ .nothing_here_message { text-align: center; diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml index 2104db86..36ee4922 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -16,10 +16,9 @@ = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 .form-actions - = f.submit 'Create group', class: "btn btn-primary" + = f.submit 'Create group', class: "btn btn-create" - %hr .padded %ul %li Group is kind of directory for several projects diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index fe08e0b5..81694b88 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -1,8 +1,3 @@ -- if @group.description.present? - .description - = @group.description - %hr - .projects .activities.span8 = render "events/event_last_push", event: @last_push @@ -17,6 +12,9 @@ %p.nothing_here_message Project activity will be displayed here .loading.hide .side.span4 + - if @group.description.present? + .description.well.light + = @group.description = render "projects", projects: @projects %div %span.rss-icon diff --git a/app/views/teams/new.html.haml b/app/views/teams/new.html.haml index 332a6a55..99d30821 100644 --- a/app/views/teams/new.html.haml +++ b/app/views/teams/new.html.haml @@ -18,7 +18,6 @@ .form-actions = f.submit 'Create team', class: "btn btn-create" - %hr .padded %ul %li All created teams are public (users can view who enter into team and which project are assigned for this team) diff --git a/app/views/teams/show.html.haml b/app/views/teams/show.html.haml index 34be7692..43cc026a 100644 --- a/app/views/teams/show.html.haml +++ b/app/views/teams/show.html.haml @@ -1,8 +1,3 @@ -- if @team.description.present? - .description - = @team.description - %hr - .projects .activities.span8 = link_to dashboard_path, class: 'btn btn-tiny' do @@ -16,6 +11,9 @@ %p.nothing_here_message Projects activity will be displayed here .loading.hide .side.span4 + - if @team.description.present? + .description.well.light + = @team.description = render "projects", projects: @projects %div %span.rss-icon