Added 960 grid system

weierophinney · Oct 18, 2010 · d1f2658 · d1f2658
1 parent 4602978
commit d1f2658
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/mobile-app/.vimproject b/mobile-app/.vimproject
@@ -193,6 +193,11 @@ mobile-app=/home/matthew/git/zf-examples/mobile-app CD=. filter="*.php *.phtml *
  public=public {
   index.php
   .htaccess
+  css=css {
+   960.css
+   reset.css
+   text.css
+  }
  }
  tests=tests {
   phpunit.xml

diff --git a/mobile-app/application/layouts/scripts/layout.phtml b/mobile-app/application/layouts/scripts/layout.phtml
@@ -4,14 +4,17 @@ $this->placeholder('sidebar')
      ->setPostfix('</ul>');
 $this->headTitle('Mobile Device Demo')
      ->setSeparator(' - ');
+$this->headLink()->prependStylesheet('/css/960.css')
+                 ->prependStylesheet('/css/text.css')
+                 ->prependStylesheet('/css/reset.css');
 
 echo $this->doctype() ?>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
 <?php 
     echo $this->headTitle();
-    echo $this->headStyle();
+    echo $this->headLink();
     echo $this->headScript();
 ?>
 </head>

diff --git a/mobile-app/public/css/960.css b/mobile-app/public/css/960.css
diff --git a/mobile-app/public/css/reset.css b/mobile-app/public/css/reset.css
diff --git a/mobile-app/public/css/text.css b/mobile-app/public/css/text.css