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
Kazuhiko Shiozaki
gitlab-ce
Commits
5a1afb48
Commit
5a1afb48
authored
Feb 25, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup css for projects list
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
bb3563b5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
13 deletions
+12
-13
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+6
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-9
app/views/shared/projects/_list.html.haml
app/views/shared/projects/_list.html.haml
+1
-1
app/views/shared/projects/_project.html.haml
app/views/shared/projects/_project.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/lists.scss
View file @
5a1afb48
...
@@ -110,7 +110,12 @@ ul.content-list {
...
@@ -110,7 +110,12 @@ ul.content-list {
>
li
{
>
li
{
border-color
:
$table-border-color
;
border-color
:
$table-border-color
;
color
:
$gl-gray
;
color
:
$list-text-color
;
.title
{
color
:
$list-title-color
;
font-weight
:
600
;
}
.avatar
{
.avatar
{
margin-right
:
15px
;
margin-right
:
15px
;
...
...
app/assets/stylesheets/framework/variables.scss
View file @
5a1afb48
...
@@ -32,6 +32,8 @@ $gl-avatar-size: 40px;
...
@@ -32,6 +32,8 @@ $gl-avatar-size: 40px;
$secondary-text
:
#7f8fa4
;
$secondary-text
:
#7f8fa4
;
$error-exclamation-point
:
#E62958
;
$error-exclamation-point
:
#E62958
;
$border-radius-default
:
3px
;
$border-radius-default
:
3px
;
$list-title-color
:
#333333
;
$list-text-color
:
#555555
;
/*
/*
* Color schema
* Color schema
...
...
app/assets/stylesheets/pages/projects.scss
View file @
5a1afb48
...
@@ -397,15 +397,10 @@ pre.light-well {
...
@@ -397,15 +397,10 @@ pre.light-well {
.project-full-name
{
.project-full-name
{
@include
str-truncated
;
@include
str-truncated
;
font-weight
:
600
;
color
:
#4c4e54
;
}
}
.project-controls
{
.controls
{
float
:
right
;
color
:
$gl-gray
;
line-height
:
40px
;
line-height
:
40px
;
color
:
#7f8fa4
;
a
:hover
{
a
:hover
{
text-decoration
:
none
;
text-decoration
:
none
;
...
@@ -417,12 +412,9 @@ pre.light-well {
...
@@ -417,12 +412,9 @@ pre.light-well {
}
}
.project-description
{
.project-description
{
color
:
#7f8fa4
;
p
{
p
{
@include
str-truncated
;
@include
str-truncated
;
margin-bottom
:
0
;
margin-bottom
:
0
;
color
:
#7f8fa4
;
}
}
}
}
}
}
...
...
app/views/shared/projects/_list.html.haml
View file @
5a1afb48
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
skip_namespace
=
false
unless
local_assigns
[
:skip_namespace
]
==
true
-
skip_namespace
=
false
unless
local_assigns
[
:skip_namespace
]
==
true
-
show_last_commit_as_description
=
false
unless
local_assigns
[
:show_last_commit_as_description
]
==
true
-
show_last_commit_as_description
=
false
unless
local_assigns
[
:show_last_commit_as_description
]
==
true
%ul
.projects-list
%ul
.projects-list
.content-list
-
if
projects
.
any?
-
if
projects
.
any?
-
projects
.
each_with_index
do
|
project
,
i
|
-
projects
.
each_with_index
do
|
project
,
i
|
-
css_class
=
(
i
>=
projects_limit
)
?
'hide'
:
nil
-
css_class
=
(
i
>=
projects_limit
)
?
'hide'
:
nil
...
...
app/views/shared/projects/_project.html.haml
View file @
5a1afb48
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
image_tag
avatar_icon
(
project
.
creator
.
email
,
40
),
class:
"avatar s40"
,
alt
:''
=
image_tag
avatar_icon
(
project
.
creator
.
email
,
40
),
class:
"avatar s40"
,
alt
:''
-
else
-
else
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
=
project_icon
(
project
,
alt:
''
,
class:
'avatar project-avatar s40'
)
%span
.project-full-name
%span
.project-full-name
.title
%span
.namespace-name
%span
.namespace-name
-
if
project
.
namespace
&&
!
skip_namespace
-
if
project
.
namespace
&&
!
skip_namespace
=
project
.
namespace
.
human_name
=
project
.
namespace
.
human_name
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
%span
.project-name.filter-title
%span
.project-name.filter-title
=
project
.
name
=
project
.
name
.
project-
controls
.controls
-
if
ci_commit
-
if
ci_commit
%span
%span
=
render_ci_status
(
ci_commit
)
=
render_ci_status
(
ci_commit
)
...
...
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