From 2faec3672371db3e17bf6671306fcc243eefadf2 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Sat, 30 Jul 2011 22:27:46 -0400 Subject: [PATCH] 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. --- .../contrib => extlib/960.gs}/960_16_col.css | 0 extlib/960.gs/README.txt | 54 +++++++++++++++++++ .../contrib => extlib/960.gs}/reset.css | 0 .../contrib => extlib/960.gs}/text.css | 0 mediagoblin/static/css/contrib/960_16_col.css | 1 - mediagoblin/static/css/contrib/reset.css | 1 - mediagoblin/static/css/contrib/text.css | 1 - mediagoblin/templates/mediagoblin/base.html | 6 +-- 8 files changed, 57 insertions(+), 6 deletions(-) rename {mediagoblin/contrib => extlib/960.gs}/960_16_col.css (100%) create mode 100755 extlib/960.gs/README.txt rename {mediagoblin/contrib => extlib/960.gs}/reset.css (100%) rename {mediagoblin/contrib => extlib/960.gs}/text.css (100%) delete mode 120000 mediagoblin/static/css/contrib/960_16_col.css delete mode 120000 mediagoblin/static/css/contrib/reset.css delete mode 120000 mediagoblin/static/css/contrib/text.css diff --git a/mediagoblin/contrib/960_16_col.css b/extlib/960.gs/960_16_col.css similarity index 100% rename from mediagoblin/contrib/960_16_col.css rename to 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 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: + + + + + + + +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: + + + +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 similarity index 100% rename from mediagoblin/contrib/reset.css rename to extlib/960.gs/reset.css diff --git a/mediagoblin/contrib/text.css b/extlib/960.gs/text.css similarity index 100% rename from mediagoblin/contrib/text.css rename to 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 @@ {% block title %}GNU MediaGoblin{% endblock title %} + href="{{ request.staticdirect('/css/extlib/reset.css') }}"/> + href="{{ request.staticdirect('/css/extlib/text.css') }}"/> + href="{{ request.staticdirect('/css/extlib/960_16_col.css') }}"/> {% block mediagoblin_head %} -- 2.25.1