Commit 9959669f authored by Andrew8xx8's avatar Andrew8xx8

Desctiptions removed from dashboard

parent 3d4e3245
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
@import "sections/nav.scss"; @import "sections/nav.scss";
@import "sections/commits.scss"; @import "sections/commits.scss";
@import "sections/issues.scss"; @import "sections/issues.scss";
@import "sections/groups.scss";
@import "sections/teams.scss";
@import "sections/projects.scss"; @import "sections/projects.scss";
@import "sections/snippets.scss"; @import "sections/snippets.scss";
@import "sections/votes.scss"; @import "sections/votes.scss";
......
.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;
}
}
}
.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;
}
}
}
.groups_box .ui-box
%h5.title %h5.title
Groups Groups
%small %small
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
%li %li
= link_to group_path(id: group.path), class: dom_class(group) do = link_to group_path(id: group.path), class: dom_class(group) do
%strong.well-title= truncate(group.name, length: 35) %strong.well-title= truncate(group.name, length: 35)
%span.edit.light %span.pull-right.light
- if group.owner == current_user - if group.owner == current_user
%i.icon-wrench %i.icon-wrench
%span.description
%strong= group.description
.ui-box.teams_box .ui-box.teams-box
%h5.title %h5.title
Teams Teams
%small %small
...@@ -12,11 +12,9 @@ ...@@ -12,11 +12,9 @@
%li %li
= link_to team_path(id: team.path), class: dom_class(team) do = link_to team_path(id: team.path), class: dom_class(team) do
%strong.well-title= truncate(team.name, length: 35) %strong.well-title= truncate(team.name, length: 35)
%span.edit.light %span.pull-right.light
- if team.owner == current_user - if team.owner == current_user
%i.icon-wrench %i.icon-wrench
- tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id) - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id)
- if tm - if tm
= tm.access_human = tm.access_human
%span.description
%strong= team.description
...@@ -8,7 +8,7 @@ class Userteams < Spinach::FeatureSteps ...@@ -8,7 +8,7 @@ class Userteams < Spinach::FeatureSteps
end end
Then 'I should see dashboard page without teams info block' do 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 end
When 'I have teams with my membership' do When 'I have teams with my membership' do
...@@ -17,7 +17,7 @@ class Userteams < Spinach::FeatureSteps ...@@ -17,7 +17,7 @@ class Userteams < Spinach::FeatureSteps
end end
Then 'I should see dashboard page with teams information block' do Then 'I should see dashboard page with teams information block' do
page.should have_css(".teams_box") page.should have_css(".teams-box")
end end
When 'exist user teams' do When 'exist user teams' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment