Skip to content

Commit

Permalink
fixed #50 (menu margins)
Browse files Browse the repository at this point in the history
  • Loading branch information
@benjaminleichter
benjaminleichter committed May 8, 2014
1 parent 7703424 commit c5570f1
Show file tree
Hide file tree
Showing 9 changed files with 115 additions and 113 deletions.
9 changes: 3 additions & 6 deletions html/about/data.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<p>The Atlas online provides access to bilateral trade data for roughly 200 countries spanning 50 years and across 1000 different products, using the Standardized International Trade Code at the four-digit level (SITC-4) revision 2 classification. The Atlas online also provides world trade data in the Harmonized System Classification (HS4) maintained by the Centre d’Etudes Prospectives et d’Informations Internationales (CEPII) dating back to 1995. The sources of the data used are:</p>

Expand All @@ -50,9 +50,8 @@
<li>2001 – 2012: UN COMTRADE</li>
</ul>

<p><b>All the information related to data processing are now available on GitHub:</b></p>
<p><b>All the information related to data processing are now available on our <a href="https://github.com/cid-harvard/atlas-data">GitHub</a>.</b><p>

<p style="text-align:center"><a href="https://github.com/cid-harvard/atlas-data">https://github.com/cid-harvard/atlas-data</a></p>.

<a name="notes"></a>
<h3>Notes</h3>
Expand All @@ -71,11 +70,9 @@ <h3>Re-using and Contributing</h3>
<p>The Atlas online is published under a <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License">Creative Commons Attribution-Sharealike 3.0 Unported License</a>, so feel free to share the site and embed the apps anywhere on the Internet. When doing so, please remember to attribute the site and its <a href="about/#team">creators</a>.</p>


<p>As an open source platform, The Atlas online welcomes any and all collaborators to the project. We also provide an <a href="about/api/">API</a> for the casual user interested in embedding their own Atlas app on any webpage. If interested, fork the site at:</p>
<p>As an open source platform, The Atlas online welcomes any and all collaborators to the project. We also provide an <a href="about/api/">API</a> for the casual user interested in embedding their own Atlas app on any webpage. If interested, fork the site <a href="github.com/cid-harvard/atlas-economic-complexity">here</a>.</p>


<p style="text-align:center"><a href="github.com/cid-harvard/atlas-economic-complexity">http://github.com/Harvard-CID/observatory_economic_complexity/</a></p>

When referring to the site in publications, please cite the following reference:

<blockquote>"The Atlas of Economic Complexity," Center for International Development at Harvard University, http://www.atlas.cid.harvard.edu</blockquote>
Expand Down
2 changes: 1 addition & 1 deletion html/about/glossary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
</style>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

{% include "about/glossary_text.html" %}

Expand Down
6 changes: 3 additions & 3 deletions html/about/glossary_text.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<br>
<dl class="dl-horizontal">
<a name="capabilitydistance"></a>
<dt>Capability Distance:</dt>
<dd>A measure of a country’s ability to make a specific product determined by what it can currently produce. For every pair of goods in the world there is a notion of distance between them: if 2 goods require highly similar inputs and endowments, then they are ‘closer’ together, but if they require totally different capabilities, they are ‘further’ apart. </dd>
<dd>We calculate capability distance by the proportion of knowledge necessary for a product that the country does not have. The knowledge that the country does have is measured by the proximity between products it is currently making and the product of interest P. The knowledge it does not have is measured by the proximity between products it is not making and the product of interest P. Capability distance is therefore calculated as the sum of the proximities between good P and all the products that country C is not currently exporting, normalized by the sum of proximities between all products and product P. Formally, </dd>
<dt style="clear:none;">Capability Distance:</dt>
<dd>A measure of a country’s ability to make a specific product determined by what it can currently produce. For every pair of goods in the world there is a notion of distance between them: if 2 goods require highly similar inputs and endowments, then they are ‘closer’ together, but if they require totally different capabilities, they are ‘further’ apart.
We calculate capability distance by the proportion of knowledge necessary for a product that the country does not have. The knowledge that the country does have is measured by the proximity between products it is currently making and the product of interest P. The knowledge it does not have is measured by the proximity between products it is not making and the product of interest P. Capability distance is therefore calculated as the sum of the proximities between good P and all the products that country C is not currently exporting, normalized by the sum of proximities between all products and product P. Formally, </dd>

