Fix merge conflicts
This commit is contained in:
Jef van Schendel
commit
d2fce291b5
@ -1,447 +0,0 @@
|
|||||||
/*
|
|
||||||
960 Grid System ~ Core CSS.
|
|
||||||
Learn more ~ http://960.gs/
|
|
||||||
|
|
||||||
Licensed under GPL and MIT.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
Forces backgrounds to span full width,
|
|
||||||
even if there is horizontal scrolling.
|
|
||||||
Increase this if your layout is wider.
|
|
||||||
|
|
||||||
Note: IE6 works fine without this fix.
|
|
||||||
*/
|
|
||||||
|
|
||||||
body {
|
|
||||||
min-width: 960px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Container
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.container_16 {
|
|
||||||
margin-left: auto;
|
|
||||||
margin-right: auto;
|
|
||||||
width: 960px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Grid >> Global
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.grid_1,
|
|
||||||
.grid_2,
|
|
||||||
.grid_3,
|
|
||||||
.grid_4,
|
|
||||||
.grid_5,
|
|
||||||
.grid_6,
|
|
||||||
.grid_7,
|
|
||||||
.grid_8,
|
|
||||||
.grid_9,
|
|
||||||
.grid_10,
|
|
||||||
.grid_11,
|
|
||||||
.grid_12,
|
|
||||||
.grid_13,
|
|
||||||
.grid_14,
|
|
||||||
.grid_15,
|
|
||||||
.grid_16 {
|
|
||||||
display: inline;
|
|
||||||
float: left;
|
|
||||||
position: relative;
|
|
||||||
margin-left: 10px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.push_1, .pull_1,
|
|
||||||
.push_2, .pull_2,
|
|
||||||
.push_3, .pull_3,
|
|
||||||
.push_4, .pull_4,
|
|
||||||
.push_5, .pull_5,
|
|
||||||
.push_6, .pull_6,
|
|
||||||
.push_7, .pull_7,
|
|
||||||
.push_8, .pull_8,
|
|
||||||
.push_9, .pull_9,
|
|
||||||
.push_10, .pull_10,
|
|
||||||
.push_11, .pull_11,
|
|
||||||
.push_12, .pull_12,
|
|
||||||
.push_13, .pull_13,
|
|
||||||
.push_14, .pull_14,
|
|
||||||
.push_15, .pull_15,
|
|
||||||
.push_16, .pull_16 {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Grid >> Children (Alpha ~ First, Omega ~ Last)
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.alpha {
|
|
||||||
margin-left: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.omega {
|
|
||||||
margin-right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Grid >> 16 Columns
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.container_16 .grid_1 {
|
|
||||||
width: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_2 {
|
|
||||||
width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_3 {
|
|
||||||
width: 160px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_4 {
|
|
||||||
width: 220px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_5 {
|
|
||||||
width: 280px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_6 {
|
|
||||||
width: 340px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_7 {
|
|
||||||
width: 400px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_8 {
|
|
||||||
width: 460px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_9 {
|
|
||||||
width: 520px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_10 {
|
|
||||||
width: 580px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_11 {
|
|
||||||
width: 640px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_12 {
|
|
||||||
width: 700px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_13 {
|
|
||||||
width: 760px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_14 {
|
|
||||||
width: 820px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_15 {
|
|
||||||
width: 880px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .grid_16 {
|
|
||||||
width: 940px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Prefix Extra Space >> 16 Columns
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.container_16 .prefix_1 {
|
|
||||||
padding-left: 60px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_2 {
|
|
||||||
padding-left: 120px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_3 {
|
|
||||||
padding-left: 180px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_4 {
|
|
||||||
padding-left: 240px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_5 {
|
|
||||||
padding-left: 300px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_6 {
|
|
||||||
padding-left: 360px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_7 {
|
|
||||||
padding-left: 420px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_8 {
|
|
||||||
padding-left: 480px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_9 {
|
|
||||||
padding-left: 540px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_10 {
|
|
||||||
padding-left: 600px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_11 {
|
|
||||||
padding-left: 660px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_12 {
|
|
||||||
padding-left: 720px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_13 {
|
|
||||||
padding-left: 780px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_14 {
|
|
||||||
padding-left: 840px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .prefix_15 {
|
|
||||||
padding-left: 900px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Suffix Extra Space >> 16 Columns
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.container_16 .suffix_1 {
|
|
||||||
padding-right: 60px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_2 {
|
|
||||||
padding-right: 120px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_3 {
|
|
||||||
padding-right: 180px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_4 {
|
|
||||||
padding-right: 240px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_5 {
|
|
||||||
padding-right: 300px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_6 {
|
|
||||||
padding-right: 360px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_7 {
|
|
||||||
padding-right: 420px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_8 {
|
|
||||||
padding-right: 480px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_9 {
|
|
||||||
padding-right: 540px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_10 {
|
|
||||||
padding-right: 600px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_11 {
|
|
||||||
padding-right: 660px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_12 {
|
|
||||||
padding-right: 720px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_13 {
|
|
||||||
padding-right: 780px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_14 {
|
|
||||||
padding-right: 840px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .suffix_15 {
|
|
||||||
padding-right: 900px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Push Space >> 16 Columns
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.container_16 .push_1 {
|
|
||||||
left: 60px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_2 {
|
|
||||||
left: 120px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_3 {
|
|
||||||
left: 180px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_4 {
|
|
||||||
left: 240px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_5 {
|
|
||||||
left: 300px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_6 {
|
|
||||||
left: 360px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_7 {
|
|
||||||
left: 420px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_8 {
|
|
||||||
left: 480px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_9 {
|
|
||||||
left: 540px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_10 {
|
|
||||||
left: 600px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_11 {
|
|
||||||
left: 660px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_12 {
|
|
||||||
left: 720px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_13 {
|
|
||||||
left: 780px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_14 {
|
|
||||||
left: 840px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .push_15 {
|
|
||||||
left: 900px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Pull Space >> 16 Columns
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
.container_16 .pull_1 {
|
|
||||||
left: -60px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_2 {
|
|
||||||
left: -120px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_3 {
|
|
||||||
left: -180px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_4 {
|
|
||||||
left: -240px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_5 {
|
|
||||||
left: -300px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_6 {
|
|
||||||
left: -360px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_7 {
|
|
||||||
left: -420px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_8 {
|
|
||||||
left: -480px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_9 {
|
|
||||||
left: -540px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_10 {
|
|
||||||
left: -600px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_11 {
|
|
||||||
left: -660px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_12 {
|
|
||||||
left: -720px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_13 {
|
|
||||||
left: -780px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_14 {
|
|
||||||
left: -840px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container_16 .pull_15 {
|
|
||||||
left: -900px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* `Clear Floated Elements
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
/* http://sonspring.com/journal/clearing-floats */
|
|
||||||
|
|
||||||
.clear {
|
|
||||||
clear: both;
|
|
||||||
display: block;
|
|
||||||
overflow: hidden;
|
|
||||||
visibility: hidden;
|
|
||||||
width: 0;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified */
|
|
||||||
|
|
||||||
.clearfix:before,
|
|
||||||
.clearfix:after,
|
|
||||||
.container_16:before,
|
|
||||||
.container_16:after {
|
|
||||||
content: '.';
|
|
||||||
display: block;
|
|
||||||
overflow: hidden;
|
|
||||||
visibility: hidden;
|
|
||||||
font-size: 0;
|
|
||||||
line-height: 0;
|
|
||||||
width: 0;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.clearfix:after,
|
|
||||||
.container_16:after {
|
|
||||||
clear: both;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
The following zoom:1 rule is specifically for IE6 + IE7.
|
|
||||||
Move to separate stylesheet if invalid CSS is a problem.
|
|
||||||
*/
|
|
||||||
|
|
||||||
.clearfix,
|
|
||||||
.container_16 {
|
|
||||||
zoom: 1;
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
Copyright (c) <year> <copyright holders>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
"Software"), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
||||||
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
||||||
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
||||||
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
===============
|
|
||||||
960 GRID SYSTEM
|
|
||||||
===============
|
|
||||||
|
|
||||||
Created by Nathan Smith. See the official site for more info: http://960.gs/
|
|
||||||
|
|
||||||
============================================================================
|
|
||||||
|
|
||||||
To install the Adobe Fireworks extension, simply double-click the *.mxp file
|
|
||||||
included in the /fireworks_extension directory. If you are running Windows 7
|
|
||||||
you will need admin permissions in order to install this extension properly.
|
|
||||||
|
|
||||||
============================================================================
|
|
||||||
|
|
||||||
Thank you for downloading the 960 Grid System. I hope it helps to streamline
|
|
||||||
web development workflow. Enclosed in the bundle are printable sketch sheets
|
|
||||||
and template files for Adobe Fireworks and Photoshop, OmniGraffle and Visio.
|
|
||||||
|
|
||||||
Also included is a lightweight CSS file, which contains the grid dimensions.
|
|
||||||
To use this file, simply include the 960.css in the <head> of the HTML page.
|
|
||||||
You may also use the reset.css and text.css files, or opt to leave them out.
|
|
||||||
Here is an example of the XHTML code necessary to incorporate the CSS files:
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<link rel="stylesheet" type="text/css" media="all" href="css/reset.css" />
|
|
||||||
<link rel="stylesheet" type="text/css" media="all" href="css/text.css" />
|
|
||||||
<link rel="stylesheet" type="text/css" media="all" href="css/960.css" />
|
|
||||||
</head>
|
|
||||||
|
|
||||||
It is worth noting that these styles do not automatically make up a finished
|
|
||||||
site design. They are simply a starting point, ideally for rapid prototyping
|
|
||||||
or as a basis for creating your own designs. You should not feel constrained
|
|
||||||
by the way I have built the initial code. If you disagree with how something
|
|
||||||
has been done, feel free to revise it for the needs of your particular site.
|
|
||||||
|
|
||||||
The files in the 960 Grid System are free of charge, licensed under MIT/GPL.
|
|
||||||
|
|
||||||
============================================================================
|
|
||||||
|
|
||||||
Note that if you are building a site in a language which reads from right to
|
|
||||||
left, use the CSS files that end in "_rtl.css" instead. Denote the language:
|
|
||||||
|
|
||||||
<html lang="..." dir="rtl">
|
|
||||||
|
|
||||||
Be sure to replace "..." with the appropriate two-letter abbreviation of the
|
|
||||||
language you are using. Example: lang="he" for Hebrew, lang="ar" for Arabic.
|
|
||||||
|
|
||||||
============================================================================
|
|
||||||
|
|
||||||
GPL license:
|
|
||||||
http://www.gnu.org/licenses/gpl.html
|
|
||||||
|
|
||||||
MIT license:
|
|
||||||
http://www.opensource.org/licenses/mit-license.php
|
|
||||||
@ -1,202 +0,0 @@
|
|||||||
/* `XHTML, HTML4, HTML5 Reset
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
a,
|
|
||||||
abbr,
|
|
||||||
acronym,
|
|
||||||
address,
|
|
||||||
applet,
|
|
||||||
article,
|
|
||||||
aside,
|
|
||||||
audio,
|
|
||||||
b,
|
|
||||||
big,
|
|
||||||
blockquote,
|
|
||||||
body,
|
|
||||||
canvas,
|
|
||||||
caption,
|
|
||||||
center,
|
|
||||||
cite,
|
|
||||||
code,
|
|
||||||
dd,
|
|
||||||
del,
|
|
||||||
details,
|
|
||||||
dfn,
|
|
||||||
dialog,
|
|
||||||
div,
|
|
||||||
dl,
|
|
||||||
dt,
|
|
||||||
em,
|
|
||||||
embed,
|
|
||||||
fieldset,
|
|
||||||
figcaption,
|
|
||||||
figure,
|
|
||||||
font,
|
|
||||||
footer,
|
|
||||||
form,
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3,
|
|
||||||
h4,
|
|
||||||
h5,
|
|
||||||
h6,
|
|
||||||
header,
|
|
||||||
hgroup,
|
|
||||||
hr,
|
|
||||||
html,
|
|
||||||
i,
|
|
||||||
iframe,
|
|
||||||
img,
|
|
||||||
ins,
|
|
||||||
kbd,
|
|
||||||
label,
|
|
||||||
legend,
|
|
||||||
li,
|
|
||||||
mark,
|
|
||||||
menu,
|
|
||||||
meter,
|
|
||||||
nav,
|
|
||||||
object,
|
|
||||||
ol,
|
|
||||||
output,
|
|
||||||
p,
|
|
||||||
pre,
|
|
||||||
progress,
|
|
||||||
q,
|
|
||||||
rp,
|
|
||||||
rt,
|
|
||||||
ruby,
|
|
||||||
s,
|
|
||||||
samp,
|
|
||||||
section,
|
|
||||||
small,
|
|
||||||
span,
|
|
||||||
strike,
|
|
||||||
strong,
|
|
||||||
sub,
|
|
||||||
summary,
|
|
||||||
sup,
|
|
||||||
table,
|
|
||||||
tbody,
|
|
||||||
td,
|
|
||||||
tfoot,
|
|
||||||
th,
|
|
||||||
thead,
|
|
||||||
time,
|
|
||||||
tr,
|
|
||||||
tt,
|
|
||||||
u,
|
|
||||||
ul,
|
|
||||||
var,
|
|
||||||
video,
|
|
||||||
xmp {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
font-size: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
html,
|
|
||||||
body {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
article,
|
|
||||||
aside,
|
|
||||||
details,
|
|
||||||
figcaption,
|
|
||||||
figure,
|
|
||||||
footer,
|
|
||||||
header,
|
|
||||||
hgroup,
|
|
||||||
menu,
|
|
||||||
nav,
|
|
||||||
section {
|
|
||||||
/*
|
|
||||||
Override the default (display: inline) for
|
|
||||||
browsers that do not recognize HTML5 tags.
|
|
||||||
|
|
||||||
IE8 (and lower) requires a shiv:
|
|
||||||
http://ejohn.org/blog/html5-shiv
|
|
||||||
*/
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
b,
|
|
||||||
strong {
|
|
||||||
/*
|
|
||||||
Makes browsers agree.
|
|
||||||
IE + Opera = font-weight: bold.
|
|
||||||
Gecko + WebKit = font-weight: bolder.
|
|
||||||
*/
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
|
||||||
color: transparent;
|
|
||||||
font-size: 0;
|
|
||||||
vertical-align: middle;
|
|
||||||
/*
|
|
||||||
For IE.
|
|
||||||
http://css-tricks.com/ie-fix-bicubic-scaling-for-images
|
|
||||||
*/
|
|
||||||
-ms-interpolation-mode: bicubic;
|
|
||||||
}
|
|
||||||
|
|
||||||
li {
|
|
||||||
/*
|
|
||||||
For IE6 + IE7.
|
|
||||||
*/
|
|
||||||
display: list-item;
|
|
||||||
}
|
|
||||||
|
|
||||||
table {
|
|
||||||
border-collapse: collapse;
|
|
||||||
border-spacing: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
th,
|
|
||||||
td,
|
|
||||||
caption {
|
|
||||||
font-weight: normal;
|
|
||||||
vertical-align: top;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
q {
|
|
||||||
quotes: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
q:before,
|
|
||||||
q:after {
|
|
||||||
content: '';
|
|
||||||
content: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub,
|
|
||||||
sup,
|
|
||||||
small {
|
|
||||||
font-size: 75%;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub,
|
|
||||||
sup {
|
|
||||||
line-height: 0;
|
|
||||||
position: relative;
|
|
||||||
vertical-align: baseline;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub {
|
|
||||||
bottom: -0.25em;
|
|
||||||
}
|
|
||||||
|
|
||||||
sup {
|
|
||||||
top: -0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
svg {
|
|
||||||
/*
|
|
||||||
For IE9.
|
|
||||||
*/
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
960 Grid System ~ Text CSS.
|
|
||||||
Learn more ~ http://960.gs/
|
|
||||||
|
|
||||||
Licensed under GPL and MIT.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* `Basic HTML
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
body {
|
|
||||||
font: 13px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
pre,
|
|
||||||
code {
|
|
||||||
font-family: 'DejaVu Sans Mono', Monaco, Consolas, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: 0 #ccc solid;
|
|
||||||
border-top-width: 1px;
|
|
||||||
clear: both;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* `Headings
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 23px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
font-size: 21px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h4 {
|
|
||||||
font-size: 19px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h5 {
|
|
||||||
font-size: 17px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h6 {
|
|
||||||
font-size: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* `Spacing
|
|
||||||
----------------------------------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
ol {
|
|
||||||
list-style: decimal;
|
|
||||||
}
|
|
||||||
|
|
||||||
ul {
|
|
||||||
list-style: disc;
|
|
||||||
}
|
|
||||||
|
|
||||||
li {
|
|
||||||
margin-left: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
p,
|
|
||||||
dl,
|
|
||||||
hr,
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3,
|
|
||||||
h4,
|
|
||||||
h5,
|
|
||||||
h6,
|
|
||||||
ol,
|
|
||||||
ul,
|
|
||||||
pre,
|
|
||||||
table,
|
|
||||||
address,
|
|
||||||
fieldset,
|
|
||||||
figure {
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
49
extlib/reset/reset.css
Normal file
49
extlib/reset/reset.css
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/* http://meyerweb.com/eric/tools/css/reset/
|
||||||
|
v2.0 | 20110126
|
||||||
|
License: none (public domain)
|
||||||
|
*/
|
||||||
|
|
||||||
|
html, body, div, span, applet, object, iframe,
|
||||||
|
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
|
||||||
|
a, abbr, acronym, address, big, cite, code,
|
||||||
|
del, dfn, em, img, ins, kbd, q, s, samp,
|
||||||
|
small, strike, strong, sub, sup, tt, var,
|
||||||
|
b, u, i, center,
|
||||||
|
dl, dt, dd, ol, ul, li,
|
||||||
|
fieldset, form, label, legend,
|
||||||
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
||||||
|
article, aside, canvas, details, embed,
|
||||||
|
figure, figcaption, footer, header, hgroup,
|
||||||
|
menu, nav, output, ruby, section, summary,
|
||||||
|
time, mark, audio, video {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
font-size: 100%;
|
||||||
|
font: inherit;
|
||||||
|
vertical-align: baseline;
|
||||||
|
}
|
||||||
|
/* HTML5 display-role reset for older browsers */
|
||||||
|
article, aside, details, figcaption, figure,
|
||||||
|
footer, header, hgroup, menu, nav, section {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
body {
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
ol, ul {
|
||||||
|
list-style: none;
|
||||||
|
}
|
||||||
|
blockquote, q {
|
||||||
|
quotes: none;
|
||||||
|
}
|
||||||
|
blockquote:before, blockquote:after,
|
||||||
|
q:before, q:after {
|
||||||
|
content: '';
|
||||||
|
content: none;
|
||||||
|
}
|
||||||
|
table {
|
||||||
|
border-collapse: collapse;
|
||||||
|
border-spacing: 0;
|
||||||
|
}
|
||||||
|
|
||||||
@ -29,7 +29,6 @@ body {
|
|||||||
background-color: #111;
|
background-color: #111;
|
||||||
background-image: url("../images/background.png");
|
background-image: url("../images/background.png");
|
||||||
color: #C3C3C3;
|
color: #C3C3C3;
|
||||||
font-family: sans-serif;
|
|
||||||
padding: none;
|
padding: none;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@ -44,24 +43,28 @@ form {
|
|||||||
|
|
||||||
/* text styles */
|
/* text styles */
|
||||||
|
|
||||||
h1{
|
h1 {
|
||||||
margin-bottom: 15px;
|
margin-bottom: 15px;
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-size: 1.875em;
|
font-size: 1.875em;
|
||||||
}
|
}
|
||||||
|
|
||||||
h2{
|
h2 {
|
||||||
font-size: 1.375em;
|
font-size: 1.375em;
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
h3{
|
h3 {
|
||||||
border-bottom: 1px solid #333;
|
border-bottom: 1px solid #333;
|
||||||
font-size: 1.125em;
|
font-size: 1.125em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
margin-top: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color: #86D4B1;
|
color: #86D4B1;
|
||||||
}
|
}
|
||||||
@ -82,38 +85,73 @@ input, textarea {
|
|||||||
/* website structure */
|
/* website structure */
|
||||||
|
|
||||||
.mediagoblin_body {
|
.mediagoblin_body {
|
||||||
position: relative;
|
margin: auto;
|
||||||
min-height: 100%;
|
width: 96%;
|
||||||
|
max-width: 960px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mediagoblin_header {
|
.mediagoblin_header {
|
||||||
|
width: 100%;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
padding-top: 14px;
|
padding-top: 14px;
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
border-bottom: 1px solid #333;
|
border-bottom: 1px solid #333;
|
||||||
}
|
}
|
||||||
|
|
||||||
a.mediagoblin_logo{
|
.mediagoblin_header_right {
|
||||||
|
float: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
a.mediagoblin_logo {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.mediagoblin_logo img {
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mediagoblin_content {
|
||||||
|
width: 100%;
|
||||||
|
padding-bottom: 74px;
|
||||||
|
}
|
||||||
|
|
||||||
.mediagoblin_footer {
|
.mediagoblin_footer {
|
||||||
|
width: 100%;
|
||||||
height: 30px;
|
height: 30px;
|
||||||
border-top: 1px solid #333;
|
border-top: 1px solid #333;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
padding-top: 8px;
|
padding-top: 8px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 0.875em;
|
font-size: 0.875em;
|
||||||
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mediagoblin_content {
|
.media_pane {
|
||||||
padding-bottom: 74px;
|
width: 640px;
|
||||||
|
margin-left: 0px;
|
||||||
|
margin-right: 10px;
|
||||||
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mediagoblin_header_right {
|
.media_sidebar {
|
||||||
float: right;
|
width: 280px;
|
||||||
|
margin-left: 10px;
|
||||||
|
margin-right: 0px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile_sidebar {
|
||||||
|
width: 340px;
|
||||||
|
margin-right: 10px;
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile_showcase {
|
||||||
|
width: 580px;
|
||||||
|
margin-left: 10px;
|
||||||
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* common website elements */
|
/* common website elements */
|
||||||
@ -199,20 +237,33 @@ textarea#comment_content {
|
|||||||
border: none;
|
border: none;
|
||||||
background-color: #f1f1f1;
|
background-color: #f1f1f1;
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
|
|
||||||
|
.clear {
|
||||||
|
clear: both;
|
||||||
|
display: block;
|
||||||
|
overflow: hidden;
|
||||||
|
visibility: hidden;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* forms */
|
/* forms */
|
||||||
|
|
||||||
.form_box {
|
.form_box,.form_box_xl {
|
||||||
background-color: #222;
|
background-color: #222;
|
||||||
background-image: url("../images/background_lines.png");
|
background-image: url("../images/background_lines.png");
|
||||||
background-repeat: repeat-x;
|
background-repeat: repeat-x;
|
||||||
padding-bottom: 30px;
|
padding: 3% 5%;
|
||||||
padding-top: 30px;
|
|
||||||
margin-left: auto;
|
|
||||||
margin-right: auto;
|
|
||||||
display: block;
|
display: block;
|
||||||
float: none;
|
float: none;
|
||||||
|
width: 90%;
|
||||||
|
max-width: 340px;
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form_box_xl {
|
||||||
|
max-width: 460px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit_box {
|
.edit_box {
|
||||||
@ -277,6 +328,14 @@ textarea#description, textarea#bio {
|
|||||||
margin-bottom: 0px;
|
margin-bottom: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
textarea#comment_content {
|
||||||
|
width: 634px;
|
||||||
|
height: 90px;
|
||||||
|
border: none;
|
||||||
|
background-color: #f1f1f1;
|
||||||
|
padding: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
/* media galleries */
|
/* media galleries */
|
||||||
|
|
||||||
.media_thumbnail {
|
.media_thumbnail {
|
||||||
@ -348,6 +407,7 @@ img.media_icon {
|
|||||||
ul.mediagoblin_messages {
|
ul.mediagoblin_messages {
|
||||||
list-style: none inside;
|
list-style: none inside;
|
||||||
color: #f7f7f7;
|
color: #f7f7f7;
|
||||||
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mediagoblin_messages li {
|
.mediagoblin_messages li {
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
../../../../extlib/960.gs/960_16_col.css
|
|
||||||
@ -1 +1 @@
|
|||||||
../../../../extlib/960.gs/reset.css
|
../../../../extlib/reset/reset.css
|
||||||
@ -1 +0,0 @@
|
|||||||
../../../../extlib/960.gs/text.css
|
|
||||||
@ -18,17 +18,12 @@
|
|||||||
{% extends "mediagoblin/base.html" %}
|
{% extends "mediagoblin/base.html" %}
|
||||||
|
|
||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
|
<img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
|
||||||
|
alt="{% trans %}Image of 404 goblin stressing out{% endtrans %}" />
|
||||||
<h1>{% trans %}Oops!{% endtrans %}</h1>
|
<h1>{% trans %}Oops!{% endtrans %}</h1>
|
||||||
|
<p>{% trans %}There doesn't seem to be a page at this address. Sorry!{% endtrans %}</p>
|
||||||
<div class="grid_8 alpha">
|
<p>
|
||||||
<p>{% trans %}There doesn't seem to be a page at this address. Sorry!{% endtrans %}</p>
|
{%- trans %}If you're sure the address is correct, maybe the page you're looking for has been moved or deleted.{% endtrans -%}
|
||||||
<p>
|
</p>
|
||||||
{%- trans %}If you're sure the address is correct, maybe the page you're looking for has been moved or deleted.{% endtrans -%}
|
<div class="clear"></div>
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid_8 omega">
|
|
||||||
<img src="{{ request.staticdirect('/images/404.png') }}"
|
|
||||||
alt="{% trans %}Image of 404 goblin stressing out{% endtrans %}" />
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -25,19 +25,15 @@
|
|||||||
{% endblock mediagoblin_head %}
|
{% endblock mediagoblin_head %}
|
||||||
|
|
||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
|
|
||||||
<form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}"
|
<form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
{{ csrf_token }}
|
{{ csrf_token }}
|
||||||
|
<div class="form_box">
|
||||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
|
||||||
<h1>{% trans %}Set your new password{% endtrans %}</h1>
|
<h1>{% trans %}Set your new password{% endtrans %}</h1>
|
||||||
|
|
||||||
{{ wtforms_util.render_divs(cp_form) }}
|
{{ wtforms_util.render_divs(cp_form) }}
|
||||||
<div class="form_submit_buttons">
|
<div class="form_submit_buttons">
|
||||||
<input type="submit" value="{% trans %}Set password{% endtrans %}" class="button_form"/>
|
<input type="submit" value="{% trans %}Set password{% endtrans %}" class="button_form"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
|
<form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
{{ csrf_token }}
|
{{ csrf_token }}
|
||||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
<div class="form_box">
|
||||||
<h1>{% trans %}Recover password{% endtrans %}</h1>
|
<h1>{% trans %}Recover password{% endtrans %}</h1>
|
||||||
{{ wtforms_util.render_divs(fp_form) }}
|
{{ wtforms_util.render_divs(fp_form) }}
|
||||||
<div class="form_submit_buttons">
|
<div class="form_submit_buttons">
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
<form action="{{ request.urlgen('mediagoblin.auth.login') }}"
|
<form action="{{ request.urlgen('mediagoblin.auth.login') }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
{{ csrf_token }}
|
{{ csrf_token }}
|
||||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
<div class="form_box">
|
||||||
<h1>{% trans %}Log in{% endtrans %}</h1>
|
<h1>{% trans %}Log in{% endtrans %}</h1>
|
||||||
{% if login_failed %}
|
{% if login_failed %}
|
||||||
<div class="form_field_error">
|
<div class="form_field_error">
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
<form action="{{ request.urlgen('mediagoblin.auth.register') }}"
|
<form action="{{ request.urlgen('mediagoblin.auth.register') }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
<div class="form_box">
|
||||||
<h1>{% trans %}Create an account!{% endtrans %}</h1>
|
<h1>{% trans %}Create an account!{% endtrans %}</h1>
|
||||||
{{ wtforms_util.render_divs(register_form) }}
|
{{ wtforms_util.render_divs(register_form) }}
|
||||||
{{ csrf_token }}
|
{{ csrf_token }}
|
||||||
|
|||||||
@ -19,13 +19,10 @@
|
|||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
|
||||||
<title>{% block title %}{{ app_config['html_title'] }}{% endblock %}</title>
|
<title>{% block title %}{{ app_config['html_title'] }}{% endblock %}</title>
|
||||||
<link rel="stylesheet" type="text/css"
|
<link rel="stylesheet" type="text/css"
|
||||||
href="{{ request.staticdirect('/css/extlib/reset.css') }}"/>
|
href="{{ request.staticdirect('/css/reset.css') }}"/>
|
||||||
<link rel="stylesheet" type="text/css"
|
|
||||||
href="{{ request.staticdirect('/css/extlib/text.css') }}"/>
|
|
||||||
<link rel="stylesheet" type="text/css"
|
|
||||||
href="{{ request.staticdirect('/css/extlib/960_16_col.css') }}"/>
|
|
||||||
<link rel="stylesheet" type="text/css"
|
<link rel="stylesheet" type="text/css"
|
||||||
href="{{ request.staticdirect('/css/base.css') }}"/>
|
href="{{ request.staticdirect('/css/base.css') }}"/>
|
||||||
<link rel="stylesheet" type="text/css"
|
<link rel="stylesheet" type="text/css"
|
||||||
@ -41,8 +38,7 @@
|
|||||||
{% block mediagoblin_body %}
|
{% block mediagoblin_body %}
|
||||||
<div class="mediagoblin_body">
|
<div class="mediagoblin_body">
|
||||||
{% block mediagoblin_header %}
|
{% block mediagoblin_header %}
|
||||||
<div class="container_16">
|
<div class="mediagoblin_header">
|
||||||
<div class="grid_16 mediagoblin_header">
|
|
||||||
{% block mediagoblin_logo %}
|
{% block mediagoblin_logo %}
|
||||||
<a class="mediagoblin_logo"
|
<a class="mediagoblin_logo"
|
||||||
href="{{ request.urlgen('index') }}"
|
href="{{ request.urlgen('index') }}"
|
||||||
@ -77,23 +73,18 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<div class="container_16 mediagoblin_content">
|
<div class="mediagoblin_content">
|
||||||
<div class="grid_16">
|
|
||||||
{% include "mediagoblin/utils/messages.html" %}
|
{% include "mediagoblin/utils/messages.html" %}
|
||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
{% endblock mediagoblin_content %}
|
{% endblock mediagoblin_content %}
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{% block mediagoblin_footer %}
|
{% block mediagoblin_footer %}
|
||||||
<div class="container_16">
|
<div class="mediagoblin_footer">
|
||||||
<div class="grid_16 mediagoblin_footer">
|
|
||||||
{% trans -%}
|
{% trans -%}
|
||||||
Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project
|
Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU</a> project
|
||||||
{%- endtrans %}
|
{%- endtrans %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% endblock mediagoblin_body %}
|
{% endblock mediagoblin_body %}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -23,7 +23,7 @@
|
|||||||
user= media.get_uploader.username,
|
user= media.get_uploader.username,
|
||||||
media= media._id) }}"
|
media= media._id) }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">
|
<div class="form_box">
|
||||||
<h1>Editing attachments for {{ media.title }}</h1>
|
<h1>Editing attachments for {{ media.title }}</h1>
|
||||||
<div style="text-align: center;" >
|
<div style="text-align: center;" >
|
||||||
<img src="{{ request.app.public_store.file_url(
|
<img src="{{ request.app.public_store.file_url(
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
user= media.get_uploader.username,
|
user= media.get_uploader.username,
|
||||||
media= media._id) }}"
|
media= media._id) }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">
|
<div class="form_box_xl">
|
||||||
<h1>{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}</h1>
|
<h1>{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}</h1>
|
||||||
<div style="text-align: center;" >
|
<div style="text-align: center;" >
|
||||||
<img src="{{ request.app.public_store.file_url(
|
<img src="{{ request.app.public_store.file_url(
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
<form action="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
|
<form action="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
|
||||||
user.username }}"
|
user.username }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">
|
<div class="form_box_xl">
|
||||||
<h1>
|
<h1>
|
||||||
{%- trans username=user.username -%}
|
{%- trans username=user.username -%}
|
||||||
Editing {{ username }}'s profile
|
Editing {{ username }}'s profile
|
||||||
|
|||||||
@ -35,14 +35,9 @@
|
|||||||
{% trans %}Media tagged with: {{ tag_name }}{% endtrans %}
|
{% trans %}Media tagged with: {{ tag_name }}{% endtrans %}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<div class="container_16 media_gallery">
|
{{ object_gallery(request, media_entries, pagination) }}
|
||||||
{{ object_gallery(request, media_entries, pagination) }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid_16">
|
{% set feed_url = request.urlgen('mediagoblin.listings.tag_atom_feed',
|
||||||
{% set feed_url = request.urlgen(
|
tag=tag_slug) %}
|
||||||
'mediagoblin.listings.tag_atom_feed',
|
{% include "mediagoblin/utils/feed_link.html" %}
|
||||||
tag=tag_slug) %}
|
|
||||||
{% include "mediagoblin/utils/feed_link.html" %}
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -23,22 +23,18 @@
|
|||||||
{% if request.user %}
|
{% if request.user %}
|
||||||
<h1>{% trans %}Explore{% endtrans %}</h1>
|
<h1>{% trans %}Explore{% endtrans %}</h1>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="grid_11 alpha">
|
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
|
||||||
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
|
<img class="right_align" src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
|
||||||
<p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
|
<p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
|
||||||
<p>{% trans %}To add your own media, place comments, save your favourites and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
|
<p>{% trans %}To add your own media, place comments, save your favourites and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
|
||||||
{% if allow_registration %}
|
{% if allow_registration %}
|
||||||
<p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
|
<p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
|
||||||
{% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
|
{% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
|
||||||
<a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
|
<a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
|
||||||
or
|
or
|
||||||
<a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
|
<a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
|
||||||
{%- endtrans %}
|
{%- endtrans %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
|
||||||
<div class="grid_5 omega">
|
|
||||||
<img src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
|
|
||||||
</div>
|
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h2>{% trans %}Most recent media{% endtrans %}</h2>
|
<h2>{% trans %}Most recent media{% endtrans %}</h2>
|
||||||
|
|||||||
@ -22,7 +22,7 @@
|
|||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
<form action="{{ request.urlgen('mediagoblin.submit.start') }}"
|
<form action="{{ request.urlgen('mediagoblin.submit.start') }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
<div class="grid_8 prefix_1 suffix_1 form_box">
|
<div class="form_box_xl">
|
||||||
<h1>{% trans %}Add your media{% endtrans %}</h1>
|
<h1>{% trans %}Add your media{% endtrans %}</h1>
|
||||||
{{ wtforms_util.render_divs(submit_form) }}
|
{{ wtforms_util.render_divs(submit_form) }}
|
||||||
<div class="form_submit_buttons">
|
<div class="form_submit_buttons">
|
||||||
|
|||||||
@ -42,14 +42,10 @@
|
|||||||
{%- endtrans %}
|
{%- endtrans %}
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
<div class="container_16 media_gallery">
|
{{ object_gallery(request, media_entries, pagination) }}
|
||||||
{{ object_gallery(request, media_entries, pagination) }}
|
|
||||||
</div>
|
{% set feed_url = request.urlgen('mediagoblin.user_pages.atom_feed',
|
||||||
|
user=user.username) %}
|
||||||
<div class="grid_16">
|
{% include "mediagoblin/utils/feed_link.html" %}
|
||||||
{% set feed_url = request.urlgen(
|
|
||||||
'mediagoblin.user_pages.atom_feed',
|
|
||||||
user=user.username) %}
|
|
||||||
{% include "mediagoblin/utils/feed_link.html" %}
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@ -28,7 +28,7 @@
|
|||||||
{% endblock mediagoblin_head %}
|
{% endblock mediagoblin_head %}
|
||||||
|
|
||||||
{% block mediagoblin_content %}
|
{% block mediagoblin_content %}
|
||||||
<div class="grid_11 alpha">
|
<div class="media_pane">
|
||||||
<div class="media_image_container">
|
<div class="media_image_container">
|
||||||
{% block mediagoblin_media %}
|
{% block mediagoblin_media %}
|
||||||
{% set display_media = request.app.public_store.file_url(
|
{% set display_media = request.app.public_store.file_url(
|
||||||
@ -137,7 +137,7 @@
|
|||||||
media.url_for_self(request.urlgen)) }}
|
media.url_for_self(request.urlgen)) }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="grid_5 omega">
|
<div class="media_sidebar">
|
||||||
{% trans user_url=request.urlgen(
|
{% trans user_url=request.urlgen(
|
||||||
'mediagoblin.user_pages.user_home',
|
'mediagoblin.user_pages.user_home',
|
||||||
user=media.get_uploader.username),
|
user=media.get_uploader.username),
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
user=media.get_uploader.username,
|
user=media.get_uploader.username,
|
||||||
media=media._id) }}"
|
media=media._id) }}"
|
||||||
method="POST" enctype="multipart/form-data">
|
method="POST" enctype="multipart/form-data">
|
||||||
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">
|
<div class="form_box">
|
||||||
<h1>
|
<h1>
|
||||||
{%- trans title=media.title -%}
|
{%- trans title=media.title -%}
|
||||||
Really delete {{ title }}?
|
Really delete {{ title }}?
|
||||||
|
|||||||
@ -46,7 +46,7 @@
|
|||||||
{% elif user.status == "needs_email_verification" %}
|
{% elif user.status == "needs_email_verification" %}
|
||||||
{% if user == request.user %}
|
{% if user == request.user %}
|
||||||
{# this should only be visible when you are this user #}
|
{# this should only be visible when you are this user #}
|
||||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
<div class="form_box">
|
||||||
<h1>{% trans %}Email verification needed{% endtrans %}</h1>
|
<h1>{% trans %}Email verification needed{% endtrans %}</h1>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
@ -66,7 +66,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
{# if the user is not you, but still needs to verify their email #}
|
{# if the user is not you, but still needs to verify their email #}
|
||||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
<div class="form_box">
|
||||||
<h1>{% trans %}Email verification needed{% endtrans %}</h1>
|
<h1>{% trans %}Email verification needed{% endtrans %}</h1>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
@ -91,7 +91,7 @@
|
|||||||
|
|
||||||
{% if not user.url and not user.bio %}
|
{% if not user.url and not user.bio %}
|
||||||
{% if request.user and (request.user._id == user._id) %}
|
{% if request.user and (request.user._id == user._id) %}
|
||||||
<div class="grid_6 alpha empty_space">
|
<div class="profile_sidebar empty_space">
|
||||||
<p>
|
<p>
|
||||||
{% trans %}Here's a spot to tell others about yourself.{% endtrans %}
|
{% trans %}Here's a spot to tell others about yourself.{% endtrans %}
|
||||||
</p>
|
</p>
|
||||||
@ -101,7 +101,7 @@
|
|||||||
{%- trans %}Edit profile{% endtrans -%}
|
{%- trans %}Edit profile{% endtrans -%}
|
||||||
</a>
|
</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="grid_6 alpha empty_space">
|
<div class="profile_sidebar empty_space">
|
||||||
<p>
|
<p>
|
||||||
{% trans -%}
|
{% trans -%}
|
||||||
This user hasn't filled in their profile (yet).
|
This user hasn't filled in their profile (yet).
|
||||||
@ -109,7 +109,7 @@
|
|||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="grid_6 alpha">
|
<div class="profile_sidebar">
|
||||||
{% include "mediagoblin/utils/profile.html" %}
|
{% include "mediagoblin/utils/profile.html" %}
|
||||||
{% if request.user and
|
{% if request.user and
|
||||||
(request.user._id == user._id or request.user.is_admin) %}
|
(request.user._id == user._id or request.user.is_admin) %}
|
||||||
@ -128,7 +128,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if media_entries.count() %}
|
{% if media_entries.count() %}
|
||||||
<div class="grid_10 omega">
|
<div class="profile_showcase">
|
||||||
{{ object_gallery(request, media_entries, pagination,
|
{{ object_gallery(request, media_entries, pagination,
|
||||||
pagination_base_url=user_gallery_url, col_number=3) }}
|
pagination_base_url=user_gallery_url, col_number=3) }}
|
||||||
{% include "mediagoblin/utils/object_gallery.html" %}
|
{% include "mediagoblin/utils/object_gallery.html" %}
|
||||||
@ -146,7 +146,7 @@
|
|||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if request.user._id == user._id %}
|
{% if request.user._id == user._id %}
|
||||||
<div class="grid_10 omega empty_space">
|
<div class="profile_showcase empty_space">
|
||||||
<p>
|
<p>
|
||||||
{% trans -%}
|
{% trans -%}
|
||||||
This is where your media will appear, but you don't seem to have added anything yet.
|
This is where your media will appear, but you don't seem to have added anything yet.
|
||||||
@ -158,7 +158,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="grid_10 omega empty_space">
|
<div class="profile_showcase empty_space">
|
||||||
<p>
|
<p>
|
||||||
{% trans -%}
|
{% trans -%}
|
||||||
There doesn't seem to be any media here yet...
|
There doesn't seem to be any media here yet...
|
||||||
|
|||||||
@ -21,28 +21,26 @@
|
|||||||
{% set next_entry_url = media.url_to_next(request.urlgen) %}
|
{% set next_entry_url = media.url_to_next(request.urlgen) %}
|
||||||
|
|
||||||
{% if prev_entry_url or next_entry_url %}
|
{% if prev_entry_url or next_entry_url %}
|
||||||
<div class="grid_5 alpha omega">
|
{# There are no previous entries for the very first media entry #}
|
||||||
{# There are no previous entries for the very first media entry #}
|
{% if prev_entry_url %}
|
||||||
{% if prev_entry_url %}
|
<a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
|
||||||
<a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
|
← {% trans %}newer{% endtrans %}
|
||||||
← {% trans %}newer{% endtrans %}
|
</a>
|
||||||
</a>
|
{% else %}
|
||||||
{% else %}
|
{# This is the first entry. display greyed-out 'previous' image #}
|
||||||
{# This is the first entry. display greyed-out 'previous' image #}
|
<p class="navigation_button navigation_left">
|
||||||
<p class="navigation_button navigation_left">
|
← {% trans %}newer{% endtrans %}
|
||||||
← {% trans %}newer{% endtrans %}
|
</p>
|
||||||
</p>
|
{% endif %}
|
||||||
{% endif %}
|
{# Likewise, this could be the very last media entry #}
|
||||||
{# Likewise, this could be the very last media entry #}
|
{% if next_entry_url %}
|
||||||
{% if next_entry_url %}
|
<a class="navigation_button" href="{{ next_entry_url }}">
|
||||||
<a class="navigation_button" href="{{ next_entry_url }}">
|
{% trans %}older{% endtrans %} →
|
||||||
{% trans %}older{% endtrans %} →
|
</a>
|
||||||
</a>
|
{% else %}
|
||||||
{% else %}
|
{# This is the last entry. display greyed-out 'next' image #}
|
||||||
{# This is the last entry. display greyed-out 'next' image #}
|
<p class="navigation_button">
|
||||||
<p class="navigation_button">
|
{% trans %}older{% endtrans %} →
|
||||||
{% trans %}older{% endtrans %} →
|
</p>
|
||||||
</p>
|
{% endif %}
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user