Skip to content

Commit a7e08ea

Browse files
codeguycodeguy
committed
Implement redesign first stage
1 parent d1baa30 commit a7e08ea

File tree

9 files changed

+869
-68
lines changed

9 files changed

+869
-68
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/_site/
22
*.DS_Store
3+
node_modules

‎Gruntfile.js

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
module.exports = function(grunt) {
2+
// Project configuration
3+
grunt.initConfig({
4+
pkg: grunt.file.readJSON('package.json'),
5+
less: {
6+
dist: {
7+
options: {
8+
cleancss: true,
9+
ieCompat: true
10+
},
11+
files: {
12+
"css/all.css": "less/all.less"
13+
}
14+
}
15+
},
16+
postcss: {
17+
options: {
18+
map: true,
19+
processors: [
20+
require('autoprefixer')({
21+
browsers: ['last 2 versions', 'ie 9']
22+
})
23+
]
24+
},
25+
dist: {
26+
src: 'css/all.css'
27+
}
28+
},
29+
watch: {
30+
less: {
31+
files: ['less/**/*.less'],
32+
tasks: ['less:dist', 'postcss:dist'],
33+
options: {
34+
spawn: false
35+
}
36+
}
37+
}
38+
});
39+
40+
// Load plugins
41+
grunt.loadNpmTasks('grunt-contrib-less');
42+
grunt.loadNpmTasks('grunt-contrib-watch');
43+
grunt.loadNpmTasks('grunt-postcss');
44+
45+
// Default task(s)
46+
grunt.registerTask('default', ['less', 'postcss:dist']);
47+
};

‎_layouts/default.html

+31-43
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
<meta property="og:site_name" content="PHP: The Right Way"/>
1313
<meta property="og:type" content="website"/>
1414
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
15-
<link href='//fonts.googleapis.com/css?family=Alfa+Slab+One|Droid+Serif:400,700' rel='stylesheet' type='text/css'>
16-
<link rel="stylesheet" href="{{ site.baseurl }}styles/all.css"/>
17-
<link rel="stylesheet" href="{{ site.baseurl }}styles/print.css" media="print, handheld"/>
18-
<link rel="stylesheet" href="{{ site.baseurl }}styles/syntax.css"/>
15+
<link rel="stylesheet" href="{{ site.baseurl }}css/all.css"/>
1916
<link rel="icon" href="{{ site.baseurl }}images/favicon.png" type="image/png"/>
2017
<script>
2118
var _gaq = _gaq || [];
@@ -29,8 +26,18 @@
2926
</script>
3027
</head>
3128
<body>
32-
<nav class="site-navigation">
29+
<header class="site-header">
30+
<h1><a href="/">PHP <em>The Right Way</em></a></h1>
3331
<div class="build-date">Last Updated: {{ site.time }}</div>
32+
<div class="share">
33+
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.phptherightway.com/" data-size="large" data-hashtags="php">Tweet</a>
34+
</div>
35+
<a class="fork-me" href="https://github.com/codeguy/php-the-right-way" target="_blank">
36+
<img src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"/>
37+
</a>
38+
</header>
39+
40+
<nav class="site-navigation">
3441
<ul>
3542
<li><a href="/#site-header">Welcome</a>
3643
<ul>
@@ -59,50 +66,31 @@
5966
{% endfor %}
6067
</ul>
6168
</li>
62-
<li><a href="/#site-footer">Credits</a></li>
69+
<li><a href="/#credits">Credits</a></li>
6370
</ul>
6471
</nav>
65-
<div class="site-content">
66-
67-
<a class="fork-me" href="https://github.com/codeguy/php-the-right-way">
68-
<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub">
69-
</a>
7072

71-
<header class="site-header" id="site-header">
72-
<hgroup>
73-
<h1 class="site-title"><a href="/">PHP</a></h1>
74-
<h2 class="site-slogan">The Right Way.</h2>
75-
</hgroup>
76-
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.phptherightway.com/" data-size="large" data-hashtags="php">Tweet</a>
77-
</header>
73+
<div class="site-content chapters">
7874
{{ content }}
79-
<div id="site-footer">
80-
<h1 id="site-footer_title">Credits</h1>
81-
<footer class="site-footer" id="site-footer">
82-
<h2 class="epsilon">Created and maintained by</h2>
83-
<ul>
84-
<li><a href="http://twitter.com/codeguy">Josh Lockhart</a></li>
85-
</ul>
86-
<h2 class="epsilon">Project collaborators</h2>
87-
<ul>
88-
<li><a href="http://krisjordan.com/">Kris Jordan</a></li>
89-
<li><a href="http://philsturgeon.co.uk/">Phil Sturgeon</a></li>
90-
</ul>
91-
<h2 class="epsilon">Project contributors</h2>
92-
<div id="contributors">Loading&hellip;</div>
93-
<h2 class="epsilon">Project sponsors</h2>
94-
<ul class="mbd">
95-
<li><a href="http://www.newmediacampaigns.com">New Media Campaigns</a></li>
96-
</ul>
97-
<p>
98-
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.twitter.com/codeguy" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
99-
</p>
100-
</footer>
101-
</div>
10275
</div>
10376