\begin{equation}\label{Distance}
d_{cp} = \frac{\sum\nolimits_{p'}\left(1 - M_{cp'}\right)\Phi_{p,p'}}{\sum\nolimits_{p'}\Phi_{p,p'}}
Expand Down
188 changes: 91 additions & 97 deletions html/about/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,98 @@

{% block page_title %}About{% endblock %}
{% block heading_title %}About{% endblock %}

{% block css %}{% endblock %}

{% block content %}
<style>
body{
background-color: rgb(250, 250, 250);
}
ol.slats {
list-style: none;
}
ol.slats li {
margin: 0 0 10px 0;
padding: 0 0 10px 0;
border-bottom: 1px solid #eee;
}
ol.slats li:last-child {
margin: 0;
padding: 0;
border-bottom: none;
}
ol.slats li a {
text-decoration: none;
}
ol.slats li a h3 {
font-size: 18px;
font-weight: bold;
line-height: 1.1;
margin: 0 0 8px 0;
}
ol.slats li a img {
float: left;
margin: 0 10px 0 0;
padding: 4px;
border: 1px solid #eee;
}
ol.slats li a:hover img {
background: #eee;
}
ol.slats li a p {
margin: 0 0 0 110px;
font-size: 14px;
line-height: 1.4;
color: #555;
min-height: 75px;
}
ol.slats li a p span.meta {
display: block;
font-size: 12px;
color: #999;
}
@media screen and (max-width: 700px) {
ol.slats li a img {
display: block;
float: none;
margin: 0 0 5px 0;
}
ol.slats li a p {
margin: 0;
}
}
ol.v_slats {
list-style: none;
}
ol.v_slats li {
display: inline-block;
height: 150px;
margin: 0 15px 15px 0;
padding: 10px;
border: 1px solid #eee;
vertical-align: top;
width: 100px;
}
ol.v_slats li a {
text-decoration: none;
}
ol.v_slats li a h3 {
font-size: 16px;
line-height: 1.1;
margin: 0 0 8px 0;
}
.group img {
width:100px;
max-height:150px;
overflow: hidden;
}
.group {
height: 150px;
}
#sticky{
width: 265px;
}
</style>
<!-- the left pane -->

<div id="sticky-anchor"></div>
Expand All @@ -32,101 +120,7 @@
</div>
</div>

<style>
body{
background-color: rgb(250, 250, 250);
}
ol.slats {
list-style: none;
}
ol.slats li {
margin: 0 0 10px 0;
padding: 0 0 10px 0;
border-bottom: 1px solid #eee;
}
ol.slats li:last-child {
margin: 0;
padding: 0;
border-bottom: none;
}
ol.slats li a {
text-decoration: none;
}
ol.slats li a h3 {
font-size: 18px;
font-weight: bold;
line-height: 1.1;
margin: 0 0 8px 0;
}
ol.slats li a img {
float: left;
margin: 0 10px 0 0;
padding: 4px;
border: 1px solid #eee;
}
ol.slats li a:hover img {
background: #eee;
}
ol.slats li a p {
margin: 0 0 0 110px;
font-size: 14px;
line-height: 1.4;
color: #555;
min-height: 75px;
}
ol.slats li a p span.meta {
display: block;
font-size: 12px;
color: #999;
}
@media screen and (max-width: 700px) {
ol.slats li a img {
display: block;
float: none;
margin: 0 0 5px 0;
}
ol.slats li a p {
margin: 0;
}
}

ol.v_slats {
list-style: none;
}
ol.v_slats li {
display: inline-block;
height: 150px;
margin: 0 15px 15px 0;
padding: 10px;
border: 1px solid #eee;
vertical-align: top;
width: 100px;
}
ol.v_slats li a {
text-decoration: none;
}
ol.v_slats li a h3 {
font-size: 16px;
line-height: 1.1;
margin: 0 0 8px 0;
}

.group img {
width:100px;
max-height:150px;
overflow: hidden;
}

.group {
height: 150px;
}
#sticky{
width: 265px;
}
</style>


<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<h3>What is it?</h3>

Expand Down Expand Up @@ -320,7 +314,7 @@ <h3>Press</h3>



Activates Tooptips
<!-- Activates Tooptips -->

<script type="text/javascript" src="../media/js/explore/tooltips.js"></script>
<script type="text/javascript" src="../media/js/libs/tipsy/tipsy.jquery.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion html/about/permissions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</nav>
</div>

<div id="content">
<div id="aboutContent">
<div class="app_title" id="title"><h2>Permissions</h2></div>
<br><br><br><br>
<p>The observatory is published under a <a href="http://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License">Creative Commons Attribution-Sharealike 3.0 Unported License</a> so feel free to share the site and embed the apps anywhere on the internet. When doing so, please remember to attribute the site and its <a href="about/#team">creators</a><p>
Expand Down
2 changes: 1 addition & 1 deletion html/about/privacy.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<h4>Privacy Statement for The Atlas online</h4>

Expand Down
2 changes: 1 addition & 1 deletion html/about/research.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">

<a name="growthlab"></a>
<h3>The Growth Lab</h3>
Expand Down
2 changes: 1 addition & 1 deletion html/about/support.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</div>
</div>

<div id="content" style="float:none; margin-left:291px;">
<div id="aboutContent">
<p>The ongoing development and evolution of The Atlas online is made possible by the Founding Members. The Founding Members are a group of leading institutions that believe in the vision of The Atlas online and provide funding and support instrumental to the development and maintenance of this public good. The Founding Members are provided with training to maximize the utility of The Atlas online within their organizations, and they collaborate with the Center for International Development (CID) by offering feedback on the tool’s functionality.</p>

<p>Our Founding Members include:</p>
Expand Down
15 changes: 13 additions & 2 deletions media/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,9 +583,17 @@ text-decoration: none;

/*
* Center of the page, app canvas
*/
*/
#aboutContent{
float: none;
margin-left: 268px;
background-color: #ffffff;
border: solid 1px #cccccc;
padding:20px;
position: relative;
top:43px;
}
.app #main #content {

float: left;
overflow:hidden;
padding: 0 !important;
Expand Down Expand Up @@ -945,7 +953,10 @@ dl.file_list p {
width: 250px;
vertical-align: top;
}
.atlas_book_content{
overflow: auto;

}
#main #content .atlas_book_content img{
margin: 20px 60px;
}
Expand Down

0 comments on commit c5570f1

Please sign in to comment.