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

Merge branch 'wiki'

Browse source
This commit is contained in:
Benjamin Meichsner 2009-08-15 17:24:08 +02:00
commit e75a42d509
146 changed files with 6300 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

35
public/stylesheets/main.css
View file

@ -441,6 +441,7 @@ ul.autocomplete .informal {
top: -1em;
left: 5%; }
.stats-bar {
height: 20px;
min-width: 10px;
@ -448,3 +449,37 @@ ul.autocomplete .informal {
background-color: #fff;
text-align: center;
margin: 0 10px 10px 0; }
a.new_wiki_link {
color: grey; }
#preview {
border: 1px dotted grey;
padding: 0 1em; }
#toc {
float: right; }
#breadcrump {
font-size: 0.5em; }
#breadcrump a {
color: #ed0606; }
#sidebar {
float: right;
width: 20%; }
#sidebar #page-versions {
margin-top: -4em;
text-align: right; }
#sidebar #subpages {
margin-top: 2em; }
#wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 {
color: black; }
#wiki_content span.editsection {
display: none; }
#wiki-syntax-help {
float: right; }
#wiki-syntax-help table {
border-color: #78b74e; }

35
public/stylesheets/print.css
View file

@ -441,6 +441,7 @@ ul.autocomplete .informal {
top: -1em;
left: 5%; }
.stats-bar {
height: 20px;
min-width: 10px;
@ -449,6 +450,40 @@ ul.autocomplete .informal {
text-align: center;
margin: 0 10px 10px 0; }
a.new_wiki_link {
color: grey; }
#preview {
border: 1px dotted grey;
padding: 0 1em; }
#toc {
float: right; }
#breadcrump {
font-size: 0.5em; }
#breadcrump a {
color: #ed0606; }
#sidebar {
float: right;
width: 20%; }
#sidebar #page-versions {
margin-top: -4em;
text-align: right; }
#sidebar #subpages {
margin-top: 2em; }
#wiki_content h1, #wiki_content h2, #wiki_content h3, #wiki_content h4, #wiki_content h5 {
color: black; }
#wiki_content span.editsection {
display: none; }
#wiki-syntax-help {
float: right; }
#wiki-syntax-help table {
border-color: #78b74e; }
#logininfo, #header, #footer {
display: none; }

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

@ -488,6 +488,7 @@ ul.autocomplete
top: -1em
left: 5%
<<<<<<< HEAD:public/stylesheets/sass/main.sass
// group stats
.stats-bar
height: 20px
@ -495,4 +496,38 @@ ul.autocomplete
border: 1px solid #DDDDDD
background-color: #fff
text-align: center
margin: 0 10px 10px 0
margin: 0 10px 10px 0
=======
// *** wiki
a.new_wiki_link
color: grey
#preview
border: 1px dotted grey
padding: 0 1em
#toc
float: right
#breadcrump
font-size: 0.5em
a
:color = !main_red
#sidebar
float: right
width: 20%
#page-versions
margin-top: -4em
text-align: right
#subpages
margin-top: 2em
#wiki_content
h1, h2, h3, h4, h5
color: black
span.editsection
display: none
#wiki-syntax-help
float: right
table
border-color: #78b74e
>>>>>>> wiki:public/stylesheets/sass/main.sass