Merge remote-tracking branch 'upstream/master' into frontend-tweak

This commit is contained in:
kristi
2012-05-08 14:58:32 -07:00
4 changed files with 356 additions and 337 deletions
+1
View File
@@ -1,5 +1,6 @@
rvm: rvm:
- 1.8.7 - 1.8.7
- 1.9.3
notifications: notifications:
disabled: true disabled: true
before_install: before_install:
+3
View File
@@ -472,6 +472,9 @@ like Rack::Auth, OmniAuth, etc.
Precious::App.set(:default_markup, :markdown) # set your favorite markup language Precious::App.set(:default_markup, :markdown) # set your favorite markup language
run Precious::App run Precious::App
## Windows Filename Validation
Note that filenames on windows must not contain any of the following characters `\ / : * ? " < > |`. See [this support article](http://support.microsoft.com/kb/177506) for details.
## Testing ## Testing
[![Build Status](https://secure.travis-ci.org/github/gollum.png?branch=master)](http://travis-ci.org/github/gollum) [![Build Status](https://secure.travis-ci.org/github/gollum.png?branch=master)](http://travis-ci.org/github/gollum)
+349 -334
View File
@@ -10,6 +10,17 @@
A basic stylesheet for Gollum A basic stylesheet for Gollum
*/ */
/*
Fixes AsciiDoc listing block rendering.
Must be !important to override
.markdown-body code, .markdown-body tt {
in template.css.
https://github.com/github/gollum/issues/278
*/
pre > tt {
white-space: pre !important;
}
/* @section core */ /* @section core */
body, html { body, html {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -42,13 +53,13 @@ a:hover, a:visited {
overflow: hidden; overflow: hidden;
} }
#head h1 { #head h1 {
display: none; display: none;
} }
#head ul.actions { #head ul.actions {
float: right; float: right;
} }
/* @section content */ /* @section content */
#wiki-content { #wiki-content {
@@ -56,148 +67,152 @@ a:hover, a:visited {
overflow: visible; overflow: visible;
} }
#wiki-content .wrap { #wiki-content .wrap {
height: 1%; height: 1%;
overflow: auto; overflow: auto;
} }
/* @section comments */ /* @section comments */
#wiki-body #inline-comment { #wiki-body #inline-comment {
display: none; /* todo */ display: none; /* todo */
} }
/* @section body */ /* @section body */
#wiki-body { #wiki-body {
display: block; display: block;
float: left; float: left;
margin-right: 3%; margin-right: 3%;
margin-bottom: 40px; margin-bottom: 40px;
width: 100%; width: 100%;
} }
.has-rightbar #wiki-body { .has-rightbar #wiki-body {
width: 68%; width: 68%;
} }
/* @section rightbar */ /* @section rightbar */
#wiki-rightbar { #wiki-rightbar {
background-color: #f7f7f7; background-color: #f7f7f7;
border: 1px solid #ddd; border: 1px solid #ddd;
font-size: 13px; font-size: 13px;
float: right; float: right;
padding: 7px; padding: 7px;
width: 25%; width: 25%;
color: #555; color: #555;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em; -webkit-border-radius: 0.5em;
} }
#wiki-rightbar p { #wiki-rightbar p {
margin: 13px 0 0; margin: 13px 0 0;
} }
#wiki-rightbar > p:first-child { #wiki-rightbar > p:first-child {
margin-top: 10px; margin-top: 10px;
} }
#wiki-rightbar p.parent { #wiki-rightbar p.parent {
border-bottom: 1px solid #bbb; border-bottom: 1px solid #bbb;
font-weight: bold; font-weight: bold;
margin: 0 0 0.5em 0; margin: 0 0 0.5em 0;
padding: 0 0 0.5em 0; padding: 0 0 0.5em 0;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
/* Back arrow */ /* Back arrow */
#wiki-rightbar p.parent:before { #wiki-rightbar p.parent:before {
color: #666; color: #666;
content: "← "; content: "← ";
} }
/* @section footer */ /* @section footer */
#wiki-footer { #wiki-footer {
clear: both; clear: both;
margin: 2em 0 5em; margin: 2em 0 5em;
} }
.has-rightbar #wiki-footer { .has-rightbar #wiki-footer {
width: 70%; width: 70%;
} }
#wiki-footer #footer-content { #wiki-header #header-content,
background-color: #f7f7f7; #wiki-footer #footer-content {
border: 1px solid #ddd; background-color: #f7f7f7;
font-size: 1.2em; border: 1px solid #ddd;
line-height: 1.5em; padding: 1em;
margin-top: 1.5em;
padding: 1em;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em; -webkit-border-radius: 0.5em;
} }
#wiki-header #header-content {
margin-bottom: 1.5em;
}
#wiki-footer #footer-content {
margin-top: 1.5em;
}
#wiki-footer #footer-content h3 { #wiki-footer #footer-content h3 {
font-size: 1.2em; font-size: 1.2em;
color: #333; color: #333;
margin: 0; margin: 0;
padding: 0 0 0.2em; padding: 0 0 0.2em;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
#wiki-footer #footer-content p { #wiki-footer #footer-content p {
margin: 0.5em 0 0; margin: 0.5em 0 0;
padding: 0; padding: 0;
} }
#wiki-footer #footer-content ul.links { #wiki-footer #footer-content ul.links {
margin: 0.5em 0 0; margin: 0.5em 0 0;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
} }
#wiki-footer #footer-content ul.links li { #wiki-footer #footer-content ul.links li {
color: #999; color: #999;
float: left; float: left;
list-style-position: inside; list-style-position: inside;
list-style-type: square; list-style-type: square;
padding: 0; padding: 0;
margin-left: 0.75em; margin-left: 0.75em;
} }
#wiki-footer #footer-content ul.links li a { #wiki-footer #footer-content ul.links li a {
font-weight: bold; font-weight: bold;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
} }
#wiki-footer #footer-content ul.links li:first-child { #wiki-footer #footer-content ul.links li:first-child {
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
} }
.ff #wiki-footer #footer-content ul.links li:first-child { .ff #wiki-footer #footer-content ul.links li:first-child {
margin: 0 -0.75em 0 0; margin: 0 -0.75em 0 0;
} }
/* @section page-footer */ /* @section page-footer */
.page #footer { .page #footer {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
margin: 1em 0 7em; margin: 1em 0 7em;
} }
#footer p#last-edit { #footer p#last-edit {
font-size: .9em; font-size: .9em;
line-height: 1.6em; line-height: 1.6em;
color: #999; color: #999;
margin: 0.9em 0; margin: 0.9em 0;
} }
#footer p#last-edit span.username { #footer p#last-edit span.username {
font-weight: bold; font-weight: bold;
} }
/* @section history */ /* @section history */
@@ -206,109 +221,109 @@ a:hover, a:visited {
font-weight: normal; font-weight: normal;
} }
.history h1 strong { .history h1 strong {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
#wiki-history { #wiki-history {
margin-top: 2em; margin-top: 2em;
} }
#wiki-history fieldset { #wiki-history fieldset {
border: 0; border: 0;
margin: 1em 0; margin: 1em 0;
padding: 0; padding: 0;
} }
#wiki-history table, #wiki-history tbody { #wiki-history table, #wiki-history tbody {
border-collapse: collapse; border-collapse: collapse;
padding: 0; padding: 0;
margin: 0; margin: 0;
width: 100%; width: 100%;
} }
#wiki-history table tr { #wiki-history table tr {
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
#wiki-history table tr { #wiki-history table tr {
background-color: #ebf2f6; background-color: #ebf2f6;
} }
#wiki-history table tr td { #wiki-history table tr td {
border: 1px solid #c0dce9; border: 1px solid #c0dce9;
font-size: 1em; font-size: 1em;
line-height: 1.6em; line-height: 1.6em;
margin: 0; margin: 0;
padding: 0.3em 0.7em; padding: 0.3em 0.7em;
} }
#wiki-history table tr td.checkbox { #wiki-history table tr td.checkbox {
width: 4em; width: 4em;
padding: 0.3em; padding: 0.3em;
} }
#wiki-history table tr td.checkbox input { #wiki-history table tr td.checkbox input {
cursor: pointer; cursor: pointer;
display: block; display: block;
padding-right: 0; padding-right: 0;
padding-top: 0.4em; padding-top: 0.4em;
margin: 0 auto; margin: 0 auto;
width: 1.2em; width: 1.2em;
height: 1.2em; height: 1.2em;
} }
#wiki-history table tr:nth-child(2n), #wiki-history table tr:nth-child(2n),
#wiki-history table tr.alt-row { #wiki-history table tr.alt-row {
background-color: #f3f7fa; background-color: #f3f7fa;
} }
#wiki-history table tr.selected { #wiki-history table tr.selected {
background-color: #ffffea !important; background-color: #ffffea !important;
z-index: 100; z-index: 100;
} }
#wiki-history table tr td.commit-name { #wiki-history table tr td.commit-name {
border-left: 0; border-left: 0;
} }
#wiki-history table tr td.commit-name span.time-elapsed { #wiki-history table tr td.commit-name span.time-elapsed {
color: #999; color: #999;
} }
#wiki-history table tr td.author { #wiki-history table tr td.author {
width: 20%; width: 20%;
} }
#wiki-history table tr td.author a { #wiki-history table tr td.author a {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
#wiki-history table tr td.author a span.username { #wiki-history table tr td.author a span.username {
display: block; display: block;
padding-top: 3px; padding-top: 3px;
} }
#wiki-history table tr td img { #wiki-history table tr td img {
background-color: #fff; background-color: #fff;
border: 1px solid #999; border: 1px solid #999;
display: block; display: block;
float: left; float: left;
height: 18px; height: 18px;
overflow: hidden; overflow: hidden;
margin: 0 0.5em 0 0; margin: 0 0.5em 0 0;
width: 18px; width: 18px;
padding: 2px; padding: 2px;
} }
#wiki-history table tr td.commit-name a { #wiki-history table tr td.commit-name a {
font-size: 0.9em; font-size: 0.9em;
font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace; font-family: 'Monaco', 'Andale Mono', Consolas, 'Courier New', monospace;
padding: 0 0.2em; padding: 0 0.2em;
} }
.history #footer { .history #footer {
margin-bottom: 7em; margin-bottom: 7em;
@@ -326,10 +341,10 @@ a:hover, a:visited {
font-weight: normal; font-weight: normal;
} }
.edit h1 strong { .edit h1 strong {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
/* @section search */ /* @section search */
@@ -338,42 +353,42 @@ a:hover, a:visited {
font-weight: normal; font-weight: normal;
} }
.results h1 strong { .results h1 strong {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
.results #results { .results #results {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
margin-bottom: 2em; margin-bottom: 2em;
padding-bottom: 2em; padding-bottom: 2em;
} }
.results #results ul { .results #results ul {
margin: 2em 0 0 0; margin: 2em 0 0 0;
padding: 0; padding: 0;
} }
.results #results ul li { .results #results ul li {
font-size: 1.2em; font-size: 1.2em;
line-height: 1.6em; line-height: 1.6em;
list-style-position: outside; list-style-position: outside;
padding: 0.2em 0; padding: 0.2em 0;
} }
.results #results ul li span.count { .results #results ul li span.count {
color: #999; color: #999;
} }
.results p#no-results { .results p#no-results {
font-size: 1.2em; font-size: 1.2em;
line-height: 1.6em; line-height: 1.6em;
margin-top: 2em; margin-top: 2em;
} }
.results #footer ul.actions li { .results #footer ul.actions li {
margin: 0 1em 0 0; margin: 0 1em 0 0;
} }
/* @section compare */ /* @section compare */
@@ -382,52 +397,52 @@ a:hover, a:visited {
font-weight: normal; font-weight: normal;
} }
.compare h1 strong { .compare h1 strong {
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
.compare #compare-content { .compare #compare-content {
margin-top: 3em; margin-top: 3em;
} }
.compare .data { .compare .data {
border: 1px solid #ddd; border: 1px solid #ddd;
margin: 1em 0 2em; margin: 1em 0 2em;
overflow: auto; overflow: auto;
} }
.compare .data table { .compare .data table {
width: 100%; width: 100%;
} }
.compare .data pre { .compare .data pre {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.compare .data pre div { .compare .data pre div {
padding: 0 0 0 1em; padding: 0 0 0 1em;
} }
.compare .data tr td { .compare .data tr td {
font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace; font-family: "Consolas", "Monaco", "Andale Mono", "Courier New", monospace;
font-size: 1.2em; font-size: 1.2em;
line-height: 1.2em; line-height: 1.2em;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.compare .data tr td + td + td { .compare .data tr td + td + td {
width: 100%; width: 100%;
} }
.compare .data td.line_numbers { .compare .data td.line_numbers {
background: #f7f7f7; background: #f7f7f7;
border-right: 1px solid #999; border-right: 1px solid #999;
color: #999; color: #999;
padding: 0 0 0 0.5em; padding: 0 0 0 0.5em;
} }
.compare #compare-content ul.actions li, .compare #compare-content ul.actions li,
.compare #footer ul.actions li { .compare #footer ul.actions li {
@@ -586,68 +601,68 @@ ul.actions {
overflow: hidden; overflow: hidden;
} }
#head #searchbar #searchbar-fauxtext { #head #searchbar #searchbar-fauxtext {
background: #fff; background: #fff;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
overflow: hidden; overflow: hidden;
height: 2.2em; height: 2.2em;
border-radius: 0.3em; border-radius: 0.3em;
-moz-border-radius: 0.3em; -moz-border-radius: 0.3em;
-webkit-border-radius: 0.3em; -webkit-border-radius: 0.3em;
} }
#head #searchbar #searchbar-fauxtext input#search-query { #head #searchbar #searchbar-fauxtext input#search-query {
border: none; border: none;
color: #000; color: #000;
float: left; float: left;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 1em; font-size: 1em;
height: inherit; height: inherit;
padding: 0 .5em; padding: 0 .5em;
-webkit-focus-ring: none; -webkit-focus-ring: none;
} }
.ie8 #head #searchbar #searchbar-fauxtext input#search-query { .ie8 #head #searchbar #searchbar-fauxtext input#search-query {
padding: 0.5em 0 0 0.5em; padding: 0.5em 0 0 0.5em;
} }
#head #searchbar #searchbar-fauxtext input#search-query.ph { #head #searchbar #searchbar-fauxtext input#search-query.ph {
color: #999; color: #999;
} }
#head #searchbar #searchbar-fauxtext #search-submit { #head #searchbar #searchbar-fauxtext #search-submit {
border: 0; border: 0;
border-left: 1px solid #d4d4d4; border-left: 1px solid #d4d4d4;
cursor: pointer; cursor: pointer;
margin: 0 !important; margin: 0 !important;
padding: 0; padding: 0;
float: right; float: right;
height: inherit; height: inherit;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
} }
#head #searchbar #searchbar-fauxtext #search-submit span { #head #searchbar #searchbar-fauxtext #search-submit span {
background-image: url(/images/icon-sprite.png); background-image: url(/images/icon-sprite.png);
background-position: -431px -1px; background-position: -431px -1px;
background-repeat: no-repeat; background-repeat: no-repeat;
display: block; display: block;
height: inherit; height: inherit;
overflow: hidden; overflow: hidden;
text-indent: -5000px; text-indent: -5000px;
width: 28px; width: 28px;
} }
.ff #head #searchbar #searchbar-fauxtext #search-submit span, .ff #head #searchbar #searchbar-fauxtext #search-submit span,
.ie #head #searchbar #searchbar-fauxtext #search-submit span { .ie #head #searchbar #searchbar-fauxtext #search-submit span {
height: 2.2em; height: 2.2em;
} }
#head #searchbar #searchbar-fauxtext #search-submit:hover span { #head #searchbar #searchbar-fauxtext #search-submit:hover span {
background-position: -431px -28px; background-position: -431px -28px;
padding: 0; padding: 0;
} }
+3 -3
View File
@@ -22,7 +22,7 @@
<div id="wiki-body" class="gollum-{{format}}-content"> <div id="wiki-body" class="gollum-{{format}}-content">
{{#has_header}} {{#has_header}}
<div id="wiki-header" class="gollum-{{header_format}}-content"> <div id="wiki-header" class="gollum-{{header_format}}-content">
<div id="header-content"> <div id="header-content" class="markdown-body">
{{{header_content}}} {{{header_content}}}
</div> </div>
</div> </div>
@@ -33,14 +33,14 @@
</div> </div>
{{#has_sidebar}} {{#has_sidebar}}
<div id="wiki-rightbar" class="gollum-{{sidebar_format}}-content"> <div id="wiki-rightbar" class="gollum-{{sidebar_format}}-content">
<div class="markdown-body"> <div id="sidebar-content" class="markdown-body">
{{{sidebar_content}}} {{{sidebar_content}}}
</div> </div>
</div> </div>
{{/has_sidebar}} {{/has_sidebar}}
{{#has_footer}} {{#has_footer}}
<div id="wiki-footer" class="gollum-{{footer_format}}-content"> <div id="wiki-footer" class="gollum-{{footer_format}}-content">
<div id="footer-content"> <div id="footer-content" class="markdown-body">
{{{footer_content}}} {{{footer_content}}}
</div> </div>
</div> </div>