Skip to content

Commit 38f3912

Browse files
artempartemp
committed
HTML clenaups + formatting
1 parent 54f250d commit 38f3912

5 files changed

Lines changed: 93 additions & 96 deletions

File tree

‎_layouts/01_page.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<body>
88
{% include stickynav.html %}
99
<div class="contain col12 clearfix">
10-
<div class='col8 margin2 stickymove'>
11-
<h3 class='space-bottom2 big'>{{ page.title }}</h3>
12-
<div class='col12 pad4y space-bottom4'>
10+
<div class="col8 margin2 stickymove">
11+
<h3 class="space-bottom2 big">{{ page.title }}</h3>
12+
<div class="col12 pad4y space-bottom4">
1313
{{ content }}
1414
</div>
1515
</div>

‎_layouts/01_post.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@
1111

1212
<div class="contain col12 clearfix">
1313

14-
<div class='col2 stickymove pad2x fill-light'>
14+
<div class="col2 stickymove pad2x fill-light">
1515
{% for post in site.categories.Mapnik limit:12 %}
16-
{% if post.type != 'install' %}
17-
<a class='block news' href="{{site.baseurl}}{{post.url}}">{{post.title}}</a> <span class='date'>{{post.date | date: "%b %d, %Y" }} | {{post.author}}</span><br>
16+
{% if post.type != "install" %}
17+
<a class="block news" href="{{site.baseurl}}{{post.url}}">{{post.title}}</a> <span class="date">{{post.date | date: "%b %d, %Y" }} | {{post.author}}</span><br>
1818
{% endif %}
1919
{% endfor %}
2020
</div>
2121

22-
<div class='col8 pad4x stickymove'><h3 class='space-bottom2 big'>latest news</h3>
23-
<h1 class='space-bottom2' ><a href="{{site.baseurl}}{{post.url}}">{{ page.title }}</a></h1>
22+
<div class="col8 pad4x stickymove"><h3 class="space-bottom2 big">latest news</h3>
23+
<h1 class="space-bottom2" ><a href="{{site.baseurl}}{{post.url}}">{{ page.title }}</a></h1>
2424
<p>{{ page.date | date: "%b %d, %Y" }}</p>
2525
<div class="col12 pad2y">
2626
<div class="col6 small">BY:
2727
<span class="pad1x">
2828
<img class="dot" alt="{{ author[0].name }}" src="{{ author[0].image }}" width="30"/>
2929
&nbsp;
3030
{% if author[0].github != null %}
31-
<a href='{{ author[0].github }}'>{{ page.author }}</a>
31+
<a href="{{ author[0].github }}">{{ page.author }}</a>
3232
{% else %}
3333
{{ page.author }}
3434
{% endif %}
3535
</span>
3636
</div>
3737
</div>
3838

39-
<div class='col12 pad4y space-bottom4'>
39+
<div class="col12 pad4y space-bottom4">
4040
{{ content }}
4141
</div>
4242

‎_layouts/01_section.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
<body>
88
{% include stickynav.html %}
99
<div class="contain col12 clearfix">
10-
<div class='stickymove clearfix fill-light col2 pad2x'>
10+
<div class="stickymove clearfix fill-light col2 pad2x">
1111
{% for post in site.categories.Mapnik %}
12-
{% if post.type != 'install' %}
13-
<a class='block news' href="{{site.baseurl}}{{post.url}}">{{post.title}}</a> <span class='date'>{{post.date | date: "%b %d, %Y" }} | {{post.author}}</span><br>
12+
{% if post.type != "install" %}
13+
<a class="block news" href="{{site.baseurl}}{{post.url}}">{{post.title}}</a> <span class="date">{{post.date | date: "%b %d, %Y" }} | {{post.author}}</span><br>
1414
{% endif %}
1515
{% endfor %}
1616
</div>
1717
<div class="stickymove clearfix pad4x col6">
18-
<div class=''>
19-
<h3 class='space-bottom2 big'>{{ page.title }}</h3>
18+
<div class="">
19+
<h3 class="space-bottom2 big">{{ page.title }}</h3>
2020
{% for post in site.categories.Mapnik limit:12 %}
21-
{% if post.type != 'install' %}
21+
{% if post.type != "install" %}
2222
<a href="{{site.baseurl}}{{post.url}}">{{post.title}}</a><br>
23-
<span class='date'>{{post.date | date: "%b %d, %Y" }} | {{post.author}}</span>
24-
<div class='col12 space-bottom2'>
23+
<span class="date">{{post.date | date: "%b %d, %Y" }} | {{post.author}}</span>
24+
<div class="col12 space-bottom2">
2525
{{ post.excerpt }}
26-
<a class='news' href="{{site.baseurl}}{{post.url}}">read more...</a>
26+
<a class="news" href="{{site.baseurl}}{{post.url}}">read more...</a>
2727
</div>
28-
<div class='col12 space-bottom4 '>
28+
<div class="col12 space-bottom4">
2929
</div>
3030
{% endif %}
3131
{% endfor %}

