Read about our upcoming Code of Conduct on this issue

Commit 4e474028 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fixed project last_activity. Links color changed a bit

parent aa0b5ff5ecf8
......@@ -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 < 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 @@ def private?
end
def last_activity
events.last || nil
events.order("created_at DESC").first || nil
end
def last_activity_date
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment