aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/static/css/contrib
diff options
context:
space:
mode:
authorChris Moylan <chris@chrismoylan.com>2011-07-05 21:42:18 -0500
committerChris Moylan <chris@chrismoylan.com>2011-07-05 21:42:18 -0500
commitf0b497ec5a0ff3b5a74115f420cd9ddcf52db830 (patch)
tree5c5662dd890cbfa494ef7ffc160fe6a64cdf9ec6 /mediagoblin/static/css/contrib
parent5e008b93f44b34078f64591f0c0ddc9205909926 (diff)
parent5ed4722de8106a512a4faacfedaae7b8eda7260b (diff)
downloadmediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.tar.lz
mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.tar.xz
mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.zip
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/static/css/contrib')
l---------mediagoblin/static/css/contrib/960_12_col.css1
l---------mediagoblin/static/css/contrib/960_16_col.css1
l---------mediagoblin/static/css/contrib/reset.css1
l---------mediagoblin/static/css/contrib/text.css1
4 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/static/css/contrib/960_12_col.css b/mediagoblin/static/css/contrib/960_12_col.css
deleted file mode 120000
index 15c360e4..00000000
--- a/mediagoblin/static/css/contrib/960_12_col.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../contrib/960_12_col.css \ No newline at end of file
diff --git a/mediagoblin/static/css/contrib/960_16_col.css b/mediagoblin/static/css/contrib/960_16_col.css
new file mode 120000
index 00000000..bc1a430c
--- /dev/null
+++ b/mediagoblin/static/css/contrib/960_16_col.css
@@ -0,0 +1 @@
+../../../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
new file mode 120000
index 00000000..87ae5592
--- /dev/null
+++ b/mediagoblin/static/css/contrib/reset.css
@@ -0,0 +1 @@
+../../../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
new file mode 120000
index 00000000..d75ce48b
--- /dev/null
+++ b/mediagoblin/static/css/contrib/text.css
@@ -0,0 +1 @@
+../../../contrib/text.css \ No newline at end of file