Skip to content

Commit

Permalink
Port over new design from mapit.mysociety.org
Browse files Browse the repository at this point in the history
This includes mysociety-docs-theme as a submodule, to build on the
standard theme we use for other documentation sites.
  • Loading branch information
zarino committed Feb 10, 2017
1 parent c41efbd commit 29d097d
Show file tree
Hide file tree
Showing 73 changed files with 842 additions and 1,877 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "theme"]
path = theme
url = https://github.com/mysociety/mysociety-docs-theme.git
Binary file removed mapit/static/mapit/fonts/exljbris-museoslab-500.eot
Binary file not shown.
247 changes: 0 additions & 247 deletions mapit/static/mapit/fonts/exljbris-museoslab-500.svg

This file was deleted.

Binary file not shown.
Binary file removed mapit/static/mapit/fonts/exljbris-museoslab-500.woff
Binary file not shown.
41 changes: 0 additions & 41 deletions mapit/static/mapit/img/django-logo-negative.svg

This file was deleted.

Binary file added mapit/static/mapit/img/favicon.ico
Binary file not shown.
Binary file added mapit/static/mapit/img/footer-logo-openpolis.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed mapit/static/mapit/img/global-cross_sell.png
Binary file not shown.
Binary file removed mapit/static/mapit/img/global-header-large.jpg
Binary file not shown.
Binary file removed mapit/static/mapit/img/global-header.jpg
Binary file not shown.
Binary file removed mapit/static/mapit/img/home-icon.png
Binary file not shown.
Binary file added mapit/static/mapit/img/mysociety-bloom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/mysociety-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
78 changes: 78 additions & 0 deletions mapit/static/mapit/img/mysociety-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/openpolis-bloom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mapit/static/mapit/img/openpolis-tool.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed mapit/static/mapit/img/page-top-donate.png
Binary file not shown.
Binary file removed mapit/static/mapit/img/page-top-grad.png
Binary file not shown.
Binary file removed mapit/static/mapit/img/page-top-mysociety.png
Binary file not shown.
Binary file added mapit/static/mapit/img/tree-branch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/tree-last.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mapit/static/mapit/img/tree-upright.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed mapit/static/mapit/img/uk-cross_sell.png
Binary file not shown.
Binary file removed mapit/static/mapit/img/union_flag.jpg
Binary file not shown.
Binary file removed mapit/static/mapit/img/union_flag2.jpg
Diff not rendered.
96 changes: 96 additions & 0 deletions mapit/static/mapit/sass/_area.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
#map {
width: 100%;
margin: 1em 0;
}

#leaflet {
position: relative;
width: 100%;
height: 0;
padding-top: 100%; // means "100% of the width of this element" - ie: square
}

@media (min-width: $medium-screen) {
#map {
float: left;
width: 50%;
margin-top: 0;
}

section.details,
header.area_info {
float: right;
clear: right;
width: 50%;
padding-left: 2em;
}
}

.area_info {
.area_id {
font-style: inherit;
font-size: 0.7em;
color: $color_mysoc_dark_grey;
margin: 0 0.3em;
}
}

section.details {
// This is the top-level list on an area/country page,
// containing the "Geometry", "Areas", "Codes", etc headings.
& > ul {
@extend .unstyled-list;

@include flexbox();
@include flex-wrap(wrap);

& > li {
width: 50%;
}
}

// Deeper lists on the area/country page, eg: the list of
// json/wkt/kml download links.
ul ul {
list-style-type: disc;
margin-bottom: 1em;

h3 {
margin-bottom: 0;
}

li {
line-height: 1.3em;
margin-bottom: 0.4em;
}
}
}

// This is the <ol> list of "Areas" on a postcode or point page.
.area_list {
@extend .unstyled-list;

li {
padding: 1em;
border-radius: 0.3em;
background-color: $colour_off_white;
margin-bottom: 1em;
}

h3 {
margin-bottom: 0.2em;
}

p {
margin: 0;
}

$area_level: 10;

@while $area_level > 0 {
li.area_level_#{$area_level} {
margin-left: 2.5% * $area_level;
}
$area_level: $area_level - 1;
}
}
115 changes: 115 additions & 0 deletions mapit/static/mapit/sass/_content.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
.content {
@extend .container;

@include clearfix();

padding-top: 1em;
padding-bottom: 1em;

@media (min-width: $medium-screen) {
padding-top: 2em;
padding-bottom: 2em;
}
}

.content--with-sidebar {
section + section {
margin-top: 2em;
padding-top: 2em;
border-top: 1px solid $colour_light_grey;
}

@media (min-width: $medium-screen) {
header {
float: left;
width: 20%;
}

section {
float: right;
width: 70%;
}
}
}

.toc {
p {
margin: 0.25em 0;
font-weight: 600;
color: $colour_dark_grey;
}

ol, ul {
@extend .unstyled-list;
margin-top: 0;
margin-bottom: 2em;
}

a {
display: block;
padding: 0.25em 0;
border-top: 1px solid $colour_light_grey;
}
}

.content--api-docs {
section {
h3 {
em {
display: block;
font-style: inherit;
font-size: 0.66em;
line-height: 1em;
}
}

dl {
margin: 0;
}

dt {
font-weight: 600;
}

dd {
margin-bottom: 1.5em;

p, ul {
margin: 0 0 1.5em 0;
}
}
}

@media (min-width: $large-screen) {
section {
padding-left: 12em;
position: relative;

h3 {
position: absolute;
left: 0;
width: 10em;
}
}
}
}

.api-docs-intro {
margin-bottom: 2em;
padding-bottom: 2em;
border-bottom: 1px solid $colour_light_grey;

p {
max-width: 45em;
margin-bottom: 0;
}

& > :last-child {
margin-bottom: 0;
}
}

hr {
border-top-color: $colour_light_grey;
margin: 2em 0;
}
7 changes: 7 additions & 0 deletions mapit/static/mapit/sass/_footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.mysoc-footer {
.mapit-copyright {
font-size: 0.8em;
line-height: 1.5em;
margin-top: 3em;
}
}
Loading

0 comments on commit 29d097d

Please sign in to comment.