Skip to content

Commit

Permalink
improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
dhakelila committed Jun 27, 2017
1 parent e66fe05 commit 786fe6f
Show file tree
Hide file tree
Showing 84 changed files with 273 additions and 147 deletions.
4 changes: 1 addition & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ GEM
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
ffi (1.9.18)
ffi (1.9.18-x86-mingw32)
forwardable-extended (2.6.0)
jekyll (3.4.3)
Expand Down Expand Up @@ -46,7 +45,6 @@ GEM
tzinfo (>= 1.0.0)

PLATFORMS
ruby
x86-mingw32

DEPENDENCIES
Expand All @@ -55,7 +53,7 @@ DEPENDENCIES
tzinfo-data

RUBY VERSION
ruby 2.2.2p95
ruby 2.3.3p222

BUNDLED WITH
1.15.1
66 changes: 33 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# WRI guidelines
This repository is the WRI guidelines project

## Getting set up

The dashboard is powered by
[Jekyll](https://upload.wikimedia.org/wikipedia/commons/7/78/Dr_Jekyll_and_Mr_Hyde_poster_edit2.jpg).
Once you've installed the Jekyll gem and other deps, you can use npm to
build and run the application:

```
gem install bundler
bundle install
jekyll serve
```

[Go go go!](http://localhost:4000/wri-guidelines)

## Jekyll

### Adding new pages

In development, and on Github Pages, requests are rewritten to `.html`
files as necessary. For example, `/countries --> /countries.html`. So,
creating a new page is easy: just add a new HTML file! Jekyll will
handle compilation, and the middleware will handle rewriting.


Github Pages handles all the building, etc. for you. [Check it
out!](http://vizzuality.github.io/wri-guidelines)


# WRI guidelines
This repository is the WRI guidelines project

## Getting set up

The dashboard is powered by
[Jekyll](https://upload.wikimedia.org/wikipedia/commons/7/78/Dr_Jekyll_and_Mr_Hyde_poster_edit2.jpg).
Once you've installed the Jekyll gem and other deps, you can use npm to
build and run the application:

```
gem install bundler
bundle install
jekyll serve
```

[Go go go!](http://localhost:4000/wri-guidelines)

## Jekyll

### Adding new pages

In development, and on Github Pages, requests are rewritten to `.html`
files as necessary. For example, `/countries --> /countries.html`. So,
creating a new page is easy: just add a new HTML file! Jekyll will
handle compilation, and the middleware will handle rewriting.


Github Pages handles all the building, etc. for you. [Check it
out!](http://vizzuality.github.io/wri-guidelines)


28 changes: 14 additions & 14 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
title: WRI Style Guidelines
logoText: world resources institute
email: [email protected]
description: WRI Style Guidelines
baseurl: /wri-guidelines # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site, e.g. http://example.com

# settings
markdown: kramdown
gems:
- jekyll-feed
exclude:
- Gemfile
- Gemfile.lock
title: WRI Style Guidelines
logoText: world resources institute
email: [email protected]
description: WRI Style Guidelines
baseurl: /wri # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site, e.g. http://example.com

# settings
markdown: kramdown
gems:
- jekyll-feed
exclude:
- Gemfile
- Gemfile.lock
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="viewport" content="width=1025">
<meta name="MobileOptimized" content="1025">
<title>{{ site.title }}</title>
<link href="https://fonts.googleapis.com/css?family=Fira+Sans" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Fira+Sans:400,700" rel="stylesheet">
<link rel="stylesheet" href="{{ site.baseurl }}/assets/main.css">
<script src="{{ site.baseurl }}/assets/main.js" defer></script>
</head>
2 changes: 1 addition & 1 deletion _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<div class="header-holder">
<span class="menu-toggle"></span>
<h1 class="title">{{ site.title }}</h1>
<a class="logo" href="{{ site.baseurl }}/">{{ site.logoText }}</a>
<div class="logo"><a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/images/logo.svg" alt="{{ site.logoText }}"></a></div>
</div>
</header>
4 changes: 2 additions & 2 deletions _includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
{% assign length = items | size %}
<li>
<a class="{% if items.first.title == page.title %}active{% endif %}"
href="{{ site.baseurl }}{{ items.first.url }}">{{ items.first.title }}{% if length > 1 %}<span class="opener"></span>{% endif %}</a>
href="{{ site.baseurl }}{{ items.first.url }}">{{ items.first.title }}</a>
{% for drop in drops %}
{% if drop.size > 1 %}
<ul class="drop">
<li class="first">
<a class="{% if drop.items.first.title == page.title %}active{% endif %}"
href="{{ site.baseurl }}{{ drop.items.first.url }}">{{ drop.items.first.title }}<span class="opener"></span></a>
href="{{ site.baseurl }}{{ drop.items.first.url }}">{{ drop.items.first.title }}</a>
<ul class="sub-drop">
{% for item in drop.items %}
{% if forloop.index > 1 %}
Expand Down
70 changes: 35 additions & 35 deletions _sass/common/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -93,29 +93,29 @@ li {
* Headings
*/
h1, h2, h3, h4, h5, h6 {
font-weight: $base-font-weight;
font-weight: 700;
color: #333;
line-height: 1.2;
line-height: 1.1;
}


h1 {
font-size: 32px;
line-height: 1.2;
margin: 0 0 14px;
margin: 0 0 20px;
}

p+h1 {
padding-top: 60px;
}

p+h2 {
padding-top: 34px;
padding-top: 32px;
}

h2 {
font-size: 24px;
margin: 0 0 4px;
margin: 0 0 10px;
}

h2+p {
Expand Down Expand Up @@ -166,40 +166,40 @@ a {
*/
blockquote {
color: #4a4a4a;
font-size: 22px;
line-height: 1.45;
font-weight: 400;
font-size: 22px;
line-height: 1.45;
font-weight: 300;
letter-spacing: -1px;
padding: 20px 0 44px 15%;
padding: 20px 0 44px 15%;
> :last-child {
margin-bottom: 0;
}
p {
&:first-child {
position: relative;
&:before{
content: '"';
color: #edac2b;
font-size: 37px;
font-weight: 400;
position: absolute;
left: -20px;
transform: rotate(4deg);
top: 2px;
}
}
margin: 0;
}
cite {
font-style: normal;
display: block;
text-align: right;
font-size: 16px;
line-height: 1.37;
strong {
display: block;
font-weight: 400;
}
p {
margin: 0;
&:first-child {
position: relative;
&:before {
content: '"';
color: #edac2b;
font-size: 37px;
font-weight: 400;
position: absolute;
left: -20px;
transform: rotate(4deg);
top: 2px;
}
}
}
cite {
font-style: normal;
display: block;
text-align: right;
font-size: 16px;
line-height: 1.37;
strong {
display: block;
font-weight: 700;
}
}
}

Expand Down
19 changes: 12 additions & 7 deletions _sass/common/_default-elements.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.paging{
@extend %clearfix;
line-height: 1.2;
font: 700 16px/1.2 $secondary-font-family;
&.top{
border-bottom: solid 1px #edac2b;
margin: 0 0 44px;
margin: 0 0 37px;
padding: 0 0 4px;
}
&.bottom{
Expand All @@ -20,22 +20,22 @@
font-size: 16px;
&.prev-link {
float: left;
padding: 0 0 0 11px;
padding: 0 0 0 13px;
&:before {
border-width: 0 0 2px 2px;
left: 0;
}
}
&.next-link {
padding: 0 11px 0 0;
padding: 0 13px 0 0;
float: right;
&:before {
right: 0;
border-width: 2px 2px 0 0;
}
}
&:before {
top: 5px;
top: 7px;
content: '';
transform: rotate(45deg);
height: 7px;
Expand All @@ -58,6 +58,7 @@
border-radius: 5px;
display: inline-block;
min-width: 150px;
font-weight: 700;
text-align: center;
vertical-align: top;
padding: 0 40px;
Expand All @@ -81,12 +82,12 @@ a.button {

.ttl-line {
font-size: 12px;
font-weight: 400;
font-weight: 700;
color: #333;
line-height: 1.7;
letter-spacing: normal;
display: block;
padding: 5px 0 0;
padding: 0 0 4px;
margin: 0 0 14px;
border-bottom: 1px solid #eead2a;
font-family: $base-font-family;
Expand All @@ -100,14 +101,17 @@ a.button {
h1 {
font-size: 30px;
margin: 0 0 34px;
font-weight: 300;
}
h2 {
font-size: 23px;
margin: 0 0 36px;
font-family: 'AcuminProCond';
}
h3 {
font-size: 22px;
margin: 0 0 32px;
font-weight: 400;
}
p {
margin: 0 0 33px;
Expand Down Expand Up @@ -151,6 +155,7 @@ a.button {
border: 1px solid #4a4a4a;
border-radius: 3px;
min-width: 170px;
font-weight: 700;
padding: 13px 20px 13px;

}
Expand Down
Loading

0 comments on commit 786fe6f

Please sign in to comment.