Fixed project last_activity. Links color changed a bit

Dmitriy Zaporozhets
1 parent 793db070
Showing 4 changed files with 20 additions and 20 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
app/assets/stylesheets/gitlab_bootstrap/typography.scss
app/assets/stylesheets/main.scss
app/models/project.rb
@@ -8,7 +8,7 @@
   }
   &.btn-primary {
-    background:$link_color;
+    background:#2a79A3;
     border-color: #2A79A3;
     &:hover {
       background:$blue_link;
@@ -31,16 +31,16 @@
     }
   }
-  &.save-btn { 
+  &.save-btn {
     @extend .wide;
     @extend .primary;
   }
-  &.cancel-btn { 
+  &.cancel-btn {
     float:right;
   }
-  &.wide { 
+  &.wide {
     padding-left:30px;
     padding-right:30px;
   }
-/** 
+/**
  * Headers
- * 
+ *
  */
 h3, h4, h5, h6 { line-height: 36px; }
 h5 { font-size:14px; }
-h3.page_title { 
+h3.page_title {
   color:#456;
   font-size:20px;
   font-weight: normal;
@@ -21,9 +21,9 @@ pre {
   }
 }
-/** 
+/**
  * Links
- * 
+ *
  */
 a {
   outline: none;
@@ -35,7 +35,7 @@ a {
   &.btn {
     color: $style_color;
-    &:hover { 
+    &:hover {
       color: $style_color;
     }
   }
@@ -2,13 +2,13 @@
 @import "bootstrap-responsive";
 /** GITLAB colors **/
-$link_color:#2A79A3;
+$link_color:#3A89A3;
 $blue_link: #2fa0bb;
-$style_color: #474D57;
-$hover: #FDF5D9;
+$style_color: #474d57;
+$hover: #fdf5d9;
 /** 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 **/
 @mixin shade {
@@ -56,7 +56,7 @@ $hover: #FDF5D9;
   border-radius: $radius;
 }
-@mixin bg-gray-gradient { 
+@mixin bg-gray-gradient {
   background:#eee;
   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);
@@ -64,7 +64,7 @@ $hover: #FDF5D9;
   background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
 }
-@mixin bg-dark-gray-gradient { 
+@mixin bg-dark-gray-gradient {
   background:#eee;
   background-image: -webkit-linear-gradient(#e9e9e9, #d7d7d7);
   background-image: -moz-linear-gradient(#e9e9e9, #d7d7d7);
@@ -8,7 +8,7 @@ class Project &lt; ActiveRecord::Base
   #
   # Relations
-  # 
+  #
   belongs_to :owner, class_name: "User"
   has_many :users,          through: :users_projects
   has_many :events,         dependent: :destroy
@@ -25,12 +25,12 @@ class Project &lt; ActiveRecord::Base
   attr_accessor :error_code
-  # 
+  #
   # Protected attributes
   #
   attr_protected :private_flag, :owner_id
-  # 
+  #
   # Scopes
   #
   scope :public_only, where(private_flag: false)
@@ -158,7 +158,7 @@ class Project &lt; ActiveRecord::Base
   end
   def last_activity
-    events.last || nil
+    events.order("created_at DESC").first || nil
   end
   def last_activity_date
	@@ -8,7 +8,7 @@		@@ -8,7 +8,7 @@
8	}	8	}
9		9
10	&.btn-primary {	10	&.btn-primary {
11	- background:$link_color;	11	+ background:#2a79A3;
12	border-color: #2A79A3;	12	border-color: #2A79A3;
13	&:hover {	13	&:hover {
14	background:$blue_link;	14	background:$blue_link;
	@@ -31,16 +31,16 @@		@@ -31,16 +31,16 @@
31	}	31	}
32	}	32	}
33		33
34	- &.save-btn {	34	+ &.save-btn {
35	@extend .wide;	35	@extend .wide;
36	@extend .primary;	36	@extend .primary;
37	}	37	}
38		38
39	- &.cancel-btn {	39	+ &.cancel-btn {
40	float:right;	40	float:right;
41	}	41	}
42		42
43	- &.wide {	43	+ &.wide {
44	padding-left:30px;	44	padding-left:30px;
45	padding-right:30px;	45	padding-right:30px;
46	}	46	}
1	-/**	1	+/**
2	* Headers	2	* Headers
3	- *	3	+ *
4	*/	4	*/
5	h3, h4, h5, h6 { line-height: 36px; }	5	h3, h4, h5, h6 { line-height: 36px; }
6	h5 { font-size:14px; }	6	h5 { font-size:14px; }
7	-h3.page_title {	7	+h3.page_title {
8	color:#456;	8	color:#456;
9	font-size:20px;	9	font-size:20px;
10	font-weight: normal;	10	font-weight: normal;
	@@ -21,9 +21,9 @@ pre {		@@ -21,9 +21,9 @@ pre {
21	}	21	}
22	}	22	}
23		23
24	-/**	24	+/**
25	* Links	25	* Links
26	- *	26	+ *
27	*/	27	*/
28	a {	28	a {
29	outline: none;	29	outline: none;
	@@ -35,7 +35,7 @@ a {		@@ -35,7 +35,7 @@ a {
35		35
36	&.btn {	36	&.btn {
37	color: $style_color;	37	color: $style_color;
38	- &:hover {	38	+ &:hover {
39	color: $style_color;	39	color: $style_color;
40	}	40	}
41	}	41	}
	@@ -8,7 +8,7 @@ class Project < ActiveRecord::Base		@@ -8,7 +8,7 @@ class Project < ActiveRecord::Base
8		8
9	#	9	#
10	# Relations	10	# Relations
11	- #	11	+ #
12	belongs_to :owner, class_name: "User"	12	belongs_to :owner, class_name: "User"
13	has_many :users, through: :users_projects	13	has_many :users, through: :users_projects
14	has_many :events, dependent: :destroy	14	has_many :events, dependent: :destroy
	@@ -25,12 +25,12 @@ class Project < ActiveRecord::Base		@@ -25,12 +25,12 @@ class Project < ActiveRecord::Base
25		25
26	attr_accessor :error_code	26	attr_accessor :error_code
27		27
28	- #	28	+ #
29	# Protected attributes	29	# Protected attributes
30	#	30	#
31	attr_protected :private_flag, :owner_id	31	attr_protected :private_flag, :owner_id
32		32
33	- #	33	+ #
34	# Scopes	34	# Scopes
35	#	35	#
36	scope :public_only, where(private_flag: false)	36	scope :public_only, where(private_flag: false)
	@@ -158,7 +158,7 @@ class Project < ActiveRecord::Base		@@ -158,7 +158,7 @@ class Project < ActiveRecord::Base
158	end	158	end
159		159
160	def last_activity	160	def last_activity
161	- events.last \|\| nil	161	+ events.order("created_at DESC").first \|\| nil
162	end	162	end
163		163
164	def last_activity_date	164	def last_activity_date