summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-28 19:40:54 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-28 19:40:54 +0200
commitc873cf81f61d644639b459b2fde1267a41050bc1 (patch)
tree6326a177a96b0cad56d3b22d3cf469f716723c74 /public
parentd8f825ef009d10fe03674989239e3a26e21fff36 (diff)
downloadgitlab-ce-c873cf81f61d644639b459b2fde1267a41050bc1.tar.gz
Restyled error messages in common way. Added title to head partial
Diffstat (limited to 'public')
-rw-r--r--public/404.html7
-rw-r--r--public/500.html9
-rw-r--r--public/githost_error.html36
-rw-r--r--public/static.css76
4 files changed, 31 insertions, 97 deletions
diff --git a/public/404.html b/public/404.html
index 3e56e52cc18..867f193a98f 100644
--- a/public/404.html
+++ b/public/404.html
@@ -7,9 +7,8 @@
<body>
<h1>404</h1>
- <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>
+ <h3>The page you were looking for doesn't exist.</h3>
+ <hr/>
+ <p>You may have mistyped the address or the page may have moved.</p>
</body>
</html>
diff --git a/public/500.html b/public/500.html
index 3be1cc259c0..5b78e3e38cb 100644
--- a/public/500.html
+++ b/public/500.html
@@ -4,13 +4,10 @@
<title>We're sorry, but something went wrong (500)</title>
<link href="/static.css" media="screen" rel="stylesheet" type="text/css" />
</head>
-
<body>
- <!-- This file lives in public/500.html -->
<h1>500</h1>
- <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>
+ <h3>We're sorry, but something went wrong.</h3>
+ <hr/>
+ <p>We've been notified about this issue and we'll take a look at it shortly.</p>
</body>
</html>
diff --git a/public/githost_error.html b/public/githost_error.html
deleted file mode 100644
index b5258ce160e..00000000000
--- a/public/githost_error.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>We're sorry, but we can't get access to your gitolite</title>
- <style type="text/css">
- body { background-color: #EAEAEA; color: #666; text-align: center; font-family: arial, sans-serif; }
- div.dialog {
- width: 600px;
- padding: 0 4em;
- margin: 4em auto 0 auto;
- }
- h1 { font-size: 48px; color: #444; line-height: 1.5em; }
- h2 { font-size: 24px; color: #666; line-height: 1.5em; }
- h3, code { text-align:left; }
- code pre { margin-left:40px; }
- </style>
-</head>
-
-<body>
- <!-- This file lives in public/500.html -->
- <div class="dialog">
- <h1>Gitolite Error</h1>
- <h2>Application can't get access to your gitolite system.</h2>
- <hr>
- <h3> 1. Check 'config/gitlab.yml' for correct settings.</h3>
- <h3> 2. Make sure web server user has access to gitolite. <a href="https://github.com/gitlabhq/gitlabhq/wiki/Gitolite">Setup tutorial</a></h3>
- <h3> 3. Try: </h3>
- <code>
- <pre>
-sudo chmod -R 770 /home/git/repositories/
-sudo chown -R git:git /home/git/repositories/
- </pre>
- </code>
- </div>
-</body>
-</html>
diff --git a/public/static.css b/public/static.css
index 6090d7b2abb..aa834553a1c 100644
--- a/public/static.css
+++ b/public/static.css
@@ -1,57 +1,31 @@
-body { color: #666; text-align: center; font-family: arial, sans-serif; margin:0; padding:0; }
-h1 { font-size: 48px; color: #444; line-height: 1.5em; }
+body {
+ color: #666;
+ text-align: center;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ sans-serif;
+ margin:0;
+ width: 800px;
+ margin: auto;
+ font-size: 14px;
+}
+h1 {
+ font-size: 56px;
+ line-height: 100px;
+ font-weight: normal;
+ color: #456;
+}
h2 { font-size: 24px; color: #666; line-height: 1.5em; }
-.alert-message {
- position: relative;
- padding: 7px 15px;
- margin-bottom: 18px;
- color: #404040;
- background-color: #eedc94;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
- background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
- background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
- background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
- background-image: -o-linear-gradient(top, #fceec1, #eedc94);
- background-image: linear-gradient(top, #fceec1, #eedc94);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFCEEC1', endColorstr='#FFEEDC94', GradientType=0);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
- border-color: #eedc94 #eedc94 #e4c652;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) fadein(rgba(0, 0, 0, 0.1), 15%);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
- border-width: 1px;
- border-style: solid;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-}
-.alert-message .close {
- margin-top: 1px;
- *margin-top: 0;
-}
-.alert-message a {
- font-weight: bold;
- color: #404040;
-}
-.alert-message.danger p a, .alert-message.error p a, .alert-message.success p a, .alert-message.info p a {
- color: #404040;
-}
-.alert-message h5 {
- line-height: 18px;
-}
-.alert-message p {
- margin-bottom: 0;
-}
-.alert-message div {
- margin-top: 5px;
- margin-bottom: 2px;
+h3 {
+ color: #456;
+ font-size: 20px;
+ font-weight: normal;
line-height: 28px;
}
-.alert-message.block-message.error {
- background: #FDDFDE;
- border-color: #FBC7C6;
+hr {
+ margin: 18px 0;
+ border: 0;
+ border-top: 1px solid #EEE;
+ border-bottom: 1px solid white;
}
-
View Lorry Controller Status