Desctiptions removed from dashboard

5-0-stable
Andrew8xx8 2013-02-14 12:14:34 +04:00
parent 3d4e32457b
commit 9959669f1c
6 changed files with 13 additions and 81 deletions

View File

@ -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";

View File

@ -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;
}
}
}

View File

@ -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;
}
}
}

View File

@ -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

View File

@ -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

View File

@ -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