Browse files

Refactoring & minor css changes

  • Loading branch information...
1 parent 7fa6a23 commit f088eaa972ae3bc3beddb85adb98d185ea8a2ddc @randx randx committed Aug 21, 2012
View
5 CHANGELOG
@@ -3,6 +3,11 @@ v 2.8.0
- Bulk issues update
- Issues API
- Cucumber coverage increased
+ - Post-receive files fixed
+ - UI improved
+ - Application cleanup
+ - more cucumber
+ - capybara-webkit + headless
v 2.7.0
- Issue Labels
View
6 app/assets/stylesheets/gitlab_bootstrap.scss
@@ -330,16 +330,20 @@ img.avatar {
float:left;
margin-right:15px;
width:40px;
- border:2px solid #ddd;
+ border:1px solid #ddd;
+ padding:1px;
&.s16 {
width:16px;
+ height:16px;
}
&.s24 {
width:24px;
+ height:24px;
}
&.s32 {
width:32px;
+ height:32px;
}
}
View
8 app/assets/stylesheets/themes/ui_mars.scss
@@ -20,6 +20,10 @@
.fbtn {
.btn {
+ i {
+ position: relative;
+ top: 1px;
+ }
margin-left:8px;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595D63), to(#31363E));
background-image: -webkit-linear-gradient(#595D63 6.6%, #31363E);
@@ -32,6 +36,10 @@
background-image: -moz-linear-gradient(#595D63 6.6%, #202227);
background-image: -o-linear-gradient(#595D63 6.6%, #202227);
background-position:0 0;
+ color:#fff;
+ i {
+ @extend .icon-white;
+ }
}
border: 1px solid #31363E;
View
2 app/models/project.rb
@@ -2,7 +2,7 @@
class Project < ActiveRecord::Base
include Repository
- include ProjectPush
+ include PushObserver
include Authority
include Team
View
2 app/roles/project_push.rb → app/roles/push_observer.rb
@@ -1,4 +1,4 @@
-module ProjectPush
+module PushObserver
def observe_push(oldrev, newrev, ref, user)
data = post_receive_data(oldrev, newrev, ref, user)
View
2 app/views/team_members/_show.html.haml
@@ -9,7 +9,7 @@
%span.label Blocked
= link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
- = image_tag gravatar_icon(user.email, 40), class: "avatar"
+ = image_tag gravatar_icon(user.email, 40), class: "avatar s32"
= link_to project_team_member_path(@project, member), title: user.name, class: "dark" do
%strong= truncate(user.name, lenght: 40)
%br

0 comments on commit f088eaa

Please sign in to comment.