}
.label {
- padding: 0px 4px;
- font-size: 10px;
+ padding: 1px 4px;
+ font-size: 12px;
font-style: normal;
- background-color: $link_color;
-
- &.label-success {
- background-color: #8D8;
- color: #333;
- text-shadow: 0 1px 1px white;
- }
-
- &.label-error {
- background-color: #D88;
- color: #333;
- text-shadow: 0 1px 1px white;
- }
+ font-weight: normal;
}
form {
class Admin::Teams::MembersController < Admin::Teams::ApplicationController
def new
@users = User.potential_team_members(user_team)
- @users = UserDecorator.decorate_collection @users
end
def create
def show
@issues = @milestone.issues
- @users = UserDecorator.decorate_collection(@milestone.participants)
+ @users = @milestone.participants
@merge_requests = @milestone.merge_requests
respond_to do |format|
def new
@users = User.potential_team_members(user_team)
- @users = UserDecorator.decorate_collection @users
end
def create
+++ /dev/null
-class UserDecorator < ApplicationDecorator
- decorates :user
-
- def avatar_image size = 16
- h.image_tag h.gravatar_icon(self.email, size), class: "avatar #{"s#{size}"}", width: size
- end
-
- def tm_of(project)
- project.team_member_by_id(self.id)
- end
-end
def name_with_username
"#{name} (#{username})"
end
+
+ def tm_of(project)
+ project.team_member_by_id(self.id)
+ end
end
= render 'votes/votes_inline', votable: issue
%span
- issue.labels.each do |label|
- %span.label
+ %span.label.label-info
%i.icon-tag
= label.name
%div
- @users.each do |user|
= link_to user, class: 'float-link' do
- = user.avatar_image
- = user.name
+ = link_to_member(@project, user)
.clearfix