From 9959669f1cb533e14e5df8d240c7560a2f258f84 Mon Sep 17 00:00:00 2001
From: Andrew8xx8 <avk@8xx8.ru>
Date: Thu, 14 Feb 2013 12:14:34 +0400
Subject: [PATCH] Desctiptions removed from dashboard

---
 app/assets/stylesheets/application.scss     |  2 --
 app/assets/stylesheets/sections/groups.scss | 31 ---------------------
 app/assets/stylesheets/sections/teams.scss  | 31 ---------------------
 app/views/dashboard/_groups.html.haml       | 10 +++----
 app/views/dashboard/_teams.html.haml        | 16 +++++------
 features/steps/userteams/userteams.rb       |  4 +--
 6 files changed, 13 insertions(+), 81 deletions(-)
 delete mode 100644 app/assets/stylesheets/sections/groups.scss
 delete mode 100644 app/assets/stylesheets/sections/teams.scss

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 25cef4324cc..6b500b88823 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -20,8 +20,6 @@
 @import "sections/nav.scss";
 @import "sections/commits.scss";
 @import "sections/issues.scss";
-@import "sections/groups.scss";
-@import "sections/teams.scss";
 @import "sections/projects.scss";
 @import "sections/snippets.scss";
 @import "sections/votes.scss";
diff --git a/app/assets/stylesheets/sections/groups.scss b/app/assets/stylesheets/sections/groups.scss
deleted file mode 100644
index 9f5dc15a73e..00000000000
--- a/app/assets/stylesheets/sections/groups.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-.projects {
-  @extend .row;
-  .activities {
-  }
-
-  .side {
-    @extend .right;
-
-    .groups_box {
-      > .title {
-        padding: 2px 15px;
-      }
-      .well-list {
-        li { padding: 15px; }
-        .edit {
-          float: right;
-          margin: 0;
-        }
-        .description {
-          padding-top: 5px;
-          display: block;
-          span, strong {
-            font-size: 12px;
-            color: #666;
-          }
-        }
-      }
-      @extend .ui-box;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/sections/teams.scss b/app/assets/stylesheets/sections/teams.scss
deleted file mode 100644
index b5c546ca5fa..00000000000
--- a/app/assets/stylesheets/sections/teams.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-.projects {
-  @extend .row;
-  .activities {
-  }
-
-  .side {
-    @extend .right;
-
-    .teams_box {
-      > .title {
-        padding: 2px 15px;
-      }
-      .well-list {
-        li { padding: 15px; }
-        .edit {
-          float: right;
-          margin: 0;
-        }
-        .description {
-          padding-top: 5px;
-          display: block;
-          span, strong {
-            font-size: 12px;
-            color: #666;
-          }
-        }
-      }
-      @extend .ui-box;
-    }
-  }
-}
diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml
index 8c1dfc12322..ba8d3029eaf 100644
--- a/app/views/dashboard/_groups.html.haml
+++ b/app/views/dashboard/_groups.html.haml
@@ -1,4 +1,4 @@
-.groups_box
+.ui-box
   %h5.title
     Groups
     %small
@@ -13,8 +13,6 @@
       %li
         = link_to group_path(id: group.path), class: dom_class(group) do
           %strong.well-title= truncate(group.name, length: 35)
-          %span.edit.light
-            - if group.owner == current_user
-              %i.icon-wrench
-          %span.description
-            %strong= group.description
+        %span.pull-right.light
+          - if group.owner == current_user
+            %i.icon-wrench
diff --git a/app/views/dashboard/_teams.html.haml b/app/views/dashboard/_teams.html.haml
index 76e9785ee2c..f56115856a7 100644
--- a/app/views/dashboard/_teams.html.haml
+++ b/app/views/dashboard/_teams.html.haml
@@ -1,4 +1,4 @@
-.ui-box.teams_box
+.ui-box.teams-box
   %h5.title
     Teams
     %small
@@ -12,11 +12,9 @@
       %li
         = link_to team_path(id: team.path), class: dom_class(team) do
           %strong.well-title= truncate(team.name, length: 35)
-          %span.edit.light
-            - if team.owner == current_user
-              %i.icon-wrench
-            - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
-            - if tm
-              = tm.access_human
-          %span.description
-            %strong= team.description
+        %span.pull-right.light
+          - if team.owner == current_user
+            %i.icon-wrench
+          - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
+          - if tm
+            = tm.access_human
diff --git a/features/steps/userteams/userteams.rb b/features/steps/userteams/userteams.rb
index ef432824ea9..1abb0f49122 100644
--- a/features/steps/userteams/userteams.rb
+++ b/features/steps/userteams/userteams.rb
@@ -8,7 +8,7 @@ class Userteams < Spinach::FeatureSteps
     end
 
     Then 'I should see dashboard page without teams info block' do
-      page.has_no_css?(".teams_box").must_equal true
+      page.has_no_css?(".teams-box").must_equal true
     end
 
     When 'I have teams with my membership' do
@@ -17,7 +17,7 @@ class Userteams < Spinach::FeatureSteps
     end
 
     Then 'I should see dashboard page with teams information block' do
-      page.should have_css(".teams_box")
+      page.should have_css(".teams-box")
     end
 
     When 'exist user teams' do
-- 
GitLab