Download as
Browse Code »

Commit ef646928e4f89586d7057c91aee2678c3f89f363

Authored by Dmitriy Zaporozhets
1 parent 87f555e1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

better presenting for group description

Showing 5 changed files with 9 additions and 13 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @ef64692
... ... @@ -30,6 +30,8 @@
30 30 border-color: #DDD;
31 31 }
32 32  
  33 +.well { padding: 15px; }
  34 +
33 35 /** HELPERS **/
34 36 .nothing_here_message {
35 37 text-align: center;
... ...
app/views/groups/new.html.haml
  Diff comments   View file @ef64692
... ... @@ -16,10 +16,9 @@
16 16 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
17 17  
18 18 .form-actions
19   - = f.submit 'Create group', class: "btn btn-primary"
  19 + = f.submit 'Create group', class: "btn btn-create"
20 20  
21 21  
22   - %hr
23 22 .padded
24 23 %ul
25 24 %li Group is kind of directory for several projects
... ...
app/views/groups/show.html.haml
  Diff comments   View file @ef64692
1   -- if @group.description.present?
2   - .description
3   - = @group.description
4   - %hr
5   -
6 1 .projects
7 2 .activities.span8
8 3 = render "events/event_last_push", event: @last_push
... ... @@ -17,6 +12,9 @@
17 12 %p.nothing_here_message Project activity will be displayed here
18 13 .loading.hide
19 14 .side.span4
  15 + - if @group.description.present?
  16 + .description.well.light
  17 + = @group.description
20 18 = render "projects", projects: @projects
21 19 %div
22 20 %span.rss-icon
... ...
app/views/teams/new.html.haml
  Diff comments   View file @ef64692
... ... @@ -18,7 +18,6 @@
18 18 .form-actions
19 19 = f.submit 'Create team', class: "btn btn-create"
20 20  
21   - %hr
22 21 .padded
23 22 %ul
24 23 %li All created teams are public (users can view who enter into team and which project are assigned for this team)
... ...
app/views/teams/show.html.haml
  Diff comments   View file @ef64692
1   -- if @team.description.present?
2   - .description
3   - = @team.description
4   - %hr
5   -
6 1 .projects
7 2 .activities.span8
8 3 = link_to dashboard_path, class: 'btn btn-tiny' do
... ... @@ -16,6 +11,9 @@
16 11 %p.nothing_here_message Projects activity will be displayed here
17 12 .loading.hide
18 13 .side.span4
  14 + - if @team.description.present?
  15 + .description.well.light
  16 + = @team.description
19 17 = render "projects", projects: @projects
20 18 %div
21 19 %span.rss-icon
... ...