Skip to content

Commit

Permalink
Merge pull request #159 from openpolitics/better-design
Browse files Browse the repository at this point in the history 
Better design
  • Loading branch information
@Floppy
Floppy committed Apr 14, 2014
2 parents 5df9133 + 09350c4 commit 80e74e4
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 96 deletions.
3 changes: 2 additions & 1 deletion _config.yml
View file
@@ -1,6 +1,7 @@
name: OpenPolitics
tagline: An open source plan for the UK. Take control, and create the future you want.

markdown: kramdown

kramdown:
auto_ids: true
auto_ids: true
18 changes: 13 additions & 5 deletions _layouts/homepage.html
View file
@@ -1,9 +1,17 @@
---
layout: page
layout: main
---

<img src='images/logo.png' class='pull-right' alt='OpenPolitics logo' width='250' style='margin-left: 20px'/>
<h1>The OpenPolitics Project</h1>
<div class='homepage'>
<div class='jumbotron'>
<div class='container'>
<h1>The OpenPolitics Project</h1>
<p>{{site.tagline}}</p>
<p>
<a href='manifesto' class='btn btn-primary btn-lg'>Help write the Manifesto</a>
</p>
</div>
</div>

<div id='homepage' class='container'>
{{content}}
</div>
</div>
77 changes: 77 additions & 0 deletions _layouts/main.html
View file
@@ -0,0 +1,77 @@
<!DOCTYPE html>
<html>
<head>
<title>{{site.name}}{% if page.title %}: {{page.title}}{% endif %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="{{site.baseurl}}stylesheets/bootstrap.min.css" rel="stylesheet">
<link href="{{site.baseurl}}stylesheets/font-awesome.min.css" rel="stylesheet">
<link href="{{site.baseurl}}stylesheets/custom.css" rel="stylesheet">
<link rel='icon' href='images/logo64.png' sizes="64x64" type="image/png">
<style>
body {
padding-top: 50px;
}
</style>
</head>
<body>

<script src="{{site.baseurl}}javascripts/jquery-1.11.0.min.js"></script>

<div class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{site.baseurl}}index.html"><img src='/images/logo64_inverted.png'/ height='20' style='vertical-align: text-bottom'> {{site.name}}</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class='dropdown'>
<a class='dropdown-toggle' data-toggle='dropdown' href="{{site.baseurl}}manifesto/index.html">Manifesto <span class='caret'></span></a>
<ul class='dropdown-menu'>
<li> <a href='{{site.baseurl}}manifesto/index.html'>Introduction</a></li>
{% assign sorted_pages = site.pages | sort:"name" %}
{% for page in sorted_pages %}
{% if page.layout == "policy" %}
<li> <a href='{{page.url}}'>{{ page.title }}</a></li>
{% endif %}
{% endfor %}
</ul>
</li>
<li><a href="http://votebot.openpolitics.org.uk">Open Votes</a></li>
<li><a href="{{site.baseurl}}contributing.html">How to Contribute</a></li>
</ul>
<a href="https://github.com/openpolitics/manifesto/edit/gh-pages/{{page.path}}" class='btn btn-primary navbar-btn pull-right'>
Edit This Page
<i class="fa fa-pencil"></i>
</a>
<form class="navbar-form navbar-right" role="search" action='/search.html' method='get' style='margin-right: 20px'>
<div class="form-group">
<input type="text" class="form-control" name='query' placeholder="Search">
</div>
</form>
</div><!--/.nav-collapse -->
</div>
</div>

{{content}}

<div class="container">
<footer>
<hr/>
<small>
<img src="http://i.creativecommons.org/p/zero/1.0/80x15.png" style="border-style: none;" alt="CC0" />
This content is dedicated to the public domain. See the <a href='{{site.baseurl}}license.html'>license</a> for details. You can <a href='https://github.com/openpolitics/manifesto/blame/gh-pages/{{page.path}}'>see all page changes</a> on GitHub. <a href='{{site.baseurl}}contributing.html'>Contributions</a> are welcome!
</small>
</footer>

</div>

<script src="{{site.baseurl}}javascripts/bootstrap.min.js"></script>

</body>
</html>
89 changes: 9 additions & 80 deletions _layouts/page.html
View file
@@ -1,81 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>{{site.name}}{% if page.title %}: {{page.title}}{% endif %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="{{site.baseurl}}stylesheets/bootstrap.min.css" rel="stylesheet">
<link href="{{site.baseurl}}stylesheets/font-awesome.min.css" rel="stylesheet">
<link href="{{site.baseurl}}stylesheets/custom.css" rel="stylesheet">
<link rel='icon' href='images/logo64.png' sizes="64x64" type="image/png">
<style>
body {
padding-top: 50px;
}
</style>
</head>
<body>

<script src="{{site.baseurl}}javascripts/jquery-1.11.0.min.js"></script>

<div class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{site.baseurl}}index.html"><img src='/images/logo64_inverted.png'/ height='20' style='vertical-align: text-bottom'> {{site.name}}</a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<li class='dropdown'>
<a class='dropdown-toggle' data-toggle='dropdown' href="{{site.baseurl}}manifesto/index.html">Manifesto <span class='caret'></span></a>
<ul class='dropdown-menu'>
<li> <a href='{{site.baseurl}}manifesto/index.html'>Introduction</a></li>
{% assign sorted_pages = site.pages | sort:"name" %}
{% for page in sorted_pages %}
{% if page.layout == "policy" %}
<li> <a href='{{page.url}}'>{{ page.title }}</a></li>
{% endif %}
{% endfor %}
</ul>
</li>
<li><a href="http://votebot.openpolitics.org.uk">Open Votes</a></li>
<li><a href="{{site.baseurl}}contributing.html">How to Contribute</a></li>
</ul>
<a href="https://github.com/openpolitics/manifesto/edit/gh-pages/{{page.path}}" class='btn btn-primary navbar-btn pull-right'>
Edit Page
<i class="fa fa-pencil"></i>
</a>
<form class="navbar-form navbar-right" role="search" action='/search.html' method='get' style='margin-right: 20px'>
<div class="form-group">
<input type="text" class="form-control" name='query' placeholder="Search">
</div>
</form>
</div><!--/.nav-collapse -->
</div>
---
layout: main
---

