deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed project last_activity. Links color changed a bit

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-08-30 09:09:42 +03:00
parent 793db070f0
commit 4e47402852
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
View file

@ -8,7 +8,7 @@
} }
&.btn-primary { &.btn-primary {
background:$link_color; background:#2a79A3;
border-color: #2A79A3; border-color: #2A79A3;
&:hover { &:hover {
background:$blue_link; background:$blue_link;
@ -31,16 +31,16 @@
} }
} }
&.save-btn { &.save-btn {
@extend .wide; @extend .wide;
@extend .primary; @extend .primary;
} }
&.cancel-btn { &.cancel-btn {
float:right; float:right;
} }
&.wide { &.wide {
padding-left:30px; padding-left:30px;
padding-right:30px; padding-right:30px;
} }

12
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file

@ -1,10 +1,10 @@
/** /**
* Headers * Headers
* *
*/ */
h3, h4, h5, h6 { line-height: 36px; } h3, h4, h5, h6 { line-height: 36px; }
h5 { font-size:14px; } h5 { font-size:14px; }
h3.page_title { h3.page_title {
color:#456; color:#456;
font-size:20px; font-size:20px;
font-weight: normal; font-weight: normal;
@ -21,9 +21,9 @@ pre {
} }
} }
/** /**
* Links * Links
* *
*/ */
a { a {
outline: none; outline: none;
@ -35,7 +35,7 @@ a {
&.btn { &.btn {
color: $style_color; color: $style_color;
&:hover { &:hover {
color: $style_color; color: $style_color;
} }
} }

12
app/assets/stylesheets/main.scss
View file

@ -2,13 +2,13 @@
@import "bootstrap-responsive"; @import "bootstrap-responsive";
/** GITLAB colors **/ /** GITLAB colors **/
$link_color:#2A79A3; $link_color:#3A89A3;
$blue_link: #2fa0bb; $blue_link: #2fa0bb;
$style_color: #474D57; $style_color: #474d57;
$hover: #FDF5D9; $hover: #fdf5d9;
/** GITLAB Fonts **/ /** GITLAB Fonts **/
@font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); } @font-face { font-family: Korolev; src: url('korolev-medium-compressed.otf'); }
/** MIXINS **/ /** MIXINS **/
@mixin shade { @mixin shade {
@ -56,7 +56,7 @@ $hover: #FDF5D9;
border-radius: $radius; border-radius: $radius;
} }
@mixin bg-gray-gradient { @mixin bg-gray-gradient {
background:#eee; background:#eee;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
@ -64,7 +64,7 @@ $hover: #FDF5D9;
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
} }
@mixin bg-dark-gray-gradient { @mixin bg-dark-gray-gradient {
background:#eee; background:#eee;
background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7); background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7); background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);

8
app/models/project.rb
View file

@ -8,7 +8,7 @@ class Project < ActiveRecord::Base
# #
# Relations # Relations
# #
belongs_to :owner, class_name: "User" belongs_to :owner, class_name: "User"
has_many :users, through: :users_projects has_many :users, through: :users_projects
has_many :events, dependent: :destroy has_many :events, dependent: :destroy
@ -25,12 +25,12 @@ class Project < ActiveRecord::Base
attr_accessor :error_code attr_accessor :error_code
# #
# Protected attributes # Protected attributes
# #
attr_protected :private_flag, :owner_id attr_protected :private_flag, :owner_id
# #
# Scopes # Scopes
# #
scope :public_only, where(private_flag: false) scope :public_only, where(private_flag: false)
@ -158,7 +158,7 @@ class Project < ActiveRecord::Base
end end
def last_activity def last_activity
events.last || nil events.order("created_at DESC").first || nil
end end
def last_activity_date def last_activity_date