Fixed project last_activity. Links color changed a bit

4 files changed, 20 insertions, 20 deletions

diff --git a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
index 89b292dc5ec..9966e81b54c 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/buttons.scss
@@ -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;
   }
diff --git a/app/assets/stylesheets/gitlab_bootstrap/typography.scss b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
index c93a64bdbb8..97e85492875 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/typography.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/typography.scss
@@ -1,10 +1,10 @@
-/** 
+/**
  * 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;
     }
   }
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 4b7c0171891..be27d754dfa 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -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);
diff --git a/app/models/project.rb b/app/models/project.rb
index 3fe11916504..3c7287f8d3d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -8,7 +8,7 @@ class Project < 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 < 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 < ActiveRecord::Base
   end
 
   def last_activity
-    events.last || nil
+    events.order("created_at DESC").first || nil
   end
 
   def last_activity_date