better presenting for group description

Dmitriy Zaporozhets
1 parent 87f555e1
Showing 5 changed files with 9 additions and 13 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/views/groups/new.html.haml
app/views/groups/show.html.haml
app/views/teams/new.html.haml
app/views/teams/show.html.haml
@@ -30,6 +30,8 @@
   border-color: #DDD;
 }
+.well { padding: 15px; }
+
 /** HELPERS **/
 .nothing_here_message {
   text-align: center;
@@ -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
-- 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
@@ -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)
-- 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
	@@ -18,7 +18,6 @@		@@ -18,7 +18,6 @@
18	.form-actions	18	.form-actions
19	= f.submit 'Create team', class: "btn btn-create"	19	= f.submit 'Create team', class: "btn btn-create"
20		20
21	- %hr
22	.padded	21	.padded
23	%ul	22	%ul
24	%li All created teams are public (users can view who enter into team and which project are assigned for this team)	23	%li All created teams are public (users can view who enter into team and which project are assigned for this team)