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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
05da3801
Commit
05da3801
authored
Aug 16, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyled erros pages & avatar class
parent
17948951
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
231 additions
and
234 deletions
+231
-234
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+13
-7
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+138
-140
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/header.scss
+19
-19
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_basic.scss
+5
-5
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+12
-12
app/assets/stylesheets/themes/ui_modern.scss
app/assets/stylesheets/themes/ui_modern.scss
+2
-1
app/views/errors/access_denied.html.haml
app/views/errors/access_denied.html.haml
+4
-5
app/views/errors/git_not_found.html.haml
app/views/errors/git_not_found.html.haml
+5
-9
app/views/errors/gitolite.html.haml
app/views/errors/gitolite.html.haml
+24
-26
app/views/errors/not_found.html.haml
app/views/errors/not_found.html.haml
+4
-5
app/views/layouts/error.html.haml
app/views/layouts/error.html.haml
+2
-2
public/404.html
public/404.html
+1
-1
public/422.html
public/422.html
+1
-1
public/500.html
public/500.html
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
05da3801
...
@@ -249,7 +249,7 @@ ul.bordered-list li:last-child { border:none }
...
@@ -249,7 +249,7 @@ ul.bordered-list li:last-child { border:none }
li
.commit
{
li
.commit
{
.avatar
{
.avatar
{
width
:
24px
;
width
:
24px
;
top
:
-
3
px
;
top
:
-
5
px
;
margin-right
:
10px
;
margin-right
:
10px
;
margin-left
:
10px
;
margin-left
:
10px
;
}
}
...
@@ -305,12 +305,7 @@ p.time {
...
@@ -305,12 +305,7 @@ p.time {
}
}
.styled_image
{
.styled_image
{
-webkit-border-radius
:
4px
;
border
:
2px
solid
#ddd
;
-moz-border-radius
:
4px
;
border-radius
:
4px
;
-moz-box-shadow
:
0
0
5px
#888
;
-webkit-box-shadow
:
0
0
5px
#888
;
box-shadow
:
0
0
5px
#888
;
}
}
.event_feed
{
.event_feed
{
...
@@ -729,3 +724,14 @@ li.note {
...
@@ -729,3 +724,14 @@ li.note {
}
}
}
}
}
}
.git_error_tips
{
@extend
.span6
;
text-align
:left
;
margin-top
:
40px
;
pre
{
background
:white
;
border
:none
;
font-size
:
12px
;
}
}
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
05da3801
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/sections/header.scss
View file @
05da3801
...
@@ -2,14 +2,14 @@
...
@@ -2,14 +2,14 @@
* Application Header
* Application Header
*
*
*/
*/
header
{
header
{
width
:
100%
;
width
:
100%
;
padding
:
0
;
padding
:
0
;
margin
:
0
;
margin
:
0
;
top
:
1px
;
top
:
1px
;
left
:
0
;
left
:
0
;
background
:
#F1F1F1
;
/* for non-css3 browsers */
background
:
#F1F1F1
;
/* for non-css3 browsers */
border-bottom
:
1px
solid
#ccc
;
border-bottom
:
1px
solid
#ccc
;
box-shadow
:
0
-1px
0
white
inset
;
box-shadow
:
0
-1px
0
white
inset
;
-moz-box-shadow
:
0
-1px
0
white
inset
;
-moz-box-shadow
:
0
-1px
0
white
inset
;
-webkit-box-shadow
:
0
-1px
0
white
inset
;
-webkit-box-shadow
:
0
-1px
0
white
inset
;
...
@@ -17,7 +17,7 @@ header {
...
@@ -17,7 +17,7 @@ header {
height
:
60px
;
height
:
60px
;
/**
/**
*
*
* Logo holder
* Logo holder
*
*
*/
*/
...
@@ -27,10 +27,10 @@ header {
...
@@ -27,10 +27,10 @@ header {
position
:relative
;
position
:relative
;
top
:
-5px
;
top
:
-5px
;
a
{
a
{
float
:left
;
float
:left
;
h1
{
h1
{
text-indent
:
-9999px
;
text-indent
:
-9999px
;
width
:
102px
;
width
:
102px
;
background
:
url('logo_text.png')
no-repeat
0px
-3px
;
background
:
url('logo_text.png')
no-repeat
0px
-3px
;
...
@@ -54,8 +54,8 @@ header {
...
@@ -54,8 +54,8 @@ header {
margin-top
:
-10px
;
margin-top
:
-10px
;
}
}
}
}
.container
{
.container
{
.top_panel_content
{
.top_panel_content
{
margin
:auto
;
margin
:auto
;
position
:relative
;
position
:relative
;
padding
:
15px
0
;
padding
:
15px
0
;
...
@@ -63,7 +63,7 @@ header {
...
@@ -63,7 +63,7 @@ header {
}
}
/**
/**
*
*
* Project / Area name
* Project / Area name
*
*
*/
*/
...
@@ -78,10 +78,10 @@ header {
...
@@ -78,10 +78,10 @@ header {
text-shadow
:
0
1px
1px
#FFF
;
text-shadow
:
0
1px
1px
#FFF
;
}
}
.fbtn
{
.fbtn
{
float
:
right
;
float
:
right
;
margin-right
:
10px
;
margin-right
:
10px
;
.btn
{
.btn
{
margin-left
:
7px
;
margin-left
:
7px
;
background
:
#F1F1F1
;
background
:
#F1F1F1
;
border
:
1px
solid
#CCC
;
border
:
1px
solid
#CCC
;
...
@@ -90,13 +90,13 @@ header {
...
@@ -90,13 +90,13 @@ header {
/**
/**
*
*
* Search box
* Search box
*
*
*/
*/
.search
{
.search
{
float
:
right
;
float
:
right
;
margin-right
:
50
px
;
margin-right
:
45
px
;
.search-input
{
.search-input
{
@extend
.span2
;
@extend
.span2
;
...
@@ -110,7 +110,7 @@ header {
...
@@ -110,7 +110,7 @@ header {
}
}
/**
/**
*
*
* Account box
* Account box
*
*
*/
*/
...
@@ -125,13 +125,13 @@ header {
...
@@ -125,13 +125,13 @@ header {
display
:
block
;
display
:
block
;
cursor
:
pointer
;
cursor
:
pointer
;
img
{
img
{
border-radius
:
4px
;
@include
border-radius
(
4px
)
;
right
:
5px
;
right
:
5px
;
position
:
absolute
;
position
:
absolute
;
width
:
31
px
;
width
:
28
px
;
height
:
31
px
;
height
:
28
px
;
display
:
block
;
display
:
block
;
top
:
0
;
top
:
2px
;
&
:after
{
&
:after
{
content
:
" "
;
content
:
" "
;
display
:
block
;
display
:
block
;
...
@@ -186,7 +186,7 @@ header {
...
@@ -186,7 +186,7 @@ header {
width
:
100px
;
width
:
100px
;
position
:
absolute
;
position
:
absolute
;
right
:
10px
;
right
:
10px
;
top
:
4
6
px
;
top
:
4
2
px
;
margin-top
:
0
;
margin-top
:
0
;
float
:
right
;
float
:
right
;
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.2
);
box-shadow
:
0
1px
1px
rgba
(
0
,
0
,
0
,
0
.2
);
...
...
app/assets/stylesheets/themes/ui_basic.scss
View file @
05da3801
/**
/**
* This file represent some UI that can be changed
* This file represent some UI that can be changed
* during web app restyle or theme select.
* during web app restyle or theme select.
*
*
*/
*/
.ui_basic
{
.ui_basic
{
/*
/*
* Common styles
* Common styles
*
*
*/
*/
a
{
a
{
color
:
$link_color
;
color
:
$link_color
;
&
:hover
{
&
:hover
{
text-decoration
:none
;
text-decoration
:none
;
color
:
$blue_link
;
color
:
$blue_link
;
}
}
}
}
...
...
app/assets/stylesheets/themes/ui_mars.scss
View file @
05da3801
/**
/**
* This file represent some UI that can be changed
* This file represent some UI that can be changed
* during web app restyle or theme select.
* during web app restyle or theme select.
*
*
* Next items should be placed there
* Next items should be placed there
* - link colors
* - link colors
* - header restyles
* - header restyles
...
@@ -13,20 +13,20 @@
...
@@ -13,20 +13,20 @@
* Application Header
* Application Header
*
*
*/
*/
header
{
header
{
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
box-shadow
:none
;
box-shadow
:none
;
border-bottom
:
1px
solid
#444
;
border-bottom
:
1px
solid
#444
;
.fbtn
{
.fbtn
{
.btn
{
.btn
{
margin-left
:
8px
;
margin-left
:
8px
;
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#31363E
));
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#31363E
));
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-o-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
background-image
:
-o-linear-gradient
(
#595D63
6
.6%
,
#31363E
);
font-size
:
12px
;
font-size
:
12px
;
&
:hover
{
&
:hover
{
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#2C2F35
));
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
30
,
color-stop
(
0
.066
,
#595D63
)
,
to
(
#2C2F35
));
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#2C2F35
);
background-image
:
-webkit-linear-gradient
(
#595D63
6
.6%
,
#2C2F35
);
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#202227
);
background-image
:
-moz-linear-gradient
(
#595D63
6
.6%
,
#202227
);
...
@@ -39,10 +39,10 @@
...
@@ -39,10 +39,10 @@
text-shadow
:
0
-1px
0
#000000
;
text-shadow
:
0
-1px
0
#000000
;
}
}
}
}
.search
{
.search
{
float
:
right
;
float
:
right
;
margin-right
:
5
5px
;
margin-right
:
4
5px
;
.search-input
{
.search-input
{
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
box-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
0
.2
)
,
0
2px
2px
rgba
(
0
,
0
,
0
,
0
.4
)
inset
;
box-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
0
.2
)
,
0
2px
2px
rgba
(
0
,
0
,
0
,
0
.4
)
inset
;
background-color
:
#D2D5DA
;
background-color
:
#D2D5DA
;
...
@@ -57,8 +57,8 @@
...
@@ -57,8 +57,8 @@
color
:
#666
;
color
:
#666
;
}
}
.app_logo
{
.app_logo
{
a
{
a
{
h1
{
h1
{
background
:
url('images.png')
no-repeat
-3px
-6px
;
background
:
url('images.png')
no-repeat
-3px
-6px
;
width
:
65px
;
width
:
65px
;
height
:
26px
;
height
:
26px
;
...
...
app/assets/stylesheets/themes/ui_modern.scss
View file @
05da3801
...
@@ -91,7 +91,7 @@
...
@@ -91,7 +91,7 @@
*/
*/
.search
{
.search
{
float
:
right
;
float
:
right
;
margin-right
:
5
5px
;
margin-right
:
4
5px
;
.search-input
{
.search-input
{
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.7
);
box-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
0
.2
)
,
0
2px
2px
rgba
(
0
,
0
,
0
,
0
.4
)
inset
;
box-shadow
:
0
1px
0
rgba
(
255
,
255
,
255
,
0
.2
)
,
0
2px
2px
rgba
(
0
,
0
,
0
,
0
.4
)
inset
;
...
@@ -127,6 +127,7 @@
...
@@ -127,6 +127,7 @@
.account-box
{
.account-box
{
top
:
6px
;
top
:
6px
;
img
{
img
{
top
:
1px
;
right
:
5px
;
right
:
5px
;
width
:
26px
;
width
:
26px
;
height
:
26px
;
height
:
26px
;
...
...
app/views/errors/access_denied.html.haml
View file @
05da3801
.alert-message.block-message.error
%h1
Access Denied
%h3
Access Denied
%hr
%hr
%h2
You are not allowed to access this page
%p
Youre not allowed to access this page
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"vlink"
}
%p
Read more about project permissions
#{
link_to
"here"
,
help_permissions_path
,
class:
"vlink"
}
app/views/errors/git_not_found.html.haml
View file @
05da3801
.alert-message.block-message.error
%h1
404
%h3
Git Resource Not found
%hr
%hr
%h2
Git Resource Not found
%p
%p
Application cant get access to some
Application cant get access to some branch or commit in your repository. Maybe it was removed
%span
.label
branch
or
%span
.label
commit
in your repository. Maybe it was moved
app/views/errors/gitolite.html.haml
View file @
05da3801
.alert-message.block-message.e
rror
%h1
Git E
rror
%h3
Gitolite Erro
r
%h
r
%h4
Application cant get access to your gitolite system.
%h2
Application cant get access to your gitolite system.
.git_error_tips
%h4
Tips for Administrator:
%h4
Tips for Administrator:
%ol
%li
%ul
%p
%li
Check git logs in admin area
%p
%li
Check git logs in admin area
%p
%li
Check config/gitlab.yml for correct settings.
%p
%li
Check config/gitlab.yml for correct settings.
%p
%li
Diagnostic tool:
%p
%pre
Diagnostic tool:
bundle exec rake gitlab:app:status RAILS_ENV=production
%li
%p
Permissions:
%pre
%pre
bundle exec rake gitlab:app:status RAILS_ENV=production
=
preserve
do
%li
sudo chmod -R 770 /home/git/repositories/
%p
sudo chown -R git:git /home/git/repositories/
Permissions:
sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive
%pre
=
preserve
do
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
sudo chown gitlab:gitlab /home/git/repositories/**/hooks/post-receive
app/views/errors/not_found.html.haml
View file @
05da3801
.alert-message.block-message.error
%h1
404
%h3
Not found
%hr
%hr
%h2
Resource you were looking for doesn't exist.
%p
Resource you were looking for doesn't exist.
%p
You may have mistyped the address or the page may have moved.
%P
You may have mistyped the address or it was removed.
app/views/layouts/error.html.haml
View file @
05da3801
...
@@ -6,5 +6,5 @@
...
@@ -6,5 +6,5 @@
=
render
"layouts/head_panel"
,
title:
""
=
render
"layouts/head_panel"
,
title:
""
.container
.container
.content
.content
%
br
%
center
.padded.prepend-top-20
%h3
=
yield
=
yield
public/404.html
View file @
05da3801
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<body>
<body>
<h1>
404
</h1>
<h1>
404
</h1>
<div
class=
"alert-message block-message error"
>
<div>
<h2>
The page you were looking for doesn't exist.
</h2>
<h2>
The page you were looking for doesn't exist.
</h2>
<p>
You may have mistyped the address or the page may have moved.
</p>
<p>
You may have mistyped the address or the page may have moved.
</p>
</div>
</div>
...
...
public/422.html
View file @
05da3801
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<body>
<body>
<!-- This file lives in public/422.html -->
<!-- This file lives in public/422.html -->
<h1>
422
</h1>
<h1>
422
</h1>
<div
class=
"alert-message block-message error"
>
<div>
<h2>
The change you wanted was rejected.
</h2>
<h2>
The change you wanted was rejected.
</h2>
<p>
Maybe you tried to change something you didn't have access to.
</p>
<p>
Maybe you tried to change something you didn't have access to.
</p>
</div>
</div>
...
...
public/500.html
View file @
05da3801
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<body>
<body>
<!-- This file lives in public/500.html -->
<!-- This file lives in public/500.html -->
<h1>
500
</h1>
<h1>
500
</h1>
<div
class=
"alert-message block-message error"
>
<div>
<h2>
We're sorry, but something went wrong.
</h2>
<h2>
We're sorry, but something went wrong.
</h2>
<p>
We've been notified about this issue and we'll take a look at it shortly.
</p>
<p>
We've been notified about this issue and we'll take a look at it shortly.
</p>
</div>
</div>
...
...
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