‎_layouts/01_splash.html‎

Lines changed: 67 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -4,144 +4,142 @@
44
{% include mapnik.meta %}
55
<title>Mapnik.org - the core of geospatial visualization &amp; processing</title>
66
</head>
7-
87
<body>
9-
108
<!-- header -->
11-
<div class='splash'>
12-
<div class='gradient'>
13-
<div class='col12 clearfix prose'>
14-
<div id='logo' class='col5 margin2 pad4y fl'><h1 class='fancy dark'>mapnik</h1></div>
15-
<div id='tagline' class='col5 space-top4 dark pad4y prose fr'>the core of geospatial visualization &amp; processing</div>
9+
<div class="splash">
10+
<div class="gradient">
11+
<div class="col12 clearfix prose">
12+
<div id="logo" class="col5 margin2 pad4y fl"><h1 class="fancy dark">mapnik</h1></div>
13+
<div id="tagline" class="col5 space-top4 dark pad4y prose fr">the core of geospatial visualization &amp; processing</div>
1614
</div>
17-
<div id='intro1' class='col9 margin2 pad2y dark big'>mapnik combines pixel-perfect image output with lightning-fast cartographic algorithms, and exposes interfaces in C++, Python, and Node.</div>
18-
<div id='intro2' class='col9 margin2 pad2y dark big'>
19-
<a href='{{site.baseurl}}/pages/downloads.html' class='button stroke white col5'>Download mapnik</a>
15+
<div id="intro1" class="col9 margin2 pad2y dark big">mapnik combines pixel-perfect image output with lightning-fast cartographic algorithms, and exposes interfaces in C++, Python, and Node.</div>
16+
<div id="intro2" class="col9 margin2 pad2y dark big">
17+
<a href="{{site.baseurl}}/pages/downloads.html" class="button stroke white col5">Download mapnik</a>
2018
</div>
21-
<div id='intro3' class='col9 margin2 pad2y'>
19+
<div id="intro3" class="col9 margin2 pad2y">
2220
<a class="github-button" href="https://github.com/mapnik/mapnik/fork" data-style="mega" data-count-href="/mapnik/mapnik/network" data-count-api="/repos/mapnik/mapnik#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork mapnik/mapnik on GitHub">Fork</a>
2321
<script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
2422
</div>
2523

2624
</div>
2725
<!-- map design -->
28-
<div class='module pad8y'></div>
26+
<div class="module pad8y"></div>
2927
</div>
3028

31-
<div class='full-content'>
32-
<!-- mapnik latest news --><a id='latest-news'></a>
33-
<div class='content prose col12 clearfix fill-white'>
34-
<div class='col10 margin2 pad2y big'>latest news</div>
35-
{% for post in site.categories.Mapnik limit:4 %}{% if post.type != 'install' %}
29+
<div class="full-content">
30+
<!-- mapnik latest news --><a id="latest-news"></a>
31+
<div class="content prose col12 clearfix fill-white">
32+
<div class="col10 margin2 pad2y big">latest news</div>
33+
{% for post in site.categories.Mapnik limit:4 %}{% if post.type != "install" %}
3634
{% capture modulo %}{{ forloop.index0 | mod:4 }}{% endcapture %}
3735
{% assign author = site.data.author[post.author] %}
38-
{% if modulo == '0' or forloop.first %}
36+
{% if modulo == "0" or forloop.first %}
3937
{% assign post1-author = post.author %}{% assign post1-title = post.title %}{% assign post1-date = post.date %}
4038
{% assign post1-url = post.url %}{% assign post1-img = author[0].image %}{% assign post1-excerpt = post.excerpt %}
4139
{% assign post1-github = author[0].github %}
4240
{% endif %}
43-
{% if modulo == '1' %}
41+
{% if modulo == "1" %}
4442
{% assign post2-author = post.author %}{% assign post2-title = post.title %}{% assign post2-date = post.date %}
4543
{% assign post2-url = post.url %}{% assign post2-img = author[0].image %}{% assign post2-excerpt = post.excerpt %}
4644
{% assign post2-github = author[0].github %}
4745
{% endif %}
48-
{% if modulo == '2' %}
46+
{% if modulo == "2" %}
4947
{% assign post3-author = post.author %}{% assign post3-title = post.title %}{% assign post3-date = post.date %}
5048
{% assign post3-url = post.url %}{% assign post3-img = author[0].image %}{% assign post3-excerpt = post.excerpt %}
5149
{% assign post3-github = author[0].github %}
5250
{% endif %}
53-
{% if modulo == '3' or forloop.last %}
51+
{% if modulo == "3" or forloop.last %}
5452
{% assign post4-author = post.author %}{% assign post4-title = post.title %}{% assign post4-date = post.date %}
5553
{% assign post4-url = post.url %}{% assign post4-img = author[0].image %}{% assign post4-excerpt = post.excerpt %}
5654
{% assign post4-github = author[0].github %}
5755
{% endif %}
5856
{% endif %}{% endfor %}
5957

60-
<div class='col6 margin2 pad1y space-bottom4'>
61-
<div class='col3'>
62-
<h2 class='med-news'><a href="{{site.baseurl}}{{ post1-url }}"> {{ post1-title }}</a></h2>
63-
<div class='col12'>
64-
<div class='col12'><span class='date'>{{ post1-date | date: "%b %d, %Y" }}</span></div>
65-
<div class='col2 space-top1'><img class='dot fl' alt="dot fl" src='{{ post1-img }}' width='30'></div>
66-
<div class='col9 space-top1'><span class='date pad1x'>
58+
<div class="col6 margin2 pad1y space-bottom4">
59+
<div class="col3">
60+
<h2 class="med-news"><a href="{{site.baseurl}}{{ post1-url }}"> {{ post1-title }}</a></h2>
61+
<div class="col12">
62+
<div class="col12"><span class="date">{{ post1-date | date: "%b %d, %Y" }}</span></div>
63+
<div class="col2 space-top1"><img class="dot fl" alt="dot fl" src="{{ post1-img }}" width="30"></div>
64+
<div class="col9 space-top1"><span class="date pad1x">
6765
{% if post1-github != null %}
68-
<a href='{{ post1-github }}'>{{ post1-author }}</a>
66+
<a href="{{ post1-github }}">{{ post1-author }}</a>
6967
{% else %}
7068
{{ post1-author }}
7169
{% endif %}
7270
</span></div>
7371
</div>
7472
</div>
75-
<div class='col9'>
76-
<div class='col1'><img class='fl' alt="fl" src='images/quote-L.png' width='30'></div>
77-
<div class='col11 pad1x'>{{ post1-excerpt }} <a class='news' href="{{site.baseurl}}{{ post1-url }}">read more >> </a></div>
73+
<div class="col9">
74+
<div class="col1"><img class="fl" alt="fl" src="images/quote-L.png" width="30"></div>
75+
<div class="col11 pad1x">{{ post1-excerpt }} <a class="news" href="{{site.baseurl}}{{ post1-url }}">read more >> </a></div>
7876
</div>
7977
</div>
80-
<div class='col4 pad4x space-top1'>
81-
<div class='col12 space-bottom2'>
78+
<div class="col4 pad4x space-top1">
79+
<div class="col12 space-bottom2">
8280
<a href="{{site.baseurl}}{{ post2-url }}">{{ post2-title }}</a><br>
83-
<span class='date'>{{ post2-date | date: "%b %d, %Y" }} | {% if post2-github != null %}<a href='{{ post2-github }}'>{{ post2-author }}</a>{% else %}{{ post2-author }}{% endif %}</span>
81+
<span class="date">{{ post2-date | date: "%b %d, %Y" }} | {% if post2-github != null %}<a href="{{ post2-github }}">{{ post2-author }}</a>{% else %}{{ post2-author }}{% endif %}</span>
8482
</div>
85-
<div class='col12 space-bottom2'>
83+
<div class="col12 space-bottom2">
8684
<a href="{{site.baseurl}}{{ post3-url }}">{{ post3-title }}</a><br>
87-
<span class='date'>{{ post3-date | date: "%b %d, %Y" }} | {% if post3-github != null %}<a href='{{ post3-github }}'>{{ post3-author }}</a>{% else %}{{ post3-author }}{% endif %}</span>
85+
<span class="date">{{ post3-date | date: "%b %d, %Y" }} | {% if post3-github != null %}<a href="{{ post3-github }}">{{ post3-author }}</a>{% else %}{{ post3-author }}{% endif %}</span>
8886
</div>
89-
<div class='col12'>
90-
<a class='news' href="{{site.baseurl}}/news/archive.html">read news archive >> </a>
87+
<div class="col12">
88+
<a class="news" href="{{site.baseurl}}/news/archive.html">read news archive >> </a>
9189
</div>
9290
</div>
9391
</div>
9492

