fontawesome

pidofme · Oct 9, 2014 · 91f67e4 · 91f67e4
1 parent a7047d2
commit 91f67e4
Show file tree

Hide file tree

Showing 12 changed files with 734 additions and 184 deletions.
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
diff --git a/css/style.css b/css/style.css
diff --git a/fonts/FontAwesome.otf b/fonts/FontAwesome.otf
diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
diff --git a/includes/mobile-menu.jade b/includes/mobile-menu.jade
@@ -0,0 +1,4 @@
+#mobile-menu
+  a(href='https://github.com/strongloop/express?_ga=1.39756451.1408343404.1407943788', title='Fork me on GitHub')#fork-button
+    .fa.fa-code-fork.fa-2x
+  #nav-button.fa.fa-bars.fa-2x.button
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><title>Express - Node.js web application framework</title><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="/css/style.css"><link rel="stylesheet" href="/css/dropit.css"><link rel="stylesheet" href="/css/prism.css"><link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;amp;subset=latin,latin-ext"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script><script src="/js/app.js"></script><script src="/js/retina.js"></script><script src="/js/dropit.js"></script><script src="/js/prism.js"></script><link rel="stylesheet" href="/css/gh-fork-ribbon.css"><link rel="stylesheet" href="/css/octicons/octicons.css"></head><body><a href="https://github.com/strongloop/express?_ga=1.39756451.1408343404.1407943788" title="Fork me on GitHub" id="fork-icon"><div class="mega-octicon octicon-gist-fork"></div></a><div class="github-fork-ribbon-wrapper right"><div class="github-fork-ribbon"><a href="https://github.com/strongloop/express?_ga=1.39756451.1408343404.1407943788">Fork me on GitHub</a></div></div><section id="home-content"><header><section id="logo"><a href="/" class="express">Express</a></section><div id="navbar"><ul id="navmenu"><li><a href="/" class="active">Home</a></li><li><ul id="application-menu" class="menu"><li><a href="/4x/api.html">API reference</a><ul><li><a href="/4x/api.html">4.x</a></li><li><a href="/3x/api.html">3.x</a></li><li><a href="/2x/">2.x (deprecated)</a></li></ul></li></ul></li><li><ul id="getting-started-menu" class="menu"><li><a href="/en/starter/installing.html">Getting started</a><ul><li><a href="/en/starter/installing.html">Installing</a></li><li><a href="/en/starter/generator.html">Express generator</a></li><li><a href="/en/starter/hello-world.html">Hello World!</a></li><li><a href="/en/starter/basic-routing.html">Basic routing tutorial</a></li><li><a href="/en/starter/faq.html">FAQ</a></li></ul></li></ul></li><li><ul id="guide-menu" class="menu"><li><a href="/en/guide/routing.html">Guide</a><ul><li><a href="/en/guide/routing.html">Routing</a></li><li><a href="/en/guide/error-handling.html">Error handling</a></li><li><a href="/en/guide/debugging.html">Debugging Express</a></li><li><a href="/en/guide/behind-proxies.html">Express behind proxies</a></li><li><a href="/en/guide/migrating-4.html">Moving to Express 4</a></li><li><a href="/en/guide/using-components.html">Using components</a></li><li><a href="/en/guide/using-template-engines.html">Using template engines</a></li><li><a href="/en/guide/database-integration.html">Database integration</a></li></ul></li></ul></li><li><ul id="advanced-topics-menu" class="menu"><li><a href="/en/advanced/express-components.html">Advanced topics</a><ul><li><a href="/en/advanced/express-components.html">Express components</a></li><li><a href="/en/advanced/developing-template-engines.html">Template engines</a></li><li><a href="/en/advanced/security.html">Security</a></li><li><a href="/en/advanced/performance.html">Performance</a></li></ul></li></ul></li><li><ul id="resources-menu" class="menu"><li><a href="/en/resources/glossary.html">Resources</a><ul><li><a href="/en/resources/glossary.html">Glossary</a></li><li><a href="/en/resources/applications.html">Applications</a></li><li><a href="/en/resources/community.html">Community</a></li><li><a href="/en/resources/books.html">Books</a></li></ul></li></ul></li></ul></div></header><section id="description"><a href="/" class="express">Express</a><span class="description">Fast, unopinionated, minimalist web framework for <a href='http://nodejs.org'>Node.js</a></span></section></section><div id="install-command">$ npm install express --save</div><section id="intro"><div id="boxes" class="clearfix"><div id="#web-applications">
+<!DOCTYPE html><html><head><title>Express - Node.js web application framework</title><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1"><link rel="stylesheet" href="/css/style.css"><link rel="stylesheet" href="/css/dropit.css"><link rel="stylesheet" href="/css/prism.css"><link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;amp;subset=latin,latin-ext"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script><script src="/js/app.js"></script><script src="/js/retina.js"></script><script src="/js/dropit.js"></script><script src="/js/prism.js"></script><link rel="stylesheet" href="/css/gh-fork-ribbon.css"><link rel="stylesheet" href="/css/font-awesome.min.css"></head><body><div class="github-fork-ribbon-wrapper right"><div class="github-fork-ribbon"><a href="https://github.com/strongloop/express?_ga=1.39756451.1408343404.1407943788">Fork me on GitHub</a></div></div><section id="home-content"><header><div id="mobile-menu"><a href="https://github.com/strongloop/express?_ga=1.39756451.1408343404.1407943788" title="Fork me on GitHub" id="fork-button"><div class="fa fa-code-fork fa-2x"></div></a><div id="nav-button" class="fa fa-bars fa-2x button"></div></div><section id="logo"><a href="/" class="express">Express</a></section><div id="navbar"><ul id="navmenu"><li><a href="/" class="active">Home</a></li><li><ul id="application-menu" class="menu"><li><a href="/4x/api.html">API reference</a><ul><li><a href="/4x/api.html">4.x</a></li><li><a href="/3x/api.html">3.x</a></li><li><a href="/2x/">2.x (deprecated)</a></li></ul></li></ul></li><li><ul id="getting-started-menu" class="menu"><li><a href="/en/starter/installing.html">Getting started</a><ul><li><a href="/en/starter/installing.html">Installing</a></li><li><a href="/en/starter/generator.html">Express generator</a></li><li><a href="/en/starter/hello-world.html">Hello World!</a></li><li><a href="/en/starter/basic-routing.html">Basic routing tutorial</a></li><li><a href="/en/starter/faq.html">FAQ</a></li></ul></li></ul></li><li><ul id="guide-menu" class="menu"><li><a href="/en/guide/routing.html">Guide</a><ul><li><a href="/en/guide/routing.html">Routing</a></li><li><a href="/en/guide/error-handling.html">Error handling</a></li><li><a href="/en/guide/debugging.html">Debugging Express</a></li><li><a href="/en/guide/behind-proxies.html">Express behind proxies</a></li><li><a href="/en/guide/migrating-4.html">Moving to Express 4</a></li><li><a href="/en/guide/using-components.html">Using components</a></li><li><a href="/en/guide/using-template-engines.html">Using template engines</a></li><li><a href="/en/guide/database-integration.html">Database integration</a></li></ul></li></ul></li><li><ul id="advanced-topics-menu" class="menu"><li><a href="/en/advanced/express-components.html">Advanced topics</a><ul><li><a href="/en/advanced/express-components.html">Express components</a></li><li><a href="/en/advanced/developing-template-engines.html">Template engines</a></li><li><a href="/en/advanced/security.html">Security</a></li><li><a href="/en/advanced/performance.html">Performance</a></li></ul></li></ul></li><li><ul id="resources-menu" class="menu"><li><a href="/en/resources/glossary.html">Resources</a><ul><li><a href="/en/resources/glossary.html">Glossary</a></li><li><a href="/en/resources/applications.html">Applications</a></li><li><a href="/en/resources/community.html">Community</a></li><li><a href="/en/resources/books.html">Books</a></li></ul></li></ul></li></ul></div></header><section id="description"><a href="/" class="express">Express</a><span class="description">Fast, unopinionated, minimalist web framework for <a href='http://nodejs.org'>Node.js</a></span></section><div id="install-command">$ npm install express --save</div></section><section id="intro"><div id="boxes" class="clearfix"><div id="#web-applications">
   <h3>Web Applications</h3>
 
   Express is a minimal and flexible Node.js web application framework that provides

