Skip to content

made home and projects page responsive #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nicolasraube wants to merge 4 commits into
base: gh-pages
Choose a base branch
from
Open

made home and projects page responsive #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e6d091
home page responsive
nicolasraube Dec 10, 2017
a486e9b
projects page responsive
nicolasraube Dec 10, 2017
e9a3946
remove margin-top inline style
nicolasraube Dec 10, 2017
615618b
adjust my code indentation
nicolasraube Dec 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 44 additions & 29 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,56 @@
<style>
<style>
.slider {
width: 1024px;
margin: 2em auto;
position: relative;
height: 200px;
}

@media screen and (min-width: 540px) {
.slider {
height: 300px;
}
}
@media screen and (min-width: 768px) {
.slider {
height: 500px;
margin-top: 100px;
}
}
@media screen and (min-width: 992px) {
.slider {
margin-top: 0;
}
}

.slider-wrapper {
width: 100%;
height: 400px;
position: relative;
display: flex;
justify-content: center;
}

.slide {
float: left;
position: absolute;
width: 100%;
height: 100%;
opacity: 0;
transition: opacity 3s linear;
position: absolute;
height: 100%;
}

.slider-wrapper > .slide:first-child {
opacity: 1;
}

#headerwrap {
text-align: -webkit-match-parent !important;
}
</style>

<script>
(function() {

function Slideshow( element ) {
this.el = document.querySelector( element );
this.init();
}

Slideshow.prototype = {
init: function() {
this.wrapper = this.el.querySelector( ".slider-wrapper" );
Expand All @@ -45,14 +60,14 @@
this.index = 0;
this.total = this.slides.length;
this.timer = null;

this.action();
this.stopStart();
this.stopStart();
},
_slideTo: function( slide ) {
var currentSlide = this.slides[slide];
currentSlide.style.opacity = 1;

for( var i = 0; i < this.slides.length; i++ ) {
var slide = this.slides[i];
if( slide !== currentSlide ) {
Expand All @@ -68,32 +83,32 @@
self.index = 0;
}
self._slideTo( self.index );

}, 3000);
},
stopStart: function() {
var self = this;
self.el.addEventListener( "mouseover", function() {
clearInterval( self.timer );
self.timer = null;

}, false);
self.el.addEventListener( "mouseout", function() {
self.action();

}, false);
}


};

document.addEventListener( "DOMContentLoaded", function() {

var slider = new Slideshow( "#main-slider" );

});


})();

</script>
Expand All @@ -109,7 +124,7 @@
<img src="/ASSET/assets/img/elephants_cover5.png" alt="Four" class="slide" />
<img src="/ASSET/assets/img/elephants_cover6.png" alt="Five" class="slide" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
91 changes: 38 additions & 53 deletions _includes/projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
border: 1px solid #e3e3e3;
padding: 10px;
}

.card-view{
padding-bottom: 10px;
padding-top: 10px;
}

/* Style the tab */
div.tab {
overflow: hidden;
Expand Down Expand Up @@ -47,58 +47,43 @@
.active {
display: block;
}

.slider {
width: 1024px;
margin: 2em auto;
position: relative;
height: 200px;
}

@media screen and (min-width: 540px) {
.slider {
height: 300px;
}
}
@media screen and (min-width: 768px) {
.slider {
height: 500px;
}
}

.slider-wrapper {
width: 100%;
height: 400px;
position: relative;
display: flex;
justify-content: center;
}

.slide {
float: left;
position: absolute;
width: 100%;
height: 100%;
opacity: 0;
transition: opacity 3s linear;
position: absolute;
height: 100%;
}

.slider-wrapper > .slide:first-child {
opacity: 1;
}

#headerwrap {
text-align: -webkit-match-parent !important;
}

.slider2 {
width: 1024px;
margin: 2em auto;
}

.slider-wrapper2 {
width: 100%;
height: 400px;
position: relative;
}

.slide2 {
float: left;
position: absolute;
width: 100%;
height: 100%;
opacity: 0;
transition: opacity 3s linear;
}

