Skip to content

Commit

Permalink
Merge pull request #26 from flipside-org/basic-structure-and-styles
Browse files Browse the repository at this point in the history 
Basic structure and styles
  • Loading branch information
@olafveerman
olafveerman committed Apr 24, 2014
2 parents a86b234 + 6e01943 commit 6d359cf
Show file tree
Hide file tree
Showing 28 changed files with 575 additions and 112 deletions.
8 changes: 4 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ src/bower_components
_site

#Styles and Scrips
public/styles/*
!public/styles/.gitkeep
public/scripts/*
!public/scripts/.gitkeep
public/assets/styles/*
!public/assets/styles/.gitkeep
public/assets/scripts/*
!public/assets/scripts/.gitkeep
16 changes: 8 additions & 8 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = function(grunt) {
grunt.initConfig({
// https://github.com/gruntjs/grunt-contrib-clean
clean : ['public/styles/*', '!public/**/.gitkeep', 'public/scripts/*', '_site/*'],
clean : ['public/assets/styles/*', '!public/assets/**/.gitkeep', 'public/assets/scripts/*', '_site/*'],

// https://github.com/gruntjs/grunt-contrib-compass
compass : {
// Default options.
options : {
sassDir : 'src/styles',
cssDir : 'public/styles',
cssDir : 'public/assets/styles',
raw : 'add_import_path "src/bower_components/foundation/scss"'
},

Expand Down Expand Up @@ -48,20 +48,20 @@ module.exports = function(grunt) {
uglify: {
prod: {
files: {
'public/scripts/website.min.js': ['src/scripts/*.js'],
'public/scripts/media.min.js': [
'public/assets/scripts/website.min.js': ['src/scripts/*.js'],
'public/assets/scripts/media.min.js': [
'src/bower_components/modernizr/modernizr.js',
],

'public/scripts/foundation.min.js': [
'public/assets/scripts/foundation.min.js': [
'src/bower_components/foundation/js/vendor/jquery.js',

'src/bower_components/foundation/js/foundation/foundation.js',
//'src/bower_components/foundation/js/foundation/foundation.abide.js',
//'src/bower_components/foundation/js/foundation/foundation.accordion.js',
'src/bower_components/foundation/js/foundation/foundation.clearing.js',
'src/bower_components/foundation/js/foundation/foundation.dropdown.js',
'src/bower_components/foundation/js/foundation/foundation.interchange.js',
//'src/bower_components/foundation/js/foundation/foundation.clearing.js',
//'src/bower_components/foundation/js/foundation/foundation.dropdown.js',
//'src/bower_components/foundation/js/foundation/foundation.interchange.js',
//'src/bower_components/foundation/js/foundation/foundation.joyride.js',
//'src/bower_components/foundation/js/foundation/foundation.magellan.js',
//'src/bower_components/foundation/js/foundation/foundation.offcanvas.js',
Expand Down
7 changes: 7 additions & 0 deletions public/_includes/facebook_og.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<meta property="og:site_name" content="Flipside" />
<meta property="og:type" content="website" />
<meta property="og:title" content="{{ page.title }} - Flipside" />
<meta property="og:url" content="{{ site.domain }}{{ page.url }}" />
<!-- <meta property="og:description" content="{{ site.data.flipside.description }}" > -->
<!-- <meta property="og:image" content="{{ site.domain }}/images/{{ page.image }}" /> -->
<meta property="og:image" content="{{ site.domain }}/assets/images/meta/og-image.png" />
10 changes: 10 additions & 0 deletions public/_includes/twitter_card.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@{{ site.data.flipside.twitter }}">
<!-- <meta name="twitter:creator" content="@{{ site.data.team[page.user].twitter }}"> -->
<meta name="twitter:title" content="{{ page.title }} - Flipside">
<meta property="twitter:description" content="{{ site.data.flipside.description }}" >
{% if page.image %}
<meta property="twitter:image" content="{{ site.domain }}/assets/images/{{ page.image }}" />
{% else %}
<meta property="twitter:image" content="{{ site.domain }}/assets/images/meta/og-image.png" />
{% endif %}
97 changes: 62 additions & 35 deletions public/_layouts/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,70 @@
<!--[if IE 8]> <html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->

<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>{{ site.name }}</title>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/styles/app.css">
<script src="/scripts/media.min.js"></script>
<script src="/scripts/foundation.min.js"></script>
<script src='https://api.tiles.mapbox.com/mapbox.js/v1.6.2/mapbox.js'></script>
<link href='https://api.tiles.mapbox.com/mapbox.js/v1.6.2/mapbox.css' rel='stylesheet' />
</head>
<body>
<head>
<title>{{ site.name }}</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="description" content="" />
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />

{% include facebook_og.html %}
{% include twitter_card.html %}

<link rel="shortcut icon" href="{{ site.domain }}/assets/images/meta/favicon.ico" type="image/x-icon" />
<link rel="apple-touch-icon" href="{{ site.domain }}/assets/images/meta/apple-touch-icon.png" />
<link rel="apple-touch-icon" sizes="57x57" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="60x60" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-60x60.png" />
<link rel="apple-touch-icon" sizes="72x72" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-72x72.png" />
<link rel="apple-touch-icon" sizes="76x76" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-76x76.png" />
<link rel="apple-touch-icon" sizes="114x114" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-114x114.png" />
<link rel="apple-touch-icon" sizes="120x120" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-120x120.png" />
<link rel="apple-touch-icon" sizes="144x144" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-144x144.png" />
<link rel="apple-touch-icon" sizes="152x152" href="{{ site.domain }}/assets/images/meta/apple-touch-icon-152x152.png" />

<div id="site-canvas">
<header id="site-hdr" role="banner">
<div class="row">
<h1 id="site-title">
<a href="{{ site.domain }}" title="Go home">Organization Finder</a>
</h1>
{% include menu.html %}
</div>
</header>

<main id="site-body" role="main">
{{ content }}
</main>
<link type="text/plain" rel="author" href="{{ site.domain }}/humans.txt" />
<link rel="stylesheet" href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700' />
<link rel="stylesheet" href="/assets/styles/main.css" />
<link rel="stylesheet" href="https://api.tiles.mapbox.com/mapbox.js/v1.6.2/mapbox.css" />

</head>
<body>

<footer id="site-ftr" role="contentinfo">
<div class="row">
<p class="built-by">
Flipside - 2014
</p>
<!--[if lt IE 9]>
<div id="nocando">
<h1>Your browser is not supported.</h1>
<p>To view this website, we recommend using the <strong>latest version</strong> of Chrome, Safari or Firefox.</p>
<p>Here: <a href="http://browsehappy.com/" title="Visit Broser happy">upgrade your browser</a>!</p>
</div>
</footer>
</div>

<script src="/scripts/website.min.js"></script>
<![endif]-->

<div id="site-canvas">
<header id="site-head" role="banner">
<div class="row">
<h1 id="site-title">
<a href="{{ site.domain }}" title="Go home">Organization Finder</a>
</h1>
{% include menu.html %}
</div>
</header>

</body>
<main id="site-body" role="main">
{{ content }}
</main>

<footer id="site-foot" role="contentinfo">
<div class="row">
<p class="built-by">
Flipside - 2014
</p>
</div>
</footer>
</div>

<script src="/assets/scripts/media.min.js"></script>
<script src="/assets/scripts/foundation.min.js"></script>
<script src="https://api.tiles.mapbox.com/mapbox.js/v1.6.2/mapbox.js"></script>
<script src="/assets/scripts/website.min.js"></script>

</body>
</html>
Binary file added public/assets/fonts/ph-org-finder/ph-org-finder.eot
View file
Binary file not shown.
Loading

0 comments on commit 6d359cf

Please sign in to comment.