<div class="container">
<h1>{{page.title}}</h1>
<div>
{{content}}
</div>

<div class="container">

<h1>{{page.title}}</h1>
<div>
{{content}}
</div>

<footer>
<hr/>
<small>
<img src="http://i.creativecommons.org/p/zero/1.0/80x15.png" style="border-style: none;" alt="CC0" />
This content is dedicated to the public domain. See the <a href='{{site.baseurl}}license.html'>license</a> for details. You can <a href='https://github.com/openpolitics/manifesto/blame/gh-pages/{{page.path}}'>see all page changes</a> on GitHub. <a href='{{site.baseurl}}contributing.html'>Contributions</a> are welcome!
</small>
</footer>

</div>

<script src="{{site.baseurl}}javascripts/bootstrap.min.js"></script>

</body>
</html>
</div>
14 changes: 8 additions & 6 deletions index.md
View file
Expand Up @@ -3,17 +3,19 @@ layout: homepage
published: true
---

The current political parties in the UK are not serving the public interest. There is not enough choice, little informed debate, and no challenge to the prevailing narrative. Those of us who believe in, and are working towards, a better future have nobody to represent us.
This is a project to create a new kind of politics. We're starting by writing a manifesto, but we want everyone to build it *together*. Click the button above to start reading, and click "Edit" at the top right to add your own ideas.

We believe that a better kind of government is possible; one based on openness, transparency, evidence, and citizen engagement. We believe that it is time for those of us who have a stake in the future to stand up, and change the system from the inside.
Everyone has ideas about the future - why not add yours? Perhaps you can see something on here you disagree with? Nothing on this site is set in stone - everything and anything is up for discussion, amending, or changing entirely. Your contribution doesn't have to be huge - everything helps!

## The Manifesto
We are currently not a registered political party, and do not know if we intend to become one, but we are aiming to have a complete-enough manifesto to be able to support candidates (either within a party or independent) in the 2015 general and local elections.

We are writing a manifesto for a new kind of politics, but the whole point is that we build it together. [It's easy to contribute](contributing.html). Do you feel strongly about some area of government policy? Why not add your ideas? Perhaps you can see something on here you disagree with? Nothing on this site is set in stone - everything and anything is up for discussion, amending, or changing entirely. Your contribution doesn't have to be huge - everything helps!
## Why?

<a href='manifesto' class='btn btn-primary btn-lg'>Read the Manifesto</a>
The current political landscape in the UK is not serving the public interest. There is not enough choice, little informed debate, and no challenge to the prevailing narrative. Those of us who believe in, and are working towards, a better future have nobody to represent us.

We are currently not a registered political party, and do not know if we intend to become one, but we are aiming to have a complete-enough manifesto to be able to support candidates (either within a party or independent) in the 2015 general and local elections.
We believe that a better kind of government is possible; one based on openness, transparency, evidence, and citizen engagement. We believe that it is time for those of us who have a stake in the future to stand up, and change the system from the inside.

There are many people thinking about the new opportunities that the Internet brings to government; we aim to put some of those ideas into practice, and give people something to vote for, starting here.

## Background Reading

Expand Down
26 changes: 22 additions & 4 deletions stylesheets/custom.css
View file
@@ -1,8 +1,26 @@
h1 {
.navbar {
border-bottom: 0px;
}

.jumbotron {
/* background-image: url(/images/logo.png);
background-size: contain;
background-repeat: no-repeat;
background-position-right: 100px;*/

width: 100%;
background-color: #033769;
color: white;
margin-top: -20px;
border-radius: 0px !important;

}

h1 {
counter-reset: section;
}

.policy h2:before {
.policy h2:before {
font-style: italic;
content: counter(section) ". ";
}
Expand All @@ -16,12 +34,12 @@ h1 {
counter-increment: paragraph;
}

.policy > p:before {
.policy > p:before {
font-style: italic;
content: counter(section) "." counter(paragraph) ". ";
}

.policy > p:first-of-type, .homepage > p:first-of-type {
.policy > p:first-of-type, #homepage > p:first-of-type {
font-size: 125%;
}

Expand Down

0 comments on commit 80e74e4

Please sign in to comment.