better presenting for group description

diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index dcfd610..9e015eb 100644 (file)
--- 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 2104db8..36ee492 100644 (file)
--- 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 fe08e0b..81694b8 100644 (file)
--- 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 332a6a5..99d3082 100644 (file)
--- 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 34be769..43cc026 100644 (file)
--- 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