Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/TheFearlessMagicians/Woof
Browse files Browse the repository at this point in the history 
* 'master' of https://github.com/TheFearlessMagicians/Woof:
  minor updates
  Changed slideshow animation speed
  asf
  • Loading branch information
@willyspinner
willyspinner committed Feb 4, 2018
2 parents 023c9f8 + cae3231 commit 8e79f10
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 56 deletions.
14 changes: 6 additions & 8 deletions public/stylesheets/Awoof.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ div .form-group {
width: 100%;
height: 100%;

animation: imageAnimation 15s linear infinite;
animation: imageAnimation 8s linear infinite;

opacity: 0;
background-repeat: no-repeat;
Expand All @@ -58,19 +58,19 @@ div .form-group {
}

.slideshow li:nth-child(2) {
animation-delay: 1.5s;
animation-delay: 2.0s;

background-image: url(https://images.unsplash.com/photo-1510020553968-30f966e1ec9e?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=74431fa8893bb465f3c8a637624c112a&auto=format&fit=crop&w=2767&q=80);
}

.slideshow li:nth-child(3) {
animation-delay: 3.5s;
animation-delay: 4.0s;

background-image: url(https://images.unsplash.com/photo-1501538383113-ff3d1c43ed54?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b52665e4c5c7db8028889302606c04b4&auto=format&fit=crop&w=1950&q=80);
}

.slideshow li:nth-child(4) {
animation-delay: 5.5s;
animation-delay: 6.0s;

background-image: url(https://images.unsplash.com/photo-1511105255968-ef36734a1784?ixlib=rb-0.3.5&ixid=eyJhcHBfaWQiOjEyMDd9&s=b437f3be75763ba883d23fe7846d189e&auto=format&fit=crop&w=1950&q=80);
}
Expand Down Expand Up @@ -208,7 +208,7 @@ textarea {
#loading-content {
margin-top: 100px;
margin-left: 270px;
<<<<<<< HEAD


}

Expand All @@ -233,6 +233,4 @@ textarea {



=======
}
>>>>>>> 2c91ef3e5f486d2b6d444981b9f39622d9e82ea5

60 changes: 15 additions & 45 deletions views/dogsPage.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,19 @@
<% include ./partials/header.ejs %>
<body class="index-page">
<!-- Navbar -->
<nav class="navbar navbar-fixed-top btn-blue">
<div class="container">

</div>
</nav>

<!-- End Navbar -->

<div class="wrapper">
<div class="header header-filter" style="background-image: url('https://i.imgsafe.org/dcc803a4b5.jpg');">
<div class="container">
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="card card-header">
<img src="http://demos.creative-tim.com/material-kit/assets/img/avatar.jpg" alt="Circle Image" class="avatar img-circle img-responsive img-raised">
<a href="#"><button class="badge btn btn-fab btn-fab-mini btn-round btn-blue"><i class="material-icons">person_add</i></button></a>
<h1>NAME HERE</h1>
<h3>JOB TITLE/INFO</h3>

<div class="row cardindent">

<div class="col-xs-6 col-md-6">
<!--<b>743</b> following-->Irvine, California
</div>
<div class="col-xs-6 col-md-6">
<b>345</b> followers
</div>
</div>

<div class="progress progress-line-primary user-rating">
<div class="progress-bar progress-bar-success" style="width: 65%">
<span class="sr-only">65% Complete (success)</span>
</div>
<div class="progress-bar progress-bar-danger" style="width: 35%">
<span class="sr-only">35% Complete (danger)</span>
</div>
</div>

</div>
</div>
</div>
</div>
</div>


<div class="card hovercard">
<div class="card-background">
<img class="card-bkimg" alt="" src="">
</div>
<div class="useravatar text-center img-circle">
<img alt="" src="../public/Dogs/samoyed-puppy.jpg">
</div>
<div class="card-info"> <span class="card-title"><%= dog.name %></span>

</div>
</div>



<div class="main main-raised">
<div class="section section-basic">
Expand Down
10 changes: 7 additions & 3 deletions views/userPage.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

<% include partials/header.ejs %>
<% include ./partials/header.ejs %>


<div class="wrapper">
Expand All @@ -10,6 +10,7 @@
<div class="card card-header">
<img src="https://scontent-lax3-1.xx.fbcdn.net/v/t1.0-1/c0.24.320.320/p320x320/15442379_1191275360949377_4114530872150356823_n.jpg?oh=315fd068a7c47744a80601bbb9563a69&oe=5B1E86D9" alt="Circle Image" class="avatar img-circle img-responsive img-raised">
<h1><%=user.name%></h1>
<h2><%=user.nickname %></h2>
</div>
</div>
</div>
Expand All @@ -22,14 +23,16 @@
<div class="container">
<div class="row">
<div class="col-md-9">
<% if(user.dogs.length>0) {%>
<h2>Proud Owners Of</h2>
<div class="flexcontainer">
<%user.dogs.forEach(function(dog) {%>
<div class="col-md-3 thumbnail">
<img class="img-rounded img-responsive img-raised" src="../public/Dogs/5.jpg">
<a href="#"><button class="like btn btn-fab btn-fab-mini btn-round btn-blue"><i class="material-icons">Click here to view more <%=dog.name%></i></button></a>
<a href="<%=dog.url%>"><button class="like btn btn-fab btn-fab-mini btn-round btn-blue"> <i class="material-icons">Click here to view more <%=dog.name%></i></button></a>
</div>
<%});%>
<%}%>
<!--
<div class="col-md-3 thumbnail">
<img class="img-rounded img-responsive img-raised" src="../public/Dogs/Chow_Chow.jpeg">
Expand Down Expand Up @@ -113,7 +116,7 @@
$('a#sendMessage').on('click',function(){
let id = $('input#nameContainer').val();//TODO GET THE OWNERS ID HERE.
$.post(`/expressinterest/${id}`,{'id':id,'message':$('textarea#messageContainer').val()});
})
});
</script>
</div>
</form>
Expand All @@ -131,3 +134,4 @@
</div>

<script src="http://demos.creative-tim.com/material-kit/assets/js/nouislider.min.js" type="text/javascript"></script>
<% include ./partials/footer.ejs %>

0 comments on commit 8e79f10

Please sign in to comment.