BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 05da3801 by Dmitriy Zaporozhets
Options

Restyled erros pages & avatar class

parent 17948951
Showing with 93 additions and 94 deletions
app/assets/stylesheets/common.scss
......@@ -249,7 +249,7 @@ ul.bordered-list li:last-child { border:none }
li.commit {
.avatar {
width:24px;
top:-3px;
top:-5px;
margin-right:10px;
margin-left:10px;
}
......@@ -305,12 +305,7 @@ p.time {
}
.styled_image {
-webkit-border-radius: 4px;
-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;
border:2px solid #ddd;
}
.event_feed {
......@@ -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/sections/header.scss
......@@ -2,14 +2,14 @@
* Application Header
*
*/
header {
header {
width:100%;
padding:0;
margin:0;
top:1px;
left:0;
background: #F1F1F1; /* for non-css3 browsers */
border-bottom: 1px solid #ccc;
border-bottom: 1px solid #ccc;
box-shadow: 0 -1px 0 white inset;
-moz-box-shadow: 0 -1px 0 white inset;
-webkit-box-shadow: 0 -1px 0 white inset;
......@@ -17,7 +17,7 @@ header {
height:60px;
/**
*
*
* Logo holder
*
*/
......@@ -27,10 +27,10 @@ header {
position:relative;
top:-5px;
a {
a {
float:left;
h1 {
h1 {
text-indent:-9999px;
width:102px;
background: url('logo_text.png') no-repeat 0px -3px;
......@@ -54,8 +54,8 @@ header {
margin-top: -10px;
}
}
.container {
.top_panel_content {
.container {
.top_panel_content {
margin:auto;
position:relative;
padding:15px 0;
......@@ -63,7 +63,7 @@ header {
}
/**
*
*
* Project / Area name
*
*/
......@@ -78,10 +78,10 @@ header {
text-shadow: 0 1px 1px #FFF;
}
.fbtn {
.fbtn {
float: right;
margin-right:10px;
.btn {
.btn {
margin-left:7px;
background: #F1F1F1;
border: 1px solid #CCC;
......@@ -90,13 +90,13 @@ header {
/**
*
*
* Search box
*
*/
.search {
.search {
float: right;
margin-right: 50px;
margin-right: 45px;
.search-input {
@extend .span2;
......@@ -110,7 +110,7 @@ header {
}
/**
*
*
* Account box
*
*/
......@@ -125,13 +125,13 @@ header {
display: block;
cursor: pointer;
img {
border-radius: 4px;
@include border-radius(4px);
right: 5px;
position: absolute;
width: 31px;
height: 31px;
width: 28px;
height: 28px;
display: block;
top: 0;
top: 2px;
&:after {
content: " ";
display: block;
......@@ -186,7 +186,7 @@ header {
width: 100px;
position: absolute;
right: 10px;
top: 46px;
top: 42px;
margin-top: 0;
float: right;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
......
app/assets/stylesheets/themes/ui_basic.scss
/**
* This file represent some UI that can be changed
* during web app restyle or theme select.
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
*/
.ui_basic {
.ui_basic {
/*
* Common styles
*
*/
a {
color: $link_color;
&:hover {
text-decoration:none;
&:hover {
text-decoration:none;
color: $blue_link;
}
}
......
app/assets/stylesheets/themes/ui_mars.scss
/**
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
* Next items should be placed there
* - link colors
* - header restyles
......@@ -13,20 +13,20 @@
* Application Header
*
*/
header {
header {
background: #474D57 url('bg-header.png') repeat-x bottom;
box-shadow:none;
border-bottom: 1px solid #444;
.fbtn {
.btn {
.fbtn {
.btn {
margin-left:8px;
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: -moz-linear-gradient(#595D63 6.6%, #31363E);
background-image: -o-linear-gradient(#595D63 6.6%, #31363E);
font-size: 12px;
&:hover {
&:hover {
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: -moz-linear-gradient(#595D63 6.6%, #202227);
......@@ -39,10 +39,10 @@
text-shadow: 0 -1px 0 #000000;
}
}
.search {
.search {
float: right;
margin-right: 55px;
.search-input {
margin-right: 45px;
.search-input {
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;
background-color: #D2D5DA;
......@@ -57,8 +57,8 @@
color: #666;
}
.app_logo {
a {
h1 {
a {
h1 {
background: url('images.png') no-repeat -3px -6px;
width: 65px;
height: 26px;
......
app/assets/stylesheets/themes/ui_modern.scss
......@@ -91,7 +91,7 @@
*/
.search {
float: right;
margin-right: 55px;
margin-right: 45px;
.search-input {
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;
......@@ -127,6 +127,7 @@
.account-box {
top:6px;
img {
top:1px;
right: 5px;
width: 26px;
height: 26px;
......
app/views/errors/access_denied.html.haml
.alert-message.block-message.error
%h3 Access Denied
%hr
%p Youre not allowed to access this page
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
%h1 Access Denied
%hr
%h2 You are not allowed to access this page
%p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"}
app/views/errors/git_not_found.html.haml
.alert-message.block-message.error
%h3 Git Resource Not found
%hr
%p
Application cant get access to some
%span.label branch
or
%span.label commit
in your repository. Maybe it was moved
%h1 404
%hr
%h2 Git Resource Not found
%p
Application cant get access to some branch or commit in your repository. Maybe it was removed
app/views/errors/gitolite.html.haml
.alert-message.block-message.error
%h3 Gitolite Error
%h4 Application cant get access to your gitolite system.
%h1 Git Error
%hr
%h2 Application cant get access to your gitolite system.
%h4 Tips for Administrator:
%ul
%li
%p
Check git logs in admin area
%li
%p
Check config/gitlab.yml for correct settings.
%li
%p
Diagnostic tool:
.git_error_tips
%h4 Tips for Administrator:
%ol
%li
%p
Check git logs in admin area
%li
%p
Check config/gitlab.yml for correct settings.
%li
%p
Diagnostic tool:
%pre
bundle exec rake gitlab:app:status RAILS_ENV=production
%li
%p
Permissions:
%pre
bundle exec rake gitlab:app:status RAILS_ENV=production
%li
%p
Permissions:
%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
= 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
.alert-message.block-message.error
%h3 Not found
%hr
%p Resource you were looking for doesn't exist.
%P You may have mistyped the address or it was removed.
%h1 404
%hr
%h2 Resource you were looking for doesn't exist.
%p You may have mistyped the address or the page may have moved.
app/views/layouts/error.html.haml
......@@ -6,5 +6,5 @@
= render "layouts/head_panel", title: ""
.container
.content
%br
%h3= yield
%center.padded.prepend-top-20
= yield
public/404.html
......@@ -7,7 +7,7 @@
<body>
<h1>404</h1>
<div class="alert-message block-message error">
<div>
<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>
</div>
......
public/422.html
......@@ -8,7 +8,7 @@
<body>
<!-- This file lives in public/422.html -->
<h1>422</h1>
<div class="alert-message block-message error">
<div>
<h2>The change you wanted was rejected.</h2>
<p>Maybe you tried to change something you didn't have access to.</p>
</div>
......
public/500.html
......@@ -8,7 +8,7 @@
<body>
<!-- This file lives in public/500.html -->
<h1>500</h1>
<div class="alert-message block-message error">
<div>
<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>
</div>
......
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