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

Cherrypick of sandoz last commit

Browse source 
Conflicts:
	app/views/pages/all.html.haml
	public/stylesheets/main.css
	public/stylesheets/print.css
This commit is contained in:
Benjamin Meichsner 2009-08-16 10:13:50 +02:00
commit 42b5e7a73f
10 changed files with 145 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

18
public/stylesheets/main.css
View file

@ -441,7 +441,6 @@ ul.autocomplete .informal {
top: -1em;
left: 5%; }
.stats-bar {
height: 20px;
min-width: 10px;
@ -450,6 +449,10 @@ 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; }
a.new_wiki_link {
color: grey; }
@ -461,15 +464,22 @@ a.new_wiki_link {
float: right; }
#breadcrump {
font-size: 0.5em; }
font-size: 0.5em;
margin-bottom: 5px;
margin-top: 30px;
height: 1em;
color: #ED0606; }
#breadcrump a {
color: #ed0606; }
color: #ed0606;
text-decoration: none; }
#breadcrump a:hover {
text-decoration: underline; }
#sidebar {
float: right;
width: 20%; }
#sidebar #page-versions {
margin-top: -4em;
margin-top: -60px;
text-align: right; }
#sidebar #subpages {
margin-top: 2em; }

18
public/stylesheets/print.css
View file

@ -441,7 +441,6 @@ ul.autocomplete .informal {
top: -1em;
left: 5%; }
.stats-bar {
height: 20px;
min-width: 10px;
@ -450,6 +449,10 @@ 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; }
a.new_wiki_link {
color: grey; }
@ -461,15 +464,22 @@ a.new_wiki_link {
float: right; }
#breadcrump {
font-size: 0.5em; }
font-size: 0.5em;
margin-bottom: 5px;
margin-top: 30px;
height: 1em;
color: #ED0606; }
#breadcrump a {
color: #ed0606; }
color: #ed0606;
text-decoration: none; }
#breadcrump a:hover {
text-decoration: underline; }
#sidebar {
float: right;
width: 20%; }
#sidebar #page-versions {
margin-top: -4em;
margin-top: -60px;
text-align: right; }
#sidebar #subpages {
margin-top: 2em; }

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

@ -488,7 +488,6 @@ ul.autocomplete
top: -1em
left: 5%
<<<<<<< HEAD:public/stylesheets/sass/main.sass
// group stats
.stats-bar
height: 20px
@ -497,8 +496,11 @@ ul.autocomplete
background-color: #fff
text-align: center
margin: 0 10px 10px 0
=======
// *** wiki
.wiki_show, .wiki_version, .wiki_new, .wiki_edit, .wiki_all
h1
padding-left: 0
padding-top: 10px
a.new_wiki_link
color: grey
#preview
@ -508,13 +510,20 @@ a.new_wiki_link
float: right
#breadcrump
font-size: 0.5em
margin-bottom: 5px
margin-top: 30px
height: 1em
color: #ED0606
a
:color = !main_red
:text-decoration = none
a:hover
:text-decoration = underline
#sidebar
float: right
width: 20%
#page-versions
margin-top: -4em
margin-top: -60px
text-align: right
#subpages
margin-top: 2em
@ -530,4 +539,3 @@ a.new_wiki_link
float: right
table
border-color: #78b74e
>>>>>>> wiki:public/stylesheets/sass/main.sass