diff options
| author | Will Kahn-Greene <willg@bluesock.org> | 2011-07-30 22:27:46 -0400 |
|---|---|---|
| committer | Will Kahn-Greene <willg@bluesock.org> | 2011-07-30 22:27:46 -0400 |
| commit | 2faec3672371db3e17bf6671306fcc243eefadf2 (patch) | |
| tree | 93b041475fcbe4453bc3701329138af388860814 | |
| parent | 2271286079397b8f9f1adc23e36c35a5d8ea35e2 (diff) | |
| download | mediagoblin-2faec3672371db3e17bf6671306fcc243eefadf2.tar.lz mediagoblin-2faec3672371db3e17bf6671306fcc243eefadf2.tar.xz mediagoblin-2faec3672371db3e17bf6671306fcc243eefadf2.zip | |
270. Moves 960.gs stuff to extlib/ per policy
This adds the README.txt from the tarball for 960.gs and also moves the
files and fixes the symlinks.
| -rw-r--r-- | extlib/960.gs/960_16_col.css (renamed from mediagoblin/contrib/960_16_col.css) | 0 | ||||
| -rwxr-xr-x | extlib/960.gs/README.txt | 54 | ||||
| -rw-r--r-- | extlib/960.gs/reset.css (renamed from mediagoblin/contrib/reset.css) | 0 | ||||
| -rw-r--r-- | extlib/960.gs/text.css (renamed from mediagoblin/contrib/text.css) | 0 | ||||
| l--------- | mediagoblin/static/css/contrib/960_16_col.css | 1 | ||||
| l--------- | mediagoblin/static/css/contrib/reset.css | 1 | ||||
| l--------- | mediagoblin/static/css/contrib/text.css | 1 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 6 |
8 files changed, 57 insertions, 6 deletions
diff --git a/mediagoblin/contrib/960_16_col.css b/extlib/960.gs/960_16_col.css index faa6d8b2..faa6d8b2 100644 --- a/mediagoblin/contrib/960_16_col.css +++ b/extlib/960.gs/960_16_col.css diff --git a/extlib/960.gs/README.txt b/extlib/960.gs/README.txt new file mode 100755 index 00000000..da0ea86f --- /dev/null +++ b/extlib/960.gs/README.txt @@ -0,0 +1,54 @@ +=============== +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
\ No newline at end of file diff --git a/mediagoblin/contrib/reset.css b/extlib/960.gs/reset.css index 87b7f368..87b7f368 100644 --- a/mediagoblin/contrib/reset.css +++ b/extlib/960.gs/reset.css diff --git a/mediagoblin/contrib/text.css b/extlib/960.gs/text.css index 1a6b302f..1a6b302f 100644 --- a/mediagoblin/contrib/text.css +++ b/extlib/960.gs/text.css diff --git a/mediagoblin/static/css/contrib/960_16_col.css b/mediagoblin/static/css/contrib/960_16_col.css deleted file mode 120000 index bc1a430c..00000000 --- a/mediagoblin/static/css/contrib/960_16_col.css +++ /dev/null @@ -1 +0,0 @@ -../../../contrib/960_16_col.css
\ No newline at end of file diff --git a/mediagoblin/static/css/contrib/reset.css b/mediagoblin/static/css/contrib/reset.css deleted file mode 120000 index 87ae5592..00000000 --- a/mediagoblin/static/css/contrib/reset.css +++ /dev/null @@ -1 +0,0 @@ -../../../contrib/reset.css
\ No newline at end of file diff --git a/mediagoblin/static/css/contrib/text.css b/mediagoblin/static/css/contrib/text.css deleted file mode 120000 index d75ce48b..00000000 --- a/mediagoblin/static/css/contrib/text.css +++ /dev/null @@ -1 +0,0 @@ -../../../contrib/text.css
\ No newline at end of file diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 656fb46b..6af02c00 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -21,11 +21,11 @@ <meta charset="utf-8"> <title>{% block title %}GNU MediaGoblin{% endblock title %}</title> <link rel="stylesheet" type="text/css" - href="{{ request.staticdirect('/css/contrib/reset.css') }}"/> + href="{{ request.staticdirect('/css/extlib/reset.css') }}"/> <link rel="stylesheet" type="text/css" - href="{{ request.staticdirect('/css/contrib/text.css') }}"/> + href="{{ request.staticdirect('/css/extlib/text.css') }}"/> <link rel="stylesheet" type="text/css" - href="{{ request.staticdirect('/css/contrib/960_16_col.css') }}"/> + href="{{ request.staticdirect('/css/extlib/960_16_col.css') }}"/> <link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/base.css') }}"/> {% block mediagoblin_head %} |