9593

9694
<!-- code bindings -->
9795
<a id="code"></a>
98-
<div class='content col12 clearfix fill-gray'>
99-
<div class='col3 margin2 pad8y prose'>
100-
<div class='big'>code in your language</div>
101-
<p class='space-top1'>mapnik's high-quality bindings let's you choose from Node.js, Python, and C++.</p>
102-
<div class='col12 pill'>
103-
<a href='http://mapnik.org/node-mapnik/documentation/' class='button stroke light short col6'>Node.js</a>
104-
<a href='http://mapnik.org/docs/v2.2.0/api/python/index.html' class='button light stroke short col6'>Python</a>
96+
<div class="content col12 clearfix fill-gray">
97+
<div class="col3 margin2 pad8y prose">
98+
<div class="big">code in your language</div>
99+
<p class="space-top1">mapnik's high-quality bindings let's you choose from Node.js, Python, and C++.</p>
100+
<div class="col12 pill">
101+
<a href="http://mapnik.org/node-mapnik/documentation/" class="button stroke light short col6">Node.js</a>
102+
<a href="http://mapnik.org/docs/v2.2.0/api/python/index.html" class="button light stroke short col6">Python</a>
105103
</div>
106104
</div>
107105

108-
<div class='col7 space-top2 pad4x clearfix'>
109-
<div class='col12 pad8y clearfix'>
106+
<div class="col7 space-top2 pad4x clearfix">
107+
<div class="col12 pad8y clearfix">
110108