77+
<footer class="site-footer" id="credits">
78+
<h2>Created and maintained by</h2>
79+
<ul>
80+
<li><a href="http://joshlockhart.com" target="_blank">Josh Lockhart</a></li>
81+
<li><a href="http://philsturgeon.co.uk/" target="_blank">Phil Sturgeon</a></li>
82+
<li><a href="https://github.com/codeguy/php-the-right-way/graphs/contributors" target="_blank">Project Contributors</a></li>
83+
</ul>
84+
<div class="license">
85+
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a>
86+
<br />
87+
<span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://joshlockhart.com" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a>
88+
<br/>
89+
is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
90+
</div>
91+
</footer>
92+
93+
<!-- Twitter -->
10494
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
105-
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
106-
<script src="/scripts/setup.js"></script>
10795
</body>
10896
</html>

‎_layouts/page.html

+30-17
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
<meta property="og:site_name" content="PHP: The Right Way"/>
1313
<meta property="og:type" content="website"/>
1414
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
15-
<link href='//fonts.googleapis.com/css?family=Alfa+Slab+One|Droid+Serif:400,700' rel='stylesheet' type='text/css'>
16-
<link rel="stylesheet" href="{{ site.baseurl }}styles/all.css"/>
17-
<link rel="stylesheet" href="{{ site.baseurl }}styles/syntax.css"/>
15+
<link rel="stylesheet" href="{{ site.baseurl }}css/all.css"/>
1816
<link rel="icon" href="{{ site.baseurl }}images/favicon.png" type="image/png"/>
1917
<script>
2018
var _gaq = _gaq || [];
@@ -28,23 +26,38 @@
2826
</script>
2927
</head>
3028
<body>
31-
<header class="interior-site-header">
32-
<div class="site-title"><a href="/">PHP</a></div>
33-
<div class="site-slogan">The Right Way.</div>
34-
<a class="btn btn-h" href="/">Return to Main Page</a>
35-
<a class="fork-me" href="https://github.com/codeguy/php-the-right-way">
36-
<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub">
29+
<header class="site-header">
30+
<h1><a href="/">PHP <em>The Right Way</em></a></h1>
31+
<div class="build-date">Last Updated: {{ site.time }}</div>
32+
<div class="share">
33+
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.phptherightway.com/" data-size="large" data-hashtags="php">Tweet</a>
34+
</div>
35+
<a class="fork-me" href="https://github.com/codeguy/php-the-right-way" target="_blank">
36+
<img src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"/>
3737
</a>
3838
</header>
39-
<div class="interior-site-content">
40-
<div class="pbh"><em>You are reading extended content about&hellip;</em></div>
39+
40+
<div class="site-content">
4141
{{ content }}
42-
<a href="/">Return to Main Page</a>
43-
<footer class="site-footer" id="site-footer">
44-
<p>
45-
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://www.twitter.com/codeguy" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
46-
</p>
47-
</footer>
4842
</div>
43+
44+
<footer class="site-footer" id="credits">
45+
<h2>Created and maintained by</h2>
46+
<ul>
47+
<li><a href="http://joshlockhart.com" target="_blank">Josh Lockhart</a></li>
48+
<li><a href="http://philsturgeon.co.uk/" target="_blank">Phil Sturgeon</a></li>
49+
<li><a href="https://github.com/codeguy/php-the-right-way/graphs/contributors" target="_blank">Project Contributors</a></li>
50+
</ul>
51+
<div class="license">
52+
<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="//i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a>
53+
<br />
54+
<span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/Text" property="dct:title" rel="dct:type">PHP: The Right Way</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://joshlockhart.com" property="cc:attributionName" rel="cc:attributionURL">Josh Lockhart</a>
55+
<br/>
56+
is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://www.phptherightway.com" rel="dct:source">www.phptherightway.com</a>.
57+
</div>
58+
</footer>
59+
60+
<!-- Twitter -->
61+
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
4962
</body>
5063
</html>

‎banners.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: default
2+
layout: page
33
title: Website Banners
44
description: "Spread the word! Use these banner to let new PHP programmers know about PHP: The Right Way"
55
sitemap: true

0 commit comments

Comments
 (0)