.slider-wrapper2 > .slide2:first-child {
opacity: 1;
}
</style>

<script>
Expand All @@ -122,7 +107,7 @@
document.getElementById(cityName).style.display = "block";
evt.currentTarget.className += " active";
}

(function() {

function Slideshow( element ) {
Expand All @@ -141,7 +126,7 @@
this.timer = null;

this.action();
this.stopStart();
this.stopStart();
},
_slideTo: function( slide ) {
var currentSlide = this.slides[slide];
Expand Down Expand Up @@ -186,9 +171,9 @@
var slider = new Slideshow( "#main-slider" );

});

})();

(function() {

function Slideshow2( element ) {
Expand All @@ -207,7 +192,7 @@
this.timer = null;

this.action();
this.stopStart();
this.stopStart();
},
_slideTo: function( slide ) {
var currentSlide = this.slides[slide];
Expand Down Expand Up @@ -277,7 +262,7 @@
<img src="/ASSET/assets/img/elephants_cover5.png" alt="Four" class="slide" />
<img src="/ASSET/assets/img/elephants_cover6.png" alt="Five" class="slide" />
</div>
</div>
</div>
</div>
</div>

Expand All @@ -288,15 +273,15 @@
</div>
</div>
<div class="row">
<div class="slider2" id="main-slider2"><!-- outermost container element -->
<div class="slider-wrapper2"><!-- innermost wrapper element -->
<img src="/ASSET/assets/img/elephants_cover1.png" alt="First1" class="slide2" /><!-- slides -->
<img src="/ASSET/assets/img/elephants_cover11.png" alt="Second1" class="slide2" />
<img src="/ASSET/assets/img/elephants_cover16.png" alt="Third1" class="slide2" />
<img src="/ASSET/assets/img/elephants_cover8.png" alt="Four1" class="slide2" />
<img src="/ASSET/assets/img/elephants_cover2.png" alt="Five1" class="slide2" />
<div class="slider" id="main-slider2"><!-- outermost container element -->
<div class="slider-wrapper"><!-- innermost wrapper element -->
<img src="/ASSET/assets/img/elephants_cover1.png" alt="First1" class="slide" /><!-- slides -->
<img src="/ASSET/assets/img/elephants_cover11.png" alt="Second1" class="slide" />
<img src="/ASSET/assets/img/elephants_cover16.png" alt="Third1" class="slide" />
<img src="/ASSET/assets/img/elephants_cover8.png" alt="Four1" class="slide" />
<img src="/ASSET/assets/img/elephants_cover2.png" alt="Five1" class="slide" />
</div>
</div>
</div>
</div>
</div>
</div>
Expand All @@ -323,4 +308,4 @@ <h3>{{project.title}}</h3>
{% endif %}
{% endfor %}
</div>
</div>-->
</div>-->
6 changes: 3 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- single03.jpg
---

<div id="service" style="margin-top:50px">
<div id="service">
<div class="container">
<div class="row">
<div class="col-lg-8" style="text-align:justify">
Expand All @@ -17,7 +17,7 @@
<p>Examples observed in Sri Lanka include elephants toppling trees on the electric fences to make them ineffective and digging up and destroying US Army surplus miniature seismic systems installed to detect crop-raiding elephants. Therefore, an adaptive approach is required that is based on multiple methods to detect elephants and that could randomly vary the actuation and this way prevent that the elephants get used to the system.</p>

<p>As an alternative strategy for electric fences and other fix detection systems we propose the use of an Adaptive Sensor Actuator System for Elephant Tracking (ASSET) for elephant detection and early warnings. The system will exploit the recent advances in flying robotic (quadcopter) and wireless sensor network (WSN) technology, which enables monitoring of the environment at low cost. The quadcopter chosen for this project is a Parrot Ar Drone 2.0 from Apple. It will be equipped identify the elephants.</p><br>
</div>
</div>
<div class="col-lg-4">
<h4>Recent News</h4>
<div class="hline"></div>
Expand All @@ -30,7 +30,7 @@ <h4>Recent News</h4>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
</div>