Merge branch 'master' of https://github.com/Llloooggg/Jarvis

static/css/components/header.css

@@ -94,7 +94,9 @@
     padding-top: 0px;
     border-radius: 9px;
 }
-
+.red_text{
+    display: none;
+}
 .drop-block {
     z-index: 20;
     border-radius: 10px;
@@ -103,6 +105,7 @@
     position: relative;
     padding: 18px 0;
     background: rgba(86, 84, 84, 0.84);
+
 }
 .drop-block_out {
     padding: 19px 25px;
@@ -122,12 +125,12 @@
 }
 .drop-block p {
     font-family: 'OpenSans';
-    font-weight: 300;
-    font-size: 14px;
-    color : #ffffff;
     margin: 0;
     text-align: center;
     margin-bottom: 8px;
+    color: red;
+    font-weight: bold;
+    font-size: 12px;
 }
 .drop-block b {
     font-family: 'OpenSans';
@@ -217,3 +220,4 @@
 .header_btn_mod {
     margin: 0 40px;
 }
+

static/css/layout/base.css

@@ -41,3 +41,5 @@ body {
   p {
     margin: 0;
   }
+
+

static/js/main.js

@@ -9,3 +9,14 @@ function activeClass() {
         a = 0;
     }
 }
+
+
+
+$(function() {
+    setTimeout(function() {
+         $('#1').show(400);
+    }, 500);
+    setTimeout(function() {
+        $('#1').hide(400);
+    }, 6000);
+  });

templates/index.html

@@ -5,6 +5,7 @@
     <meta content="width=device-width, initial-scale=1.0" name="viewport">
     <meta content="ie=edge" http-equiv="X-UA-Compatible">
     <title>Jarvis</title>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.2.3/jquery.min.js"></script>
     <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet" type="text/css">
     <link href="{{ url_for('static', filename='./img/favicon.ico') }}" rel="icon" type="image/x-icon">
     <script src="{{ url_for('static', filename = './js/main.js') }}"></script>
@@ -44,6 +45,7 @@
                                 <div class="drop-block">
                                     <form action="/login" method="POST">
                                         <div class="triangle"></div>
+                                        <!-- <p class="red_text" id="1">Неверный логин или пароль</p> -->
                                         <label class="form__cell-header ">
                                             <input class="form__input-text-mod" name="LogUserLogin" placeholder="Логин"
                                                    type="text">

templates/registration.html

@@ -5,6 +5,7 @@
     <meta content="width=device-width, initial-scale=1.0" name="viewport">
     <meta content="ie=edge" http-equiv="X-UA-Compatible">
     <title>Jarvis</title>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.2.3/jquery.min.js"></script>
     <link href="{{ url_for('static', filename = './css/main.css') }}" rel="stylesheet">
     <link href="{{ url_for('static', filename='./img/favicon.ico') }}" rel="icon" type="image/x-icon">
     <link href="{{ url_for('static', filename='./css/plugins/jquery.fancybox.css') }}" rel="stylesheet">
@@ -46,6 +47,7 @@
                                 <div class="drop-block">
                                     <form action="/login" method="POST">
                                         <div class="triangle"></div>
+                                        <p class="red_text" id="1">Неверный логин или пароль</p>
                                         <label class="form__cell-header ">
                                             <input class="form__input-text-mod" name="LogUserLogin" placeholder="Логин"
                                                    type="text">