111109
<div class="container">
112-
<ul class='tabs'>
113-
<li class='tab-link current' data-tab='tab-1'>Python</li>
114-
<li class='tab-link' data-tab='tab-2'>Node</li>
115-
<li class='tab-link' data-tab='tab-3'>C++</li>
110+
<ul class="tabs">
111+
<li class="tab-link current" data-tab="tab-1">Python</li>
112+
<li class="tab-link" data-tab="tab-2">Node</li>
113+
<li class="tab-link" data-tab="tab-3">C++</li>
116114
</ul>
117115
<div id="tab-1" class="tab-content current">
118116
{% highlight python %}
119117
import mapnik
120118
m = mapnik.Map(256,256)
121-
mapnik.load_map(m, 'path/to/file.xml')
119+
mapnik.load_map(m, "path/to/file.xml")
122120
m.zoom_all()
123-
mapnik.render_to_file(m, 'the_image.png')
121+
mapnik.render_to_file(m, "the_image.png")
124122
{% endhighlight %}
125123
</div>
126124
<div id="tab-2" class="tab-content">
127125
{% highlight js %}
128-
var mapnik = require('mapnik');
129-
var fs = require('fs');
126+
var mapnik = require("mapnik");
127+
var fs = require("fs");
130128
// register fonts and datasource plugins
131129
mapnik.register_default_fonts();
132130
mapnik.register_default_input_plugins();
133131
var map = new mapnik.Map(256, 256);
134-
map.load('./test/stylesheet.xml', function(err,map) {
132+
map.load("./test/stylesheet.xml", function(err,map) {
135133
if (err) throw err;
136134
map.zoomAll();
137135
var im = new mapnik.Image(256, 256);
138136
map.render(im, function(err,im) {
139137
if (err) throw err;
140-
im.encode('png', function(err,buffer) {
138+
im.encode("png", function(err,buffer) {
141139
if (err) throw err;
142-
fs.writeFile('map.png',buffer, function(err) {
140+
fs.writeFile("map.png",buffer, function(err) {
143141
if (err) throw err;
144-
console.log('saved map image to map.png');
142+
console.log("saved map image to map.png");
145143
});
146144
});
147145
});
@@ -175,14 +173,14 @@ <h2 class='med-news'><a href="{{site.baseurl}}{{ post1-url }}"> {{ post1-title }
175173

176174
<!-- xml stylesheets -->
177175
<a id="xml"></a>
178-
<div class='content col12 clearfix fill-gray'>
179-
<div class='col3 margin2 pad2y'>
180-
<h2 class='big'>style with a stylesheet</h2>
181-
<div class='col10 pad2y'>Only a single XML stylesheet for your map, regardless of the code binding.</div>
182-
<a href='https://github.com/mapnik/mapnik/wiki/XMLConfigReference' class='space-top1 button stroke light short col8'>XML Configuration</a>
176+
<div class="content col12 clearfix fill-gray">
177+
<div class="col3 margin2 pad2y">
178+
<h2 class="big">style with a stylesheet</h2>
179+
<div class="col10 pad2y">Only a single XML stylesheet for your map, regardless of the code binding.</div>
180+
<a href="https://github.com/mapnik/mapnik/wiki/XMLConfigReference" class="space-top1 button stroke light short col8">XML Configuration</a>
183181
</div>
184-
<div class='col7 pad4x space-bottom4'>
185-
<div class='fill-white'>
182+
<div class="col7 pad4x space-bottom4">
183+
<div class="fill-white">
186184
{% highlight xml%}
187185
<Map background-color="blue" srs="+init=epsg:4326">
188186
<Style name="My Style">
@@ -204,8 +202,8 @@ <h2 class='big'>style with a stylesheet</h2>
204202
</div>
205203
</div>
206204
<!-- blog -->
207-
<div class='fill-gray content col12 clearfix pad1y'>
208-
<div class='big quote center pad4y'>above all else, beautiful maps</div>
205+
<div class="fill-gray content col12 clearfix pad1y">
206+
<div class="big quote center pad4y">above all else, beautiful maps</div>
209207
</div>
210208
{% include stacks.html %}
211209
{% include footer.html %}

‎pages/media.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,18 @@
55

66
<p>When you’re using the Mapnik logo with other graphic elements, make sure you give our logo some room. The minimum size of the logo should be 28 pixels with 3px of letter-spacing, and the empty space around the logo should be at least 150% the size of the logo itself.</p>
77

8-
<p><img src='{{site.baseurl}}/images/assets/mapnik_logos.png'></p>
8+
<img alt="Mapnik Logo" src="{{site.baseurl}}/images/assets/mapnik_logos.png">
99

1010

11-
<p><h2>Mapnik typeface and logo mark</h2></p>
11+
<h2>Mapnik typeface and logo mark</h2>
1212

1313
Mapnik's new modern typeface and logo mark is powerful, modern, and flexible. Much like Mapnik itself. We primarily use the Maven Pro font family with Open Sans Light for it's simple elegance.
1414

15-
<p><img src='{{site.baseurl}}/images/assets/mapnik_typefaces.png'></p>
15+
<img src="{{site.baseurl}}/images/assets/mapnik_typefaces.png">
1616

1717

18-
<p><h2>Mapnik colors</h2></p>
18+
<h2>Mapnik colors</h2>
1919

20-
<p><img src='{{site.baseurl}}/images/assets/mapnik_colors.png'></p>
20+
<img src="{{site.baseurl}}/images/assets/mapnik_colors.png">
2121

22-
23-
<p>Download <a href='{{site.baseurl}}/images/assets/mapnik_brand-assets.zip'>Mapnik brand assets</a></p>
22+
<p>Download <a href="{{site.baseurl}}/images/assets/mapnik_brand-assets.zip">Mapnik brand assets</a></p>

0 commit comments

Comments
 (0)