Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

replaced modal, /end goes to the frontpage.

  • Loading branch information
hako committed Aug 29, 2015
1 parent 7afb977 commit 8bbf5da715a42fd611dc4005aa3d18e4f9e1f5f0
Showing with 16 additions and 43 deletions.
  1. +4 −0 app.js
  2. +2 −1 bower.json
  3. +7 −41 public/css/app/1.css
  4. +1 −1 public/js/app/1.js
  5. +2 −0 views/1.html
4 app.js
@@ -160,6 +160,10 @@ app.get('/nope', function(req, res, next) {
}
});

app.get('/end', function(req, res) {
res.redirect("/")
})

// App
app.get('/app', function(req, res) {
if(isMobile(req) == true){
@@ -21,6 +21,7 @@
"icomoon": "~0.0.3",
"bootstrap": "~3.3.5",
"howler": "~1.1.26",
"normalize.css": "~3.0.3"
"normalize.css": "~3.0.3",
"sweetalert": "~1.1.0"
}
}
@@ -18,41 +18,6 @@ a:hover {
color: #E34C26;
}

html,
body {
/* The html and body elements cannot have any padding or margin. */
}
/* Wrapper for page content to push down footer */

#wrap {
min-height: 100%;
height: auto !important;
height: 100%;
/* Negative indent footer by it's height */

margin: 0 auto -60px;
}
/* Set the fixed height of the footer here */

#push,
#footer {
height: 60px;
}

#footer {
background-color: #f5f5f5;
}
/* Lastly, apply responsive CSS fixes as necessary */

@media (max-width: 767px) {
#footer {
margin-left: -20px;
margin-right: -20px;
padding-left: 20px;
padding-right: 20px;
}
}

.Googol {
font-family: 'Conv_Catull';
text-align: center;
@@ -121,13 +86,14 @@ h1 {

h3 {
font-family: 'Averia Sans Libre', cursive;
font-size: 60px;
font-size: 40px;
color: #2e3436;
-webkit-transform: translate(0px, -66px) rotate(12deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
-moz-transform: translate(0px, -66px) rotate(12deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
-o-transform: translate(0px, -66px) rotate(12deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
-ms-transform: translate(0px, -66px) rotate(12deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
transform: translate(0px, -66px) rotate(12deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);

-webkit-transform: translate(0px, -66px) rotate(5.8deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
-moz-transform: translate(0px, -66px) rotate(5.8deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
-o-transform: translate(0px, -66px) rotate(5.8deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
-ms-transform: translate(0px, -66px) rotate(5.8deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
transform: translate(0px, -66px) rotate(5.8deg) rotateX(12deg) skew(0deg, 0deg) scale(0.7, 0.7);
}

.Download {
@@ -27,7 +27,7 @@ function next() {
}
})
} else {
alert('Please agree with the terms & conditions to continue.')
sweetAlert({title:"Error", text:"Please agree with the terms & conditions to continue.", confirmButtonColor:"#FC2D1E"});
}
}

@@ -1,11 +1,13 @@
{% extends 'app_layout.html' %}
{% block custom_css %}
<link href="css/app/1.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="components/sweetalert/dist/sweetalert.css">
{% endblock %}
{% block custom_js %}
<script src="js/app/1.js" type="text/javascript" charset="utf-8"></script>
<script src="components/jquery/dist/jquery.min.js" type="text/javascript" charset="utf-8"></script>
<script src="components/bootstrap/dist/js/bootstrap.min.js" type="text/javascript" charset="utf-8"></script>
<script src="components/sweetalert/dist/sweetalert.min.js"></script>
{% endblock %}
{% block content %}
<center>

0 comments on commit 8bbf5da

Please sign in to comment.
You can’t perform that action at this time.