Permalink
Browse files

Merge pull request #88 from mobify/meta-updates

  • Loading branch information...
2 parents 17a78b7 + 21c582d commit ef7136fdaa25d8f9029836ef3ed0f886cb14f8db @jansepar jansepar committed Jan 9, 2013
View
@@ -1,6 +1,6 @@
# Mobify.js
-Mobify.js is a client side adaptation framework for quickly adapting
+Mobify.js is a client side adaptation framework for quickly adapting
websites to support mobile and tablet devices.
This repository contains the Mobify.js core. The [Mobify Client](https://github.com/mobify/mobify-client/)
@@ -28,7 +28,7 @@ and run it from `www` folder:
gem install jekyll
cd www
jekyll --server --auto
-
+
Then navigate to http://localhost:4000/mobifyjs/docs/.
## Modules
View
@@ -1,10 +1,8 @@
-permalink: pretty
+permalink: pretty
markdown: kramdown
kramdown:
use_coderay: true
entity_output: symbolic
-baseurl: /mobifyjs
-
-
+baseurl: /mobifyjs
@@ -1,13 +1,11 @@
-
- <div class="nav-examples">
- <div class="demostore">
- <h3><a href="{{ site.baseurl }}/examples/#demostore">Demo Site</a></h3>
- </div>
- <!--
- <div class="demoblog">
- <a href="/examples/demoblog/"><h3>Demo Blog</h3></a>
- <p>Description</p>
- </div>
- -->
- </div>
-
+<div class="nav-examples">
+ <div class="demostore">
+ <h3><a href="{{ site.baseurl }}/examples/#demostore">Demo Site</a></h3>
+ </div>
+ <!--
+ <div class="demoblog">
+ <a href="/examples/demoblog/"><h3>Demo Blog</h3></a>
+ <p>Description</p>
+ </div>
+ -->
+</div>
@@ -1,19 +0,0 @@
-
- <div class="nav-examples">
- <div class="demostore">
-<<<<<<< HEAD
- <a href="/examples/demostore/"><h3>Demo Site</h3></a>
- <p>Uncle Merlins Discount Potions store</p>
-=======
- <a href="/examples/demostore/"><h3>Demo Store</h3></a>
- <p>Uncle Merlins Discount Potions</p>
->>>>>>> aaa0475b62a1654178e759170d8b6170846c796f
- </div>
- <!--
- <div class="demoblog">
- <a href="/examples/demoblog/"><h3>Demo Blog</h3></a>
- <p>Description</p>
- </div>
- -->
- </div>
-
@@ -1,45 +1,44 @@
-
- {% active_links prefix %}
- <div class="nav-modules">
- <ul>
- <li><a href="{{ site.baseurl }}/modules/">Mobify.js Modules</a></li>
- <li>
- <a href="{{ site.baseurl }}/modules/carousel">Carousel</a>
- <ul class="hide-inactive">
- <li><a href="{{ site.baseurl }}/modules/carousel-examples/">Examples</a></li>
- <li><a href="{{ site.baseurl }}/modules/carousel/#usage">Usage</a></li>
- <li><a href="{{ site.baseurl }}/modules/carousel/#classes">Classes</a></li>
- <li><a href="{{ site.baseurl }}/modules/carousel/#methods">Methods</a></li>
- <li><a href="{{ site.baseurl }}/modules/carousel/#events">Events</a></li>
- <li><a href="{{ site.baseurl }}/modules/carousel/#browser-compatibility">Browser Compatibility</a></li>
- </ul>
- </li>
- <li>
- <a href="{{ site.baseurl }}/modules/accordion">Accordion</a>
- <ul class="hide-inactive">
- <li><a href="{{ site.baseurl }}/modules/accordion-examples/">Examples</a></li>
- <li><a href="{{ site.baseurl }}/modules/accordion/#usage">Usage</a></li>
- <li><a href="{{ site.baseurl }}/modules/accordion/#markup">Markup</a></li>
- <li><a href="{{ site.baseurl }}/modules/accordion/#methods">Methods</a></li>
- <li><a href="{{ site.baseurl }}/modules/accordion/#browser-compatibility">Browser Compatibility</a></li>
- </ul>
- </li>
- <!--
+{% active_links prefix %}
+ <div class="nav-modules">
+ <ul>
+ <li><a href="{{ site.baseurl }}/modules/">Mobify.js Modules</a></li>
+ <li>
+ <a href="{{ site.baseurl }}/modules/carousel">Carousel</a>
+ <ul class="hide-inactive">
+ <li><a href="{{ site.baseurl }}/modules/carousel-examples/">Examples</a></li>
+ <li><a href="{{ site.baseurl }}/modules/carousel/#usage">Usage</a></li>
+ <li><a href="{{ site.baseurl }}/modules/carousel/#classes">Classes</a></li>
+ <li><a href="{{ site.baseurl }}/modules/carousel/#methods">Methods</a></li>
+ <li><a href="{{ site.baseurl }}/modules/carousel/#events">Events</a></li>
+ <li><a href="{{ site.baseurl }}/modules/carousel/#browser-compatibility">Browser Compatibility</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="{{ site.baseurl }}/modules/accordion">Accordion</a>
+ <ul class="hide-inactive">
+ <li><a href="{{ site.baseurl }}/modules/accordion-examples/">Examples</a></li>
+ <li><a href="{{ site.baseurl }}/modules/accordion/#usage">Usage</a></li>
+ <li><a href="{{ site.baseurl }}/modules/accordion/#markup">Markup</a></li>
+ <li><a href="{{ site.baseurl }}/modules/accordion/#methods">Methods</a></li>
+ <li><a href="{{ site.baseurl }}/modules/accordion/#browser-compatibility">Browser Compatibility</a></li>
+ </ul>
+ </li>
+ <!--
- <li>
- <a href="{{ site.baseurl }}/modules/zoomable">Zoomable</a>
- <ul class="hide-inactive">
- <li><a href="{{ site.baseurl }}/modules/zoomable/#usage">Usage</a></li>
- <li><a href="{{ site.baseurl }}/modules/zoomable-examples/">Examples</a></li>
- <li><a href="{{ site.baseurl }}/modules/zoomable/#methods">Methods</a></li>
- <li><a href="{{ site.baseurl }}/modules/zoomable/#configuration">Configuration</a></li>
- <li><a href="{{ site.baseurl }}/modules/zoomable/#classes">Classes</a></li>
- <li><a href="{{ site.baseurl }}/modules/zoomable/#default-styles">Default Styles</a></li>
- <li><a href="{{ site.baseurl }}/modules/zoomable/#events">Events</a></li>
- </ul>
- </li>
+ <li>
+ <a href="{{ site.baseurl }}/modules/zoomable">Zoomable</a>
+ <ul class="hide-inactive">
+ <li><a href="{{ site.baseurl }}/modules/zoomable/#usage">Usage</a></li>
+ <li><a href="{{ site.baseurl }}/modules/zoomable-examples/">Examples</a></li>
+ <li><a href="{{ site.baseurl }}/modules/zoomable/#methods">Methods</a></li>
+ <li><a href="{{ site.baseurl }}/modules/zoomable/#configuration">Configuration</a></li>
+ <li><a href="{{ site.baseurl }}/modules/zoomable/#classes">Classes</a></li>
+ <li><a href="{{ site.baseurl }}/modules/zoomable/#default-styles">Default Styles</a></li>
+ <li><a href="{{ site.baseurl }}/modules/zoomable/#events">Events</a></li>
+ </ul>
+ </li>
- -->
- </ul>
- </div>
- {% endactive_links %}
+ -->
+ </ul>
+ </div>
+{% endactive_links %}
@@ -1,26 +1,26 @@
- <div class="nav-wrapper">
- <ul class="nav">
- <li class="nav-about">
- {% active_links %}
- <a href="/mobifyjs/" class="rounded about">About</a>
- {% endactive_links %}
- </li>
- <li class="nav-docs">
- {% active_links prefix %}
- <a href="/mobifyjs/docs/" class="rounded">Docs</a>
- </li>
- <li class="nav-examples">
- <a href="/mobifyjs/examples/" class="rounded">Examples</a>
- </li>
- <li class="nav-widgets">
- <a href="/mobifyjs/modules/" class="rounded">Modules</a>
- </li>
- <li class="nav-community">
- <a href="/mobifyjs/community/" class="rounded">Community</a>
- </li>
- <li>
- <a href="//twitter.com/mobifyjs" class="rounded"><i class="icon-twitter"></i></a>
- </li>
- </ul><!-- .nav -->
- {% endactive_links %}
- </div>
+<div class="nav-wrapper">
+ <ul class="nav">
+ <li class="nav-about">
+ {% active_links %}
+ <a href="/mobifyjs/" class="rounded about">About</a>
+ {% endactive_links %}
+ </li>
+ <li class="nav-docs">
+ {% active_links prefix %}
+ <a href="/mobifyjs/docs/" class="rounded">Docs</a>
+ </li>
+ <li class="nav-examples">
+ <a href="/mobifyjs/examples/" class="rounded">Examples</a>
+ </li>
+ <li class="nav-widgets">
+ <a href="/mobifyjs/modules/" class="rounded">Modules</a>
+ </li>
+ <li class="nav-community">
+ <a href="/mobifyjs/community/" class="rounded">Community</a>
+ </li>
+ <li>
+ <a href="//twitter.com/mobifyjs" class="rounded"><i class="icon-twitter"></i></a>
+ </li>
+ </ul><!-- .nav -->
+ {% endactive_links %}
+</div>
View
@@ -1,80 +1,97 @@
<!DOCTYPE html>
<html>
- <head>
- <title>{{ page.title }}</title>
+<head>
+ <!--
- <link rel="stylesheet" href="{{ site.baseurl }}/static/css/bootstrap.css" type="text/css" media="screen, projection" />
- <link rel="stylesheet" href="{{ site.baseurl }}/static/css/syntax.css" type="text/css" media="screen, projection" />
- <link rel="stylesheet" href="{{ site.baseurl }}/static/css/font-awesome.css" type="text/css" media="screen, projection" />
- <link rel="stylesheet" href="{{ site.baseurl }}/static/js/highlight/styles/github.css" type="text/css" media="screen, projection" />
- <link rel="stylesheet" href="{{ site.baseurl }}/static/css/ui-dev.css?version=2" type="text/css" media="screen, projection" />
- <link rel="shortcut icon" href="{{ site.baseurl }}/static/img/favicon.ico" type="image/x-icon" />
+ | _) _| _)
+ __ `__ \ _ \ __ \ | | | | | __|
+ | | | ( | | | | __| | | |\__ \
+ _| _| _|\___/ _.__/ _|_| \__, | |____/
+ ____/___/
- <script>
- var _gaq = [
- ['_setAccount', 'UA-993328-16']
- , ['_trackPageview']
- , ['_setDomainName', 'mobify.com']
- , ['_setSiteSpeedSampleRate', 25]
- , ['_setAllowLinker', true]
- ];
+ www.mobifyjs.com, coded in Vancouver, Canada. https://www.mobify.com/about/jobs/ -->
+ <meta charset="utf-8" />
+ <meta name="author" content="Mobify">
+ <meta name="description" content="{% if page.description %}{{ page.description }}{% else %}Mobify.js is an open source web framework that helps you adapt any website to support any device. Powering millions of daily visits to your favourite websites.{% endif %}">
+ <meta name="keywords" content="mobify,mobile,mobile commerce,m-commerce,e-commerce,mobile web,mobile website,mobile view,create a mobile site">
+ <title>{{ page.title }}</title>
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- </script>
+ <link rel="stylesheet" href="{{ site.baseurl }}/static/css/bootstrap.css">
+ <link rel="stylesheet" href="{{ site.baseurl }}/static/css/syntax.css">
+ <link rel="stylesheet" href="{{ site.baseurl }}/static/css/font-awesome.css">
+ <link rel="stylesheet" href="{{ site.baseurl }}/static/js/highlight/styles/github.css">
+ <link rel="stylesheet" href="{{ site.baseurl }}/static/css/ui-dev.css?version=2">
+ <link rel="shortcut icon" href="{{ site.baseurl }}/static/img/favicon.ico">
- <script src="{{ site.baseurl }}/static/js/highlight/highlight.pack.js"></script>
+ <!-- Google Analytics -->
+ <script>
+ var _gaq = [
+ ['_setAccount', 'UA-993328-16'],
+ ['_trackPageview'],
+ ['_setDomainName', 'mobify.com'],
+ ['_setSiteSpeedSampleRate', 25],
+ ['_setAllowLinker', true]
+ ];
- <script>
- hljs.initHighlightingOnLoad();
- /*! A fix for the iOS orientationchange zoom bug. Script by @scottjehl, rebound by @wilto.MIT / GPLv2 License.*/
- (function(a){function m(){d.setAttribute("content",g),h=!0}function n(){d.setAttribute("content",f),h=!1}function o(b){l=b.accelerationIncludingGravity,i=Math.abs(l.x),j=Math.abs(l.y),k=Math.abs(l.z),(!a.orientation||a.orientation===180)&&(i>7||(k>6&&j<8||k<8&&j>6)&&i>5)?h&&n():h||m()}var b=navigator.userAgent;if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(b)&&b.indexOf("AppleWebKit")>-1))return;var c=a.document;if(!c.querySelector)return;var d=c.querySelector("meta[name=viewport]"),e=d&&d.getAttribute("content"),f=e+",maximum-scale=1",g=e+",maximum-scale=10",h=!0,i,j,k,l;if(!d)return;a.addEventListener("orientationchange",m,!1),a.addEventListener("devicemotion",o,!1)})(this);
- </script>
- <script src="{{ site.baseurl }}/static/js/jquery.min.js"></script>
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- </head>
- <body class="{{ page.bodyclass }}">
- <div class="viewport">
- <div class="navbar row-fluid">
- <div class="navbar-inner">
- <a class="brand" href="/mobifyjs/">Mobify.js</a>
+ <script>
+ /*! A fix for the iOS orientationchange zoom bug. Script by @scottjehl, rebound by @wilto.MIT / GPLv2 License.*/
+ (function(a){function m(){d.setAttribute("content",g),h=!0}function n(){d.setAttribute("content",f),h=!1}function o(b){l=b.accelerationIncludingGravity,i=Math.abs(l.x),j=Math.abs(l.y),k=Math.abs(l.z),(!a.orientation||a.orientation===180)&&(i>7||(k>6&&j<8||k<8&&j>6)&&i>5)?h&&n():h||m()}var b=navigator.userAgent;if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&/OS [1-5]_[0-9_]* like Mac OS X/i.test(b)&&b.indexOf("AppleWebKit")>-1))return;var c=a.document;if(!c.querySelector)return;var d=c.querySelector("meta[name=viewport]"),e=d&&d.getAttribute("content"),f=e+",maximum-scale=1",g=e+",maximum-scale=10",h=!0,i,j,k,l;if(!d)return;a.addEventListener("orientationchange",m,!1),a.addEventListener("devicemotion",o,!1)})(this);
+ </script>
- {% include nav.html %}
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+</head>
+<body class="{{ page.bodyclass }}">
+ <div class="viewport">
+ <div class="navbar row-fluid">
+ <div class="navbar-inner">
+ <a class="brand" href="/mobifyjs/">
+ Mobify.js
+ </a>
- <!-- Not Implemented
- <form class="navbar-search pull-right" action="">
- <input type="text" class="search-query span2" placeholder="Search">
- </form>
- -->
+ {% include nav.html %}
- </div><!-- .navbar-inner -->
- </div><!-- .navbar -->
+ </div><!-- .navbar-inner -->
+ </div><!-- .navbar -->
- {{ content }}
+ {{ content }}
- </div>
- <div class="footer">
- <div class="row-fluid">
- <div class="span6">
- <p>Copyright &copy; 2012 <a href="//www.mobify.com/">Mobify</a>.</p>
- </div>
+ </div>
- <div class="span6">
- <ul class="nav pull-right">
- <li>
- <a href="//twitter.com/mobifyjs" title="Mobify on Twitter"><i class="icon-twitter"></i>@Mobifyjs</a>
- </li><li>
- <a href="//github.com/mobify" title="Mobify on Github"><i class="icon-github"></i>Github</a>
- </li><li>
- <a href="{{ site.baseurl }}/license/">License</a>
- </li>
- </ul>
- </div>
- </div><!-- .row-fluid -->
- </div><!-- .footer -->
- </body>
-</html>
+ <div class="footer">
+ <div class="row-fluid">
+ <div class="span6">
+ <p>Copyright &copy; 2013 <a href="//www.mobify.com/">Mobify</a>.</p>
+ </div>
+
+ <div class="span6">
+ <ul class="nav pull-right">
+ <li>
+ <a href="//twitter.com/mobifyjs" title="Mobify on Twitter">
+ <i class="icon-twitter"></i>@Mobifyjs
+ </a>
+ </li>
+ <li>
+ <a href="//github.com/mobify" title="Mobify on Github">
+ <i class="icon-github"></i>Github
+ </a>
+ </li>
+ <li>
+ <a href="{{ site.baseurl }}/license/">License</a>
+ </li>
+ </ul>
+ </div>
+ </div><!-- .row-fluid -->
+ </div><!-- .footer -->
+
+ <!-- JavaScript -->
+ <script src="{{ site.baseurl }}/static/js/highlight/highlight.pack.js"></script>
+ <script>hljs.initHighlightingOnLoad();</script>
+</body>
+</html>
Oops, something went wrong.

0 comments on commit ef7136f

Please sign in to comment.