1.1 --- a/themes/mercurialwiki/css/screen.css Sat May 22 23:01:54 2010 +0200
1.2 +++ b/themes/mercurialwiki/css/screen.css Sun May 23 03:14:12 2010 +0200
1.3 @@ -10,24 +10,41 @@
1.4 padding: 0;
1.5 margin: 0;
1.6 border: 0;
1.7 +
1.8 + /* Styling similar to the main site. */
1.9 +
1.10 + font-family: Helvetica, Verdana, Arial, sans-serif;
1.11 + color: #111;
1.12 + margin: 0 5em;
1.13 }
1.14
1.15 -a:link { color: #00b5f1; text-decoration: underline; }
1.16 -a:link:hover, a:link:active, a:link:focus { text-decoration: none; }
1.17 -a.nonexistent:link { color: #666; text-decoration: underline; }
1.18 -a.nonexistent:hover { text-decoration: none; }
1.19 +a:link, a:visited { color: #00b5f1; text-decoration: none; }
1.20 +a:link:hover, a:link:active, a:link:focus,
1.21 +a:visited:hover, a:visited:active, a:visited:focus { text-decoration: underline; }
1.22 +a.nonexistent:link { color: #666; text-decoration: none; }
1.23 +a.nonexistent:hover { text-decoration: underline; }
1.24
1.25 a.download {
1.26 font-size: 120%;
1.27 letter-spacing: 0.05em;
1.28 font-weight: bold;
1.29 - background: #E7E7E7;
1.30 border: 1px solid #9C9C9C;
1.31 padding: 0.5em;
1.32 text-align: center;
1.33 +
1.34 + /* Styling similar to the main site. */
1.35 +
1.36 + font-family: Verdana, Arial, sans-serif;
1.37 + background: #12baf2;
1.38 + color: #fff;
1.39 }
1.40
1.41 -input {
1.42 +input, select {
1.43 +
1.44 + /* Styling similar to the main site. */
1.45 +
1.46 + font-family: Helvetica, Arial, sans-serif;
1.47 + font-size: 0.8571em;
1.48 }
1.49
1.50 textarea {
1.51 @@ -39,28 +56,37 @@
1.52 color: gray;
1.53 }
1.54
1.55 -/* Navigational controls. */
1.56 +.editbar li .disabled {
1.57 + color: white;
1.58 +}
1.59
1.60 -#navibar {
1.61 - float: left;
1.62 - margin: 17px 0;
1.63 +/* Navigational and editing controls. */
1.64 +
1.65 +#navibar, .editbar {
1.66 + float: right;
1.67 + margin: 17px 0 0 0;
1.68 padding: 0;
1.69 background: #999;
1.70 }
1.71
1.72 -#navibar li {
1.73 +#navibar li, .editbar li {
1.74 display: inline;
1.75 margin: 0;
1.76 padding: 0;
1.77 }
1.78
1.79 -#navibar a {
1.80 +.editbar form, .editbar form div {
1.81 + display: inline;
1.82 + margin: 0;
1.83 +}
1.84 +
1.85 +#navibar a, .editbar a {
1.86
1.87 /* Need a block to redefine the height. */
1.88
1.89 display: inline-block;
1.90 - height: 3em;
1.91 - line-height: 3em;
1.92 + height: 42px;
1.93 + line-height: 42px;
1.94
1.95 color: #fff;
1.96 margin: 0;
1.97 @@ -68,27 +94,31 @@
1.98 text-decoration: none;
1.99 }
1.100
1.101 -#navibar a:hover, #navibar a:focus, #navibar li.current a {
1.102 +#navibar a:hover, #navibar a:focus, #navibar li.current a,
1.103 +.editbar a:hover, .editbar a:focus, .editbar li.current a {
1.104 background: #00b5f1;
1.105 + text-decoration: none;
1.106 +}
1.107 +
1.108 +.editbar span {
1.109 + padding: 0 16px;
1.110 }
1.111
1.112 /* Other elements. */
1.113
1.114 #logo {
1.115 float: left;
1.116 - margin: 0.5em;
1.117 + margin: 0;
1.118 padding: 0;
1.119 +
1.120 /* For text only logo */
1.121 +
1.122 font-size: larger;
1.123 font-weight: bold;
1.124 }
1.125
1.126 -*[dir="rtl"] #logo {
1.127 - float: right;
1.128 -}
1.129 -
1.130 #logo img {
1.131 - vertical-align: middle;
1.132 + vertical-align: bottom;
1.133 }
1.134
1.135 #logo a {
1.136 @@ -97,40 +127,61 @@
1.137 }
1.138
1.139 #searchform {
1.140 - margin: 4px 0.5em 8px 0.5em;
1.141 - padding: 0;
1.142 - font-size: 0.82em;
1.143 +
1.144 float: right;
1.145 - clear: right;
1.146 - text-align: right;
1.147 -}
1.148 +
1.149 + /* Margin and padding correspond to the navibar settings. */
1.150
1.151 -*[dir="rtl"] #searchform {
1.152 - float: left;
1.153 - clear: left;
1.154 - text-align: left;
1.155 + margin: 17px 0 0 0;
1.156 + padding: 0 16px;
1.157 + background: #999;
1.158 +
1.159 + /* Height settings correspond to navibar list entries. */
1.160 +
1.161 + height: 42px;
1.162 + line-height: 42px;
1.163 }
1.164
1.165 #searchform input {
1.166 - font-size: 100%;
1.167 vertical-align: middle;
1.168 }
1.169
1.170 -#pageline {
1.171 +.actionsmenu div {
1.172 +
1.173 + /* Margin and padding correspond to the navibar settings. */
1.174 + /* Set on the div to avoid accidental vertical expansion. */
1.175 +
1.176 + padding-right: 16px;
1.177 +}
1.178 +
1.179 +#pageline, .pageline {
1.180 +
1.181 + /* Prevent mixing of header and content elements. */
1.182 +
1.183 + clear: both;
1.184 + margin: 0;
1.185 + padding: 0;
1.186 + border-bottom: 1px solid #ccc;
1.187 +}
1.188 +
1.189 +#footer .pageline {
1.190 + padding-top: 2px;
1.191 }
1.192
1.193 #message {
1.194 clear: both;
1.195 margin: 0;
1.196 padding: 5px 10px;
1.197 - border-bottom: 1px solid #c9c9c9;
1.198 - background: #E6EAF0;
1.199 +
1.200 + /* Styling similar to the advanced search. */
1.201 +
1.202 + border-bottom: 1px solid #ADB9CC;
1.203 + background-color: #E7E7E7;
1.204 }
1.205
1.206 #message p {
1.207 margin: 5px 0;
1.208 padding: 0;
1.209 - /* font-weight: bold; */
1.210 }
1.211
1.212 #message div.buttons {
1.213 @@ -164,10 +215,6 @@
1.214 background-color: white;
1.215 margin: 0;
1.216 padding: 0.25em;
1.217 -
1.218 - /* Prevent mixing of header and content elements. */
1.219 -
1.220 - clear: both;
1.221 }
1.222
1.223 #editor-textarea {
1.224 @@ -223,12 +270,14 @@
1.225 input.button {
1.226 }
1.227
1.228 -#credits, #version, #timings{
1.229 - margin: 5px 10px;
1.230 - padding: 0;
1.231 - text-align: center;
1.232 - font-size: 0.88em;
1.233 - color: #6C7680;
1.234 +#credits, #version, #timings {
1.235 + float: right;
1.236 +
1.237 + /* Styling similar to the main site. */
1.238 +
1.239 + font-family: Verdana, Helvetica, Arial, sans-serif;
1.240 + font-size: .6428em;
1.241 + padding: 10px 25px;
1.242 }
1.243
1.244 #credits li, #timings li {
1.245 @@ -241,6 +290,10 @@
1.246 vertical-align: middle;
1.247 }
1.248
1.249 +#credits a {
1.250 + text-decoration: none;
1.251 +}
1.252 +
1.253 .diff {
1.254 width:99%;
1.255 }
2.1 --- a/themes/mercurialwiki/mercurialwiki.py Sat May 22 23:01:54 2010 +0200
2.2 +++ b/themes/mercurialwiki/mercurialwiki.py Sun May 23 03:14:12 2010 +0200
2.3 @@ -108,9 +108,14 @@
2.4 html.append(fmt.div(on=1, attr={"id" : "header"}))
2.5
2.6 html.append(self.logo())
2.7 + html.append(self.searchform(d))
2.8 html.append(self.navibar(d))
2.9 - html.append(self.searchform(d))
2.10 +
2.11 + html.append(fmt.div(on=0))
2.12
2.13 + # A separator.
2.14 +
2.15 + html.append(fmt.div(on=1, attr={"class" : "pageline"}))
2.16 html.append(fmt.div(on=0))
2.17
2.18 # Show any pertinent message.
2.19 @@ -160,6 +165,12 @@
2.20
2.21 if self.shouldShowEditbar(page):
2.22 html.append(self.editbar(d))
2.23 +
2.24 + # A separator.
2.25 +
2.26 + html.append(fmt.div(on=1, attr={"class" : "pageline"}))
2.27 + html.append(fmt.div(on=0))
2.28 +
2.29 html.append(self.credits(d))
2.30
2.31 #html.append(self.trail(d))