diff --git a/index.jade b/index.jade
@@ -4,24 +4,21 @@ html
     title Express - Node.js web application framework
     include includes/head
     link(rel='stylesheet', href='/css/gh-fork-ribbon.css')
-    link(rel='stylesheet', href='/css/octicons/octicons.css')
+    link(rel='stylesheet', href='/css/font-awesome.min.css')
 
   body
 
-    a(href='https://github.com/strongloop/express?_ga=1.39756451.1408343404.1407943788', title='Fork me on GitHub')#fork-icon
-      .mega-octicon.octicon-gist-fork
-
     .github-fork-ribbon-wrapper.right
         .github-fork-ribbon
             a(href='https://github.com/strongloop/express?_ga=1.39756451.1408343404.1407943788') Fork me on GitHub
     section#home-content
       header
+        include includes/mobile-menu
         include includes/logo
         - active = 'home'
         include includes/menu
       include includes/description
-
-    #install-command $ npm install express --save
+      #install-command $ npm install express --save
 
     section#intro
         #boxes.clearfix

diff --git a/js/app.js b/js/app.js
@@ -90,4 +90,5 @@ $(function(){
     $('#resources-menu').dropit({ action: 'mouseenter' })
   }
 
+
 })
diff --git a/js/dropit.js b/js/dropit.js
@@ -9,7 +9,9 @@
 
 ;(function($) {
 
-    $.fn.dropit = function(method) {
+    $.fn.dropit = function(method, minWidth) {
+
+        minWidth = minWidth || '770px';
 
         var methods = {
 
@@ -27,6 +29,9 @@
 
                     // Open on click
                     $el.on(settings.action, settings.triggerParentEl +':has('+ settings.submenuEl +') > '+ settings.triggerEl +'', function(){
+
+                        if (!window.matchMedia('(min-width: '+ minWidth +')').matches) return;
+
                         // Close click menu's if clicked again
                         if(settings.action == 'click' && $(this).parents(settings.triggerParentEl).hasClass('dropit-open')){
                             settings.beforeHide.call(this);
@@ -50,13 +55,19 @@
 
                     // Close if outside click
                     $(document).on('click', function(){
+
+                        if (!window.matchMedia('(min-width: '+ minWidth +')').matches) return;
+
                         settings.beforeHide.call(this);
                         $('.dropit-open').removeClass('dropit-open').find('.dropit-submenu').hide();
                         settings.afterHide.call(this);
                     });
 
                     // If hover
                     if(settings.action == 'mouseenter'){
+
+                        if (!window.matchMedia('(min-width: '+ minWidth +')').matches) return;
+
                         $el.on('mouseleave', function(){
                             settings.beforeHide.call(this);
                             $(this).removeClass('dropit-open').find(settings.submenuEl).hide();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -90,4 +90,5 @@ $(function(){
		$('#resources-menu').dropit({ action: 'mouseenter' })
		}


		})