Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Redirect /pages/id to /wiki/permalink

Browse source
This commit is contained in:
Benjamin Meichsner 2009-09-28 15:31:20 +02:00
parent eca24d30f2
commit 7c192bbad3
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
public/stylesheets/main.css
View file

@ -443,7 +443,6 @@ ul.autocomplete .informal {
top: -1em;
left: 5%; }
<<<<<<< HEAD:public/stylesheets/main.css
.stats-bar {
height: 20px;
min-width: 10px;
@ -452,10 +451,6 @@ ul.autocomplete .informal {
text-align: center;
margin: 0 10px 10px 0; }
.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
padding-left: 0;
padding-top: 10px; }
=======
#wiki_content {
border-style: none;
color: black;
@ -499,7 +494,6 @@ ul.autocomplete .informal {
margin: 0.3em 0 0 3.2em;
padding: 0;
list-style-image: none; }
>>>>>>> wiki:public/stylesheets/main.css
a.new_wiki_link {
color: grey; }
@ -536,7 +530,7 @@ a.new_wiki_link {
float: right;
width: 290px;
margin-top: -60px; }
#sidebar #page-versions {
#sidebar #sidebar-links {
margin-bottom: 18px;
text-align: right; }
#sidebar #subpages {

8
public/stylesheets/print.css
View file

@ -443,7 +443,6 @@ ul.autocomplete .informal {
top: -1em;
left: 5%; }
<<<<<<< HEAD:public/stylesheets/print.css
.stats-bar {
height: 20px;
min-width: 10px;
@ -452,10 +451,6 @@ ul.autocomplete .informal {
text-align: center;
margin: 0 10px 10px 0; }
.wiki_show h1, .wiki_version h1, .wiki_new h1, .wiki_edit h1, .wiki_all h1 {
padding-left: 0;
padding-top: 10px; }
=======
#wiki_content {
border-style: none;
color: black;
@ -499,7 +494,6 @@ ul.autocomplete .informal {
margin: 0.3em 0 0 3.2em;
padding: 0;
list-style-image: none; }
>>>>>>> wiki:public/stylesheets/print.css
a.new_wiki_link {
color: grey; }
@ -536,7 +530,7 @@ a.new_wiki_link {
float: right;
width: 290px;
margin-top: -60px; }
#sidebar #page-versions {
#sidebar #sidebar-links {
margin-bottom: 18px;
text-align: right; }
#sidebar #subpages {

2
public/stylesheets/sass/main.sass
View file

@ -577,7 +577,7 @@ a.new_wiki_link
float: right
width: 290px
margin-top: -60px
#page-versions
#sidebar-links
margin-bottom: 18px
text-align: right
#subpages