Skip to content

Commit

Permalink
Merge branch 'issue#118' into 'master'
Browse files Browse the repository at this point in the history 
fixed issue OiWorld#118

See merge request !129
  • Loading branch information
@heychirag
heychirag committed Mar 2, 2017
2 parents 808582a + 3d47dc7 commit 202128b
Show file tree
Hide file tree
Showing 10 changed files with 3,503 additions and 607 deletions.
211 changes: 145 additions & 66 deletions Source/Core/pages/css/knowMore.css
View file

Large diffs are not rendered by default.

685 changes: 675 additions & 10 deletions Source/Core/pages/font-awesome/css/font-awesome.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Source/Core/pages/font-awesome/css/font-awesome.min.css
View file

Large diffs are not rendered by default.

Binary file modified Source/Core/pages/font-awesome/fonts/FontAwesome.otf
View file
Binary file not shown.
Binary file modified Source/Core/pages/font-awesome/fonts/fontawesome-webfont.eot
View file
Binary file not shown.
3,185 changes: 2,668 additions & 517 deletions Source/Core/pages/font-awesome/fonts/fontawesome-webfont.svg
View file
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 Source/Core/pages/font-awesome/fonts/fontawesome-webfont.ttf
View file
Binary file not shown.
Binary file modified Source/Core/pages/font-awesome/fonts/fontawesome-webfont.woff
View file
Binary file not shown.
Binary file added Source/Core/pages/font-awesome/fonts/fontawesome-webfont.woff2
View file
Binary file not shown.
25 changes: 13 additions & 12 deletions Source/Core/pages/knowMore.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Bootstrap Core CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet">

<!-- Bootstrap Core CSS -->
<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet prefetch">

Expand All @@ -21,13 +21,14 @@
<body id="page-top" class="index">

<!-- tile Grid Section -->
<section id="tile" class="bg-light-gray">
<section id="tile" class="">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Learn More about Carbon Footprint</h2>
</div>
</div>
<hr>
<div class="row">
<div class="col-md-4 col-sm-6 tile-item">
<a href="#tileModal1" class="tile-link" data-toggle="modal">
Expand Down Expand Up @@ -317,7 +318,7 @@ <h4>Sponsors:</h4>
<a href='http://www.iue.tuwien.ac.at/cse/index.php/gsoc.html' target="_blank">Computer Science and Engineering @ TU-Wien</a> - The umbrella organization for open source projects of the Vienna University of Technology has made it possible for our project to participate in Google's Summer of Code program and has supported our project throughout the program and beyond.
</p>
</div>
<div class="text-left">
<div class="text-left">
<h4>Credits:</h4>
Tile Images: <a href='http://www.freepik.com/' target="_blank">Vectors by Freepik.</a>
</div>
Expand Down Expand Up @@ -345,7 +346,7 @@ <h4>Credits:</h4>
<div class="col-lg-8 col-lg-offset-2">
<div class="modal-body">
<!-- Project Details Go Here -->
<h2>Benefits of Walking and Cycling</h2>
<h2>Benefits of Walking and Cycling</h2>
<p>
<div id="accordionCalories" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
Expand Down Expand Up @@ -380,7 +381,7 @@ <h4 class="panel-title">
<div id="collapseTwoCalories" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwoCalories">
<ul>
<li>Cycling is a pollution-free mode of transport. Bicycles reduce the need to build, service and dispose of cars.</li>
<li>Cycling 10 km each way to work would save about
<li>Cycling 10 km each way to work would save about
1500 kg of greenhouse gas emissions per year.</li>
<li>Cycling reduces traffic and its associated costs.</li>
</ul>
Expand All @@ -401,7 +402,7 @@ <h4 class="panel-title">
<li>Walking or cycling to work will save you a lot of money on fuel.</li>
<li>Bicycle parking is usually free, easily accessible and more convenient than car parking.</li>
<li>Bikes and cycling facilities can extend the catchments of existing public transport services, since many more households are within cycling distance of public transport than within walking distance.</li>
<li>Bicycles offer door-to-door service and, therefore, can be quicker than cars over shorter distances.</li>
<li>Bicycles offer door-to-door service and, therefore, can be quicker than cars over shorter distances.</li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -587,15 +588,15 @@ <h3 class="text-center">More Information</h3>
play a role in climate change and global warming. CO<sub>2</sub> can be removed from the atmosphere by
trees through photosynthesis. In this process, plant cells convert the carbon from
carbon dioxide to carbohydrates, such as glucose and starch, that can be
stored in leaves, fruits, stems, trunks, branches and roots, and contribute to tree growth. Oxygen, upon which animals depend for survival,
stored in leaves, fruits, stems, trunks, branches and roots, and contribute to tree growth. Oxygen, upon which animals depend for survival,
is released back into the atmosphere as a by-product of photosynthesis.<br><br>
<b>The chemical reaction for photosynthesis is:</b><br>
6 CO<sub>2</sub> + 12 H<sub>2</sub>O + photons ➔ C<sub>6</sub>H<sub>1</sub>2O<sub>6</sub> + 6 O<sub>2</sub> + 6 H<sub>2</sub>O
<br><br>
The carbon cycle consists of the various phases through which carbon passes in living things, the soil,
water and atmosphere. When the carbon cycle is in equilibrium, the rate at which carbon
is removed from stores equals the amount being taken out of the atmosphere. The
current concern is that the carbon cycle is considered to be out of balance
current concern is that the carbon cycle is considered to be out of balance
due to human intervention.<br><br>
The burning of fossil fuels high in carbon has disturbed the natural equilibrium and
increased the rate at which carbon is returned to the gas phase. This increase in carbon in the atmosphere, particularly as carbon dioxide and methane, has been found to
Expand Down Expand Up @@ -629,7 +630,7 @@ <h2>Contact Us</h2>
<p>
If you like this extension, please give it a good rating in the <a href="https://chrome.google.com/webstore/detail/carbon-footprint-for-goog/ednfpjleaanokkjcgljbmamhlbkddcgh/reviews" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i> Chrome Web Store</a>.
<br><br>
If you want to report any bug or issue, contact us at:
If you want to report any bug or issue, contact us at:
<a href="mailto:[email protected]" target="_top">
<i class="fa fa-envelope" aria-hidden="true"></i> [email protected]
</a>
Expand All @@ -638,8 +639,8 @@ <h2>Contact Us</h2>
<ul class="list-inline social-buttons">
<li><a href="http://www.facebook.com/pages/Carbon-Footprint-for-Google-Maps/217487891623173" target="_blank"><i class="fa fa-facebook fa-fw"></i></a></li>
<li><a href="https://plus.google.com/b/112973863308036008385/112973863308036008385/posts" target="_blank"><i class="fa fa-google-plus fa-fw"></i></a></li>
<li><a href="https://github.com/OiWorld/CarbonFootprintGoogleMap" target="_blank"><i class="fa fa-github fa-fw"></i></a></li>
<li><a href="https://twitter.com/oiworld" target="_blank"><i class="fa fa-twitter fa-fw"></i></a></li>
<li><a href="https://gitlab.com/aossie/CarbonFootprint" target="_blank"><i class="fa fa-gitlab fa-fw"></i></a></li>
<li><a href="https://twitter.com/oiworld" target="_blank"><i class="fa fa-twitter fa-fw"></i></a></li>
</ul>
</p>
</div>
Expand All @@ -662,4 +663,4 @@ <h2>Contact Us</h2>
<script type="text/javascript" src="js/absorptionCalc.js"></script>

</body>
</html
</html

0 comments on commit 202128b

Please sign in to comment.