Commit 05da3801 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Restyled erros pages & avatar class

parent 17948951
...@@ -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:-3px; top:-5px;
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;
}
}
...@@ -325,9 +325,7 @@ img.avatar { ...@@ -325,9 +325,7 @@ img.avatar {
float:left; float:left;
margin-right:15px; margin-right:15px;
width:40px; width:40px;
-webkit-border-radius: 4px; border:2px solid #ddd;
-moz-border-radius: 4px;
border-radius: 4px;
&.s16 { &.s16 {
width:16px; width:16px;
......
...@@ -96,7 +96,7 @@ header { ...@@ -96,7 +96,7 @@ header {
*/ */
.search { .search {
float: right; float: right;
margin-right: 50px; margin-right: 45px;
.search-input { .search-input {
@extend .span2; @extend .span2;
...@@ -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: 31px; width: 28px;
height: 31px; height: 28px;
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: 46px; top: 42px;
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);
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
} }
.search { .search {
float: right; float: right;
margin-right: 55px; margin-right: 45px;
.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;
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
*/ */
.search { .search {
float: right; float: right;
margin-right: 55px; margin-right: 45px;
.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;
......
.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"}
.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
.alert-message.block-message.error %h1 Git Error
%h3 Gitolite Error %hr
%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
%ul
%li %li
%p %p
Check git logs in admin area Check git logs in admin area
......
.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.
...@@ -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
...@@ -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>
......
...@@ -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>
......
...@@ -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>
......
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