wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Made the Gollum theme responsive.

Browse Source 
Not a particularly comprehensive change in style, just one that removes all the fixed sizing for browsers below 940px in width.

Closes #831.
This commit is contained in:
Geoffrey Roberts
2014-05-29 16:31:10 +10:00
committed by Sunny Ripert
parent 7ba52978d1
commit 1148d29439
9 changed files with 491 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HISTORY.md
+5
View File
@@ -1,3 +1,8 @@
# Next release candidate
* Major enhancements
* Made the Gollum theme responsive [rtrvrtg] (#831)
# 2.4.11 / 2013-01-08 # 2.4.11 / 2013-01-08
* Numerous security issues have been fixed. Please update to `2.4.11` * Numerous security issues have been fixed. Please update to `2.4.11`
lib/gollum/public/gollum/css/dialog.css
+110 -8
View File
@@ -4,8 +4,11 @@
display: block; display: block;
overflow: visible; overflow: visible;
position: absolute; position: absolute;
top: 50%; top: 0;
left: 50%; left: 0;
z-index: 999999;
width: 100%;
height: 100%;
} }
#gollum-dialog-dialog.active { #gollum-dialog-dialog.active {
@@ -13,24 +16,117 @@
} }
#gollum-dialog-dialog-inner { #gollum-dialog-dialog-inner {
margin: 0 0 0 -225px; margin: 0px;
position: relative; top: 0px;
width: 450px; right: 0px;
bottom: 0px;
left: 0px;
width: 100%;
height: 100%;
}
#gollum-dialog-dialog-bg {
background-color: #fff;
padding: 1em;
height: 100%;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
@media all and (min-width: 480px) {
#gollum-dialog-dialog {
display: block;
overflow: visible;
position: absolute;
position: fixed;
top: 0;
left: 0;
z-index: 999999;
width: auto;
height: auto;
}
#gollum-dialog-dialog.active {
display: block;
}
#gollum-dialog-dialog-inner {
margin: auto;
position: fixed;
width: auto;
height: auto;
min-width: 280px;
min-height: 380px;
max-width: 450px;
max-height: 450px;
top: 10px;
right: 10px;
bottom: 10px;
left: 10px;
border: 7px solid #999; border: 7px solid #999;
border: 7px solid rgba(0, 0, 0, 0.3); border: 7px solid rgba(0, 0, 0, 0.3);
border-radius: 5px; border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
} }
#gollum-dialog-dialog-bg { #gollum-dialog-dialog-bg {
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;
padding: 1em; padding: 1em;
background: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), to(#ffffff)); background: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7), to(#ffffff));
background: -moz-linear-gradient(top, #f7f7f7, #ffffff); background: -moz-linear-gradient(top, #f7f7f7, #ffffff);
height: 100%;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
}
}
@media all and (min-width: 940px) {
#gollum-dialog-dialog {
position: absolute;
top: 50%;
left: 50%;
width: auto;
height: auto;
}
#gollum-dialog-dialog-inner {
margin: 0 0 0 -225px;
position: relative;
width: 450px;
height: auto;
top: auto;
right: auto;
bottom: auto;
left: auto;
border: 7px solid #999;
border: 7px solid rgba(0, 0, 0, 0.3);
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
}
#gollum-dialog-dialog-bg {
height: auto;
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
}
} }
#gollum-dialog-dialog-inner h4 { #gollum-dialog-dialog-inner h4 {
@@ -52,10 +148,16 @@
display: block; display: block;
border: 0; border: 0;
margin: 0; margin: 0;
overflow: hidden;
padding: 0; padding: 0;
} }
#gollum-dialog-dialog-body fieldset:after {
content: ".";
display: block;
clear: both;
visibility: hidden;
}
#gollum-dialog-dialog-body fieldset .field { #gollum-dialog-dialog-body fieldset .field {
margin: 0 0 1.5em 0; margin: 0 0 1.5em 0;
padding: 0; padding: 0;
lib/gollum/public/gollum/css/editor.css
+191 -58
View File
@@ -19,15 +19,15 @@ a {
} }
#gollum-editor { #gollum-editor {
border: 1px solid #e4e4e4; margin: 0 0 5em;
background: #f9f9f9; padding: 0em 1em 0.4em;
margin: 1em 0 5em; }
overflow: hidden;
padding: 1em 1em 0.4em;
border-radius: 1em; #gollum-editor:after {
-moz-border-radius: 1em; content: ".";
-webkit-border-radius: 1em; display: block;
visibility: hidden;
clear: both;
} }
.ff #gollum-editor, .ff #gollum-editor,
@@ -35,6 +35,18 @@ a {
padding-bottom: 1em; padding-bottom: 1em;
} }
@media all and (min-width: 940px) {
#gollum-editor {
border: 1px solid #e4e4e4;
background: #f9f9f9;
margin: 1em 0 5em;
border-radius: 1em;
-moz-border-radius: 1em;
-webkit-border-radius: 1em;
}
}
#gollum-editor form fieldset { #gollum-editor form fieldset {
border: 0; border: 0;
margin: 0; margin: 0;
@@ -45,7 +57,13 @@ a {
#gollum-editor .singleline { #gollum-editor .singleline {
display: block; display: block;
margin: 0 0 0.7em 0; margin: 0 0 0.7em 0;
overflow: hidden; }
#gollum-editor .singleline:after {
content: ".";
display: block;
visibility: hidden;
clear: both;
} }
#gollum-editor .singleline input { #gollum-editor .singleline input {
@@ -94,7 +112,6 @@ a {
/* @control function-bar */ /* @control function-bar */
#gollum-editor #gollum-editor-function-bar { #gollum-editor #gollum-editor-function-bar {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
overflow: hidden;
padding: 0; padding: 0;
} }
@@ -109,9 +126,21 @@ a {
#gollum-editor #gollum-editor-function-bar.active #gollum-editor-function-buttons { #gollum-editor #gollum-editor-function-bar.active #gollum-editor-function-buttons {
display: block; display: block;
float: left; margin: 0;
padding: 0;
}
@media all and (min-width: 940px) {
#gollum-editor #gollum-editor-function-bar {
overflow: hidden; overflow: hidden;
}
#gollum-editor #gollum-editor-function-bar.active #gollum-editor-function-buttons {
overflow: hidden;
margin: 0;
padding: 0 0 1.1em 0; padding: 0 0 1.1em 0;
float: left;
}
} }
#gollum-editor #gollum-editor-function-bar a.function-button { #gollum-editor #gollum-editor-function-bar a.function-button {
@@ -120,12 +149,12 @@ a {
color: #333; color: #333;
display: block; display: block;
float: left; float: left;
height: 25px; height: 32px;
overflow: hidden; overflow: hidden;
margin: 0.2em 0.5em 0 0; margin: 1px 1px 0 0;
/* text-indent: -5000px; */ /* text-indent: -5000px; */
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
width: 25px; width: 32px;
border-radius: 0.3em; border-radius: 0.3em;
-moz-border-radius: 0.3em; -moz-border-radius: 0.3em;
@@ -150,41 +179,84 @@ a {
background-image: url(../images/icon-sprite.png); background-image: url(../images/icon-sprite.png);
background-repeat: no-repeat; background-repeat: no-repeat;
display: block; display: block;
height: 25px; height: 32px;
overflow: hidden; overflow: hidden;
text-indent: -5000px; text-indent: -5000px;
width: 25px; width: 32px;
} }
a#function-bold span { background-position: 0 0; } a#function-bold span { background-position: 3px 3px; }
a#function-italic span { background-position: -27px 0; } a#function-italic span { background-position: -24px 3px; }
a#function-underline span { background-position: -54px 0; } a#function-underline span { background-position: -51px 3px; }
a#function-code span { background-position: -82px 0; } a#function-code span { background-position: -79px 3px; }
a#function-ul span { background-position: -109px 0; } a#function-ul span { background-position: -106px 3px; }
a#function-ol span { background-position: -136px 0; } a#function-ol span { background-position: -133px 3px; }
a#function-blockquote span { background-position: -163px 0; } a#function-blockquote span { background-position: -160px 3px; }
a#function-hr span { background-position: -190px 0; } a#function-hr span { background-position: -187px 3px; }
a#function-h1 span { background-position: -217px 0; } a#function-h1 span { background-position: -214px 3px; }
a#function-h2 span { background-position: -244px 0; } a#function-h2 span { background-position: -241px 3px; }
a#function-h3 span { background-position: -271px 0; } a#function-h3 span { background-position: -268px 3px; }
a#function-link span { background-position: -298px 0; } a#function-link span { background-position: -295px 3px; }
a#function-image span { background-position: -324px 0; } a#function-image span { background-position: -321px 3px; }
a#function-help span { background-position: -405px 0; } a#function-help span { background-position: -402px 3px; }
a#function-bold:hover span { background-position: 0 -28px; } a#function-bold:hover span { background-position: 3px -25px; }
a#function-italic:hover span { background-position: -27px -28px; } a#function-italic:hover span { background-position: -24px -25px; }
a#function-underline:hover span { background-position: -54px -28px; } a#function-underline:hover span { background-position: -51px -25px; }
a#function-code:hover span { background-position: -82px -28px; } a#function-code:hover span { background-position: -79px -25px; }
a#function-ul:hover span { background-position: -109px -28px; } a#function-ul:hover span { background-position: -106px -25px; }
a#function-ol:hover span { background-position: -136px -28px; } a#function-ol:hover span { background-position: -133px -25px; }
a#function-blockquote:hover span { background-position: -163px -28px; } a#function-blockquote:hover span { background-position: -160px -25px; }
a#function-hr:hover span { background-position: -190px -28px; } a#function-hr:hover span { background-position: -187px -25px; }
a#function-h1:hover span { background-position: -217px -28px; } a#function-h1:hover span { background-position: -214px -25px; }
a#function-h2:hover span { background-position: -244px -28px; } a#function-h2:hover span { background-position: -241px -25px; }
a#function-h3:hover span { background-position: -271px -28px; } a#function-h3:hover span { background-position: -268px -25px; }
a#function-link:hover span { background-position: -298px -28px; } a#function-link:hover span { background-position: -295px -25px; }
a#function-image:hover span { background-position: -324px -28px; } a#function-image:hover span { background-position: -321px -25px; }
a#function-help:hover span { background-position: -405px -28px; } a#function-help:hover span { background-position: -402px -25px; }
@media all and (min-width: 940px) {
#gollum-editor #gollum-editor-function-bar a.function-button {
height: 25px;
width: 25px;
margin: 0.2em 0.5em 0 0;
}
#gollum-editor #gollum-editor-function-bar a span {
width: 25px;
height: 25px;
}
a#function-bold span { background-position: 0 0; }
a#function-italic span { background-position: -27px 0; }
a#function-underline span { background-position: -54px 0; }
a#function-code span { background-position: -82px 0; }
a#function-ul span { background-position: -109px 0; }
a#function-ol span { background-position: -136px 0; }
a#function-blockquote span { background-position: -163px 0; }
a#function-hr span { background-position: -190px 0; }
a#function-h1 span { background-position: -217px 0; }
a#function-h2 span { background-position: -244px 0; }
a#function-h3 span { background-position: -271px 0; }
a#function-link span { background-position: -298px 0; }
a#function-image span { background-position: -324px 0; }
a#function-help span { background-position: -405px 0; }
a#function-bold:hover span { background-position: 0 -28px; }
a#function-italic:hover span { background-position: -27px -28px; }
a#function-underline:hover span { background-position: -54px -28px; }
a#function-code:hover span { background-position: -82px -28px; }
a#function-ul:hover span { background-position: -109px -28px; }
a#function-ol:hover span { background-position: -136px -28px; }
a#function-blockquote:hover span { background-position: -163px -28px; }
a#function-hr:hover span { background-position: -190px -28px; }
a#function-h1:hover span { background-position: -217px -28px; }
a#function-h2:hover span { background-position: -244px -28px; }
a#function-h3:hover span { background-position: -271px -28px; }
a#function-link:hover span { background-position: -298px -28px; }
a#function-image:hover span { background-position: -324px -28px; }
a#function-help:hover span { background-position: -405px -28px; }
}
#gollum-editor #gollum-editor-function-bar a.disabled { #gollum-editor #gollum-editor-function-bar a.disabled {
@@ -192,14 +264,19 @@ a#function-help:hover span { background-position: -405px -28px; }
} }
#gollum-editor #gollum-editor-function-bar span.function-divider { #gollum-editor #gollum-editor-function-bar span.function-divider {
display: block; display: none;
float: left;
width: 0.5em;
} }
#gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector { #gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector {
overflow: hidden; padding: 0.2em 0 0.5em 0;
padding: .2em 0 .5em 0; clear: both;
}
#gollum-editor #gollum-editor-function-bar #gollum-editor-format-selector:after {
content: ".";
display: block;
clear: both;
visibility: hidden;
} }
#gollum-editor #gollum-editor-function-bar #gollum-editor #gollum-editor-function-bar
@@ -208,13 +285,12 @@ a#function-help:hover span { background-position: -405px -28px; }
border: 1px solid #ddd; border: 1px solid #ddd;
color: #333; color: #333;
float: right;
font-size: 1em; font-size: 1em;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-weight: bold; font-weight: bold;
line-height: 1.6em; line-height: 1.6em;
padding: 0.3em 0.4em; padding: 0.3em 0.4em;
display: inline-block;
border-radius: 0.5em; border-radius: 0.5em;
-moz-border-radius: 0.5em; -moz-border-radius: 0.5em;
@@ -224,11 +300,11 @@ a#function-help:hover span { background-position: -405px -28px; }
#gollum-editor #gollum-editor-function-bar #gollum-editor #gollum-editor-function-bar
#gollum-editor-format-selector label { #gollum-editor-format-selector label {
color: #999; color: #999;
float: right;
font-size: 1em; font-size: 1em;
font-weight: bold; font-weight: bold;
line-height: 1.6em; line-height: 1.6em;
padding: .3em 0.5em 0 0; padding: .3em 0.5em 0 0;
display: inline-block;
} }
#gollum-editor #gollum-editor-function-bar #gollum-editor #gollum-editor-function-bar
@@ -236,6 +312,31 @@ a#function-help:hover span { background-position: -405px -28px; }
content: ':'; content: ':';
} }
@media all and (min-width: 940px) {
#gollum-editor #gollum-editor-function-bar span.function-divider {
display: block;
width: 0.5em;
}
#gollum-editor #gollum-editor-function-bar span.function-divider {
float: left;
}
#gollum-editor #gollum-editor-function-bar
#gollum-editor-format-selector {
clear: none;
text-align: right;
}
#gollum-editor #gollum-editor-function-bar
#gollum-editor-format-selector select {
}
#gollum-editor #gollum-editor-function-bar
#gollum-editor-format-selector label {
}
}
/* @section form-fields */ /* @section form-fields */
@@ -245,12 +346,18 @@ a#function-help:hover span { background-position: -405px -28px; }
font-size: 1em; font-size: 1em;
font-family: Consolas, "Liberation Mono", Courier, monospace; font-family: Consolas, "Liberation Mono", Courier, monospace;
line-height: 1.4em; line-height: 1.4em;
margin: 1em 0 0.4em; margin: 0 0 0.4em;
padding: 0.5em; padding: 0.5em;
width: 98%; width: 98%;
height: 20em; height: 20em;
} }
@media all and (min-width: 940px) {
#gollum-editor textarea {
margin: 1em 0 0.4em;
}
}
#gollum-editor input#gollum-editor-submit { #gollum-editor input#gollum-editor-submit {
background-color: #f7f7f7; background-color: #f7f7f7;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
@@ -445,6 +552,7 @@ a#function-help:hover span { background-position: -405px -28px; }
/* @section help */ /* @section help */
#gollum-editor-help { #gollum-editor-help {
clear: both;
margin: 0; margin: 0;
overflow: hidden; overflow: hidden;
padding: 0; padding: 0;
@@ -455,13 +563,13 @@ a#function-help:hover span { background-position: -405px -28px; }
#gollum-editor-help-parent, #gollum-editor-help-parent,
#gollum-editor-help-list { #gollum-editor-help-list {
display: block; display: block;
float: left;
height: 17em;
list-style-type: none; list-style-type: none;
overflow: auto;
margin: 0; margin: 0;
padding: 1em 0; float: left;
width: 18%; width: 50%;
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
} }
#gollum-editor-help-parent { #gollum-editor-help-parent {
@@ -491,6 +599,7 @@ a#function-help:hover span { background-position: -405px -28px; }
width: auto; width: auto;
padding: 0.2em 1em; padding: 0.2em 1em;
text-shadow: 0 -1px 0 #fff; text-shadow: 0 -1px 0 #fff;
font-size: 0.8em;
} }
#gollum-editor-help-parent li a:hover, #gollum-editor-help-parent li a:hover,
@@ -518,6 +627,7 @@ a#function-help:hover span { background-position: -405px -28px; }
overflow: auto; overflow: auto;
height: 17em; height: 17em;
padding: 1em; padding: 1em;
clear: both;
} }
#gollum-editor-help-content { #gollum-editor-help-content {
@@ -532,6 +642,29 @@ a#function-help:hover span { background-position: -405px -28px; }
padding: 0; padding: 0;
} }
@media all and (min-width: 940px) {
#gollum-editor-help {
clear: none;
}
#gollum-editor-help-parent,
#gollum-editor-help-list {
height: 17em;
width: 18%;
overflow: auto;
padding: 1em 0;
}
#gollum-editor-help-parent li a,
#gollum-editor-help-list li a {
font-size: 1em;
}
#gollum-editor-help-wrapper {
clear: none;
}
}
/* IE */ /* IE */
.ie #gollum-editor .singleline input { .ie #gollum-editor .singleline input {
padding-top: 0.25em; padding-top: 0.25em;
lib/gollum/public/gollum/css/gollum.css
+130 -19
View File
@@ -21,9 +21,15 @@ body, html {
#wiki-wrapper { #wiki-wrapper {
margin: 0 auto; margin: 0 auto;
overflow: visible; overflow: visible;
width: 920px; width: 100%;
}
@media all and (min-width: 940px) {
#wiki-wrapper {
max-width: 920px;
padding-left:20px; padding-left:20px;
padding-right:20px; padding-right:20px;
}
} }
a:link { a:link {
@@ -39,22 +45,41 @@ a:hover, a:visited {
/* @section head */ /* @section head */
#head { #head {
border-bottom: 1px solid #ddd; margin: 1em 0 0;
margin: 4em 0 1.5em; padding: 0;
padding-bottom: 0.3em;
overflow: hidden; overflow: hidden;
} }
#head h1 { #head h1 {
font-size: 2.5em; font-size: 1.5em;
float: left; float: left;
line-height: normal; line-height: normal;
margin: 0; margin: 0;
padding: 2px 0 0 0; padding: 0 0 0 0.667em;
} }
#head ul.actions { #head ul.actions {
clear: both;
margin: 0 1em;
}
@media all and (min-width: 940px) {
#head {
border-bottom: 1px solid #ddd;
padding-bottom: 0.3em;
margin: 4em 0 1.5em;
}
#head h1 {
font-size: 2.5em;
padding: 2px 0 0 0;
}
#head ul.actions {
clear: none;
float: right; float: right;
margin: 0;
}
} }
/* @section content */ /* @section content */
@@ -244,6 +269,16 @@ a:hover, a:visited {
font-weight: bold; font-weight: bold;
} }
#footer .actions {
margin-left: 1em;
}
@media all and (min-width: 940px) {
#footer .actions {
margin: 0;
}
}
/* @section history */ /* @section history */
.history h1 { .history h1 {
@@ -257,7 +292,7 @@ a:hover, a:visited {
} }
#wiki-history { #wiki-history {
margin-top: 2em; margin: 2em 1em 0 1em;
} }
#wiki-history fieldset { #wiki-history fieldset {
@@ -283,7 +318,8 @@ a:hover, a:visited {
} }
#wiki-history table tr td { #wiki-history table tr td {
border: 1px solid #c0dce9; border-top: 1px solid #c0dce9;
border-bottom: 1px solid #c0dce9;
font-size: 1em; font-size: 1em;
line-height: 1.6em; line-height: 1.6em;
margin: 0; margin: 0;
@@ -291,8 +327,8 @@ a:hover, a:visited {
} }
#wiki-history table tr td.checkbox { #wiki-history table tr td.checkbox {
width: 4em; width: auto;
padding: 0.3em; padding: 0 0.2em 0 0;
} }
#wiki-history table tr td.checkbox input { #wiki-history table tr td.checkbox input {
@@ -364,6 +400,25 @@ a:hover, a:visited {
margin: 0 0.6em 0 0; margin: 0 0.6em 0 0;
} }
@media all and (min-width: 940px) {
#wiki-history {
margin: 2em 0 0 0;
}
#wiki-history table tr td {
border: 1px solid #c0dce9;
font-size: 1em;
line-height: 1.6em;
margin: 0;
padding: 0.3em 0.7em;
}
#wiki-history table tr td.checkbox {
width: 4em;
padding: 0.3em;
}
}
/* @section edit */ /* @section edit */
.edit h1 { .edit h1 {
@@ -378,6 +433,7 @@ a:hover, a:visited {
/* @section search */ /* @section search */
.results h1 { .results h1 {
color: #999; color: #999;
font-weight: normal; font-weight: normal;
@@ -390,6 +446,8 @@ a:hover, a:visited {
.results #results { .results #results {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
margin-left: 1em;
margin-right: 1em;
margin-bottom: 2em; margin-bottom: 2em;
padding-bottom: 2em; padding-bottom: 2em;
} }
@@ -400,12 +458,33 @@ a:hover, a:visited {
} }
.results #results ul li { .results #results ul li {
font-size: 1.2em; list-style: none;
line-height: 1.6em;
list-style-position: outside;
padding: 0.2em 0; padding: 0.2em 0;
} }
.results #results ul li a {
word-wrap: break-word;
}
@media all and (min-width: 640px) {
.results #results ul li {
font-size: 1.2em;
}
}
@media all and (min-width: 940px) {
.results #results {
margin-left: 0;
margin-right: 0;
}
.results #results ul li {
list-style: disc;
list-style-position: outside;
line-height: 1.6em;
}
}
.results #results ul li span.count { .results #results ul li span.count {
color: #999; color: #999;
} }
@@ -522,8 +601,8 @@ ul.actions {
ul.actions li { ul.actions li {
float: left; float: left;
font-size: 0.9em; font-size: 0.9em;
margin-left: 0.6em; margin-left: 1px;
margin-bottom: 0.6em; margin-bottom: 1px;
} }
.minibutton a { .minibutton a {
@@ -533,7 +612,7 @@ ul.actions {
display: block; display: block;
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
padding: 0.4em 1em; padding: 0.6em 1em;
height: 1.4em; height: 1.4em;
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
@@ -547,6 +626,18 @@ ul.actions {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
} }
@media all and (min-width: 940px) {
ul.actions li {
margin-left: 0.6em;
margin-bottom: 0.6em;
}
.minibutton a {
padding: 0.4em 1em;
height: 1.4em;
}
}
#search-submit { #search-submit {
background-color: #f7f7f7; background-color: #f7f7f7;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
@@ -627,7 +718,7 @@ ul.actions {
/* @control searchbar */ /* @control searchbar */
#head #searchbar { #head #searchbar {
float: right; float: right;
padding: 0; padding: 2px 0 0 0;
overflow: hidden; overflow: hidden;
} }
@@ -684,7 +775,7 @@ ul.actions {
height: inherit; height: inherit;
overflow: hidden; overflow: hidden;
text-indent: -5000px; text-indent: -5000px;
width: 28px; width: 32px;
} }
.ff #head #searchbar #searchbar-fauxtext #search-submit span, .ff #head #searchbar #searchbar-fauxtext #search-submit span,
@@ -697,11 +788,31 @@ ul.actions {
padding: 0; padding: 0;
} }
@media all and (min-width: 940px) {
#head #searchbar {
padding: 0;
}
#head #searchbar #searchbar-fauxtext #search-submit span {
width: 28px;
}
#head #searchbar #searchbar-fauxtext #search-submit:hover span {
background-position: -431px -28px;
}
}
/* @section pages */ /* @section pages */
#pages { #pages {
font-size: 1.2em; font-size: 1.2em;
margin-bottom: 20px; margin: 0 1em 20px 1em;
}
@media all and (min-width: 940px) {
#pages {
margin: 0 0 20px 0;
}
} }
#pages ul { #pages ul {
lib/gollum/public/gollum/css/ie7.css
+6
View File
@@ -1,5 +1,11 @@
/* IE7-specific styles */ /* IE7-specific styles */
.ie #wiki-wrapper {
width: 920px;
padding-left:20px;
padding-right:20px;
}
.ie #head #searchbar #searchbar-fauxtext input#search-query { .ie #head #searchbar #searchbar-fauxtext input#search-query {
border: 0; border: 0;
float: left; float: left;
lib/gollum/public/gollum/css/template.css
+7 -2
View File
@@ -52,7 +52,6 @@ body {
font: 13.34px Helvetica, arial, freesans, clean, sans-serif; font: 13.34px Helvetica, arial, freesans, clean, sans-serif;
font-size: small; font-size: small;
line-height: 1.4; line-height: 1.4;
min-width: 980px;
} }
img { img {
@@ -86,13 +85,19 @@ a:active, a:hover {
} }
.markdown-body { .markdown-body {
padding: 30px; padding: 1em;
font-size: 15px; font-size: 15px;
line-height: 1.7; line-height: 1.7;
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
} }
@media all and (min-width: 940px) {
.markdown-body {
padding: 30px;
}
}
.markdown-body > *:first-child { .markdown-body > *:first-child {
margin-top: 0 !important; margin-top: 0 !important;
} }
lib/gollum/public/gollum/javascript/gollum.dialog.js
+22
View File
@@ -13,6 +13,12 @@
markupCreated: false, markupCreated: false,
markup: '', markup: '',
currentAspect: function(){
if (window.innerWidth < 480) return "small-mobile";
if ($('#gollum-dialog-dialog').css('position') == 'fixed') return "large-mobile";
return "desktop";
},
attachEvents: function( evtOK ) { attachEvents: function( evtOK ) {
$('#gollum-dialog-action-ok').click(function( e ) { $('#gollum-dialog-action-ok').click(function( e ) {
Dialog.eventOK( e, evtOK ); Dialog.eventOK( e, evtOK );
@@ -185,6 +191,8 @@
} }
}); });
} }
$(window).unbind('resize', Dialog.resize);
} }
}, },
@@ -268,15 +276,29 @@
}); });
} }
} }
$(window).bind('resize', Dialog.resize);
} }
}, },
resize: function(){
Dialog.position();
},
position: function() { position: function() {
if (Dialog.currentAspect() == "small-mobile") {
$('#gollum-dialog-dialog-inner').css('height', '100%').css('margin-top', 'auto');
}
else if (Dialog.currentAspect() == "large-mobile") {
$('#gollum-dialog-dialog-inner').css('height', 'auto').css('margin-top', 'auto');
}
else if (Dialog.currentAspect() == "desktop") {
var dialogHeight = $('#gollum-dialog-dialog-inner').height(); var dialogHeight = $('#gollum-dialog-dialog-inner').height();
$('#gollum-dialog-dialog-inner') $('#gollum-dialog-dialog-inner')
.css('height', dialogHeight + 'px') .css('height', dialogHeight + 'px')
.css('margin-top', -1 * parseInt( dialogHeight / 2 )); .css('margin-top', -1 * parseInt( dialogHeight / 2 ));
} }
}
}; };
if ($.facebox) { if ($.facebox) {
lib/gollum/templates/editor.mustache
+1 -1
View File
@@ -55,6 +55,7 @@
</div> </div>
<div id="gollum-editor-format-selector"> <div id="gollum-editor-format-selector">
<label for="format">Edit Mode</label>
<select id="wiki_format" name="format"> <select id="wiki_format" name="format">
{{#formats}} {{#formats}}
<option {{#selected}}selected="selected" {{/selected}}value="{{id}}"> <option {{#selected}}selected="selected" {{/selected}}value="{{id}}">
@@ -62,7 +63,6 @@
</option> </option>
{{/formats}} {{/formats}}
</select> </select>
<label for="format">Edit Mode</label>
</div> </div>
</div> </div>
<div id="gollum-editor-help" class="jaws"> <div id="gollum-editor-help" class="jaws">
lib/gollum/templates/layout.mustache
+3
View File
@@ -2,6 +2,9 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-type" content="text/html;charset=utf-8"> <meta http-equiv="Content-type" content="text/html;charset=utf-8">
<meta name="MobileOptimized" content="width">
<meta name="HandheldFriendly" content="true">
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/gollum.css" media="all"> <link rel="stylesheet" type="text/css" href="{{base_url}}/css/gollum.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/editor.css" media="all"> <link rel="stylesheet" type="text/css" href="{{base_url}}/css/editor.css" media="all">
<link rel="stylesheet" type="text/css" href="{{base_url}}/css/dialog.css" media="all"> <link rel="stylesheet" type="text/css" href="{{base_url}}/css/dialog.css" media="all">