redy for deploy

2020-05-10 04:59:27 +03:00
parent 95ff7ff8cf
commit 3ccde3705e
6 changed files with 64 additions and 30 deletions
--- a/app.py
+++ b/app.py
@@ -7,6 +7,7 @@ app.config.from_object(app_config)


@app.route('/')
+@app.route('/index.html')
 def index():
 	return render_template('index.html')

--- a/static/css/nopage.css
+++ b/static/css/nopage.css
@@ -1,25 +1,32 @@
-.body, html{
-	margin: 0;
-	padding: 0;
+body, html{
 	background: url(../img/noback.jpg);
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: cover;
-	height: 100%;
+	font-family: sans-serif;
+    line-height: 1.15;
+    -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+    -ms-overflow-style: scrollbar;
+    -webkit-tap-highlight-color: transparent;

 }

-.yesimg{
-	width: 500px;
-  padding: 40px;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  -webkit-transform: translate(-50%, -50%);
-          transform: translate(-50%, -50%);
+
+.h1, h1 {
+    font-size: 30pt;
+    color: #cc0000;
+    font-family: 'Pattaya', sans-serif;
+	text-align: center;
 }

-.yesimg h1{
+
+container-fluid{
+	min-width: 500px;
+}
+
+div.row{
+	justify-content:center;
+}
+
+div.row h1{
 	padding: 0;
 	border: 0;
 	font-family: 'Pattaya', sans-serif;
@@ -27,5 +34,19 @@
 	font-size: 50pt;
 	text-align: center;
 	border-radius: 100px;
+	margin-top: 5vh;
 }

+
+img{
+	max-width: 400px;
+	height: auto;
+	margin-top: 10vh;
+
+}
+
+#backbtn{
+	background-color: 	#fe5f55;
+	text-transform: uppercase;
+	border: #fe5f55;
+}
--- a/static/css/yespage.css
+++ b/static/css/yespage.css
@@ -1,16 +1,11 @@
-html{
-	min-width: 488px;
-}
-
-body{
+body, html{
 	margin: 0;
 	padding: 0;
 	background: url(../img/yesback.jpg);
-	background-position: center;
-	background-repeat: no-repeat;
-	background-size: cover;
 	height: 100vh;

+
+	
 }

 container-fluid{
@@ -47,3 +42,9 @@ img{
 	height: auto;
 	margin-top: 10vh;
 }
+
+#backbtn{
+	background-color: 	#fe5f55;
+	text-transform: uppercase;
+	border: #fe5f55;
+}
--- a/static/img/bear.jpg
+++ b/static/img/bear.jpg
--- a/templates/nopage.html
+++ b/templates/nopage.html
@@ -2,15 +2,23 @@
 <meta charset="UTF-8">
 <html lang="ru">
 <head>
-	<link rel="stylesheet" href="css/nopage.css">
+	<link rel="stylesheet" href="{{ url_for('static', filename='css/nopage.css')}}">
 	<link href="https://fonts.googleapis.com/css?family=Pattaya&display=swap" rel="stylesheet">
+	{%include 'bootstrap.html'%}
 	<title>Жаль</title>

 </head>
 <body>
-	<div class="yesimg">
+	<div class="container-fluid">
+		<div class="row">
+			<img  src="{{url_for('static', filename='img/bear.jpg')}}">
+		</div> 
+		<div class="row">
 				<h1>Жаль, я ждал свою Котю.</h1>
 		</div>
+		<div class="row">
+			<button class="btn btn-primary" id="backbtn" onClick="window.location.href='{{ url_for( 'index' ) }}';">На главную</button>	
+		</div>
+	</div>
 </body>
-
 </html>
--- a/templates/yespage.html
+++ b/templates/yespage.html
@@ -20,6 +20,9 @@
 		<div class="row">
 			<h2>Мы вместе {{days}} дней </h>	
 		</div>
+		<div class="row">
+			<button class="btn btn-primary" id="backbtn" onClick="window.location.href='{{ url_for( 'index' ) }}';">На главную</button>	
+		</div>
 	</div>
 </body>