Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
4e474028
Commit
4e474028
authored
Aug 30, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed project last_activity. Links color changed a bit
parent
793db070
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
20 deletions
+20
-20
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
+4
-4
app/assets/stylesheets/gitlab_bootstrap/typography.scss
app/assets/stylesheets/gitlab_bootstrap/typography.scss
+6
-6
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+6
-6
app/models/project.rb
app/models/project.rb
+4
-4
No files found.
app/assets/stylesheets/gitlab_bootstrap/buttons.scss
View file @
4e474028
...
...
@@ -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
;
}
...
...
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file @
4e474028
/**
/**
* 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
;
}
}
...
...
app/assets/stylesheets/main.scss
View file @
4e474028
...
...
@@ -2,13 +2,13 @@
@import
"bootstrap-responsive"
;
/** GITLAB colors **/
$link_color
:
#
2A7
9A3
;
$link_color
:
#
3A8
9A3
;
$blue_link
:
#2fa0bb
;
$style_color
:
#474
D
57
;
$hover
:
#
FDF5D
9
;
$style_color
:
#474
d
57
;
$hover
:
#
fdf5d
9
;
/** 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
);
...
...
app/models/project.rb
View file @
4e474028
...
...
@@ -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
.
la
st
||
nil
events
.
order
(
"created_at DESC"
).
fir
st
||
nil
end
def
last_activity_date
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment