Merge remote-tracking branch 'origin/master'

Timur Kastemirov
2 parents 088f364d 6bd17844
Showing 4 changed files with 75 additions and 23 deletions Show diff stats
composer.lock
frontend/views/site/error.php
frontend/web/css/custom.css
frontend/web/img/404.png
@@ -154,7 +154,7 @@
                 "shasum": ""
             },
             "require": {
-                "bower-asset/jquery": ">=1.9.1,<4.0"
+                "bower-asset/jquery": ">=1.9.1,<=3"
             },
             "type": "bower-asset-library",
             "extra": {
@@ -1998,7 +1998,7 @@
                     "role": "Developer"
                 },
                 {
-                    "name": "Hans-Jürgen Petrich",
+                    "name": "Hans-J?rgen Petrich",
                     "email": "petrich@tronic-media.com",
                     "role": "Developer"
                 },
@@ -2413,7 +2413,7 @@
             ],
             "authors": [
                 {
-                    "name": "Sérgio Peixoto",
+                    "name": "S?rgio Peixoto",
                     "email": "matematico2002@hotmail.com"
                 }
             ],
@@ -2607,7 +2607,7 @@
             ],
             "authors": [
                 {
-                    "name": "Túbal Martín",
+                    "name": "T?bal Mart?n",
                     "homepage": "http://tubalmartin.me/"
                 }
             ],
@@ -3381,7 +3381,7 @@
             ],
             "authors": [
                 {
-                    "name": "François Zaninotto"
+                    "name": "Fran?ois Zaninotto"
                 }
             ],
             "description": "Faker is a PHP library that generates fake data for you.",
@@ -4943,7 +4943,7 @@
             ],
             "authors": [
                 {
-                    "name": "Jean-François Simon",
+                    "name": "Jean-Fran?ois Simon",
                     "email": "jeanfrancois.simon@sensiolabs.com"
                 },
                 {
@@ -10,26 +10,51 @@ use yii\helpers\Html;
 $this->title = $name;
 ?>
  
+<style>
+    #error-page .title{
+        font-size: 28px;
+        font-weight: bold;
+        line-height: 36px;
+        color: #333333;
+    }
+    #error-page .subtitle{
+        color: #333333;
+        font-size: 24px;
+        margin-top: 3px;
+    }
+    #error-page .error-logo div{
+        display: block;
+        margin: 0 auto;
+        width: 100%;
+        max-width: 430px;
+        padding-top: 50%;
+        max-height: 191px;
+        box-sizing: border-box;
+        background: url(/img/404.png);
+        background-position: top center;
+        background-repeat: no-repeat;
+        background-size: contain;
+    }
+    @media(max-width:1199px){
+        #error-page br{display:none;}
+    }
+</style>
+
 <div id="content">
   <div class="container">
  
-    <div class="col-sm-6 col-sm-offset-3" id="error-page">
-      
-      <div class="box">
-        
-        <p class="text-center">
-          <a href="index.html">
-            <img src="img/logo.png" alt="Obaju template">
-          </a>
-        </p>
-        
-        <h3>We are sorry - this page is not here anymore</h3>
-        <h4 class="text-muted">Error 404 - Page not found</h4>
-        
-        <p class="buttons"><a href="index.html" class="btn btn-template-main"><i class="fa fa-home"></i> Go to Homepage</a>
-        </p>
-      </div>
-    
+    <div class="col-sm-12" id="error-page">
+
+        <div class="col-sm-6 error-logo">
+            <div></div>
+        </div>
+        <div class="col-sm-6">
+            <div class="text-left title">К сожалению, <br/>мы не можем найти такую страницу</div>
+            <div class="text-left subtitle">Попробуйте еще раз или:</div>
+
+            <p class="buttons text-right"><a href="/" class="btn btn-template-main">Перейти на главную</a></p>
+        </div>
+
  
     </div>
     <!-- /.col-sm-6 -->
@@ -175,4 +175,31 @@ span.panel-title{
 }
 .pages#get-it {
     padding: 20px 0 20px;
+}
+#error-page .title{
+    font-size: 28px;
+    font-weight: bold;
+    line-height: 36px;
+    color: #333333;
+}
+#error-page .subtitle{
+    color: #333333;
+    font-size: 24px;
+    margin-top: 3px;
+}
+#error-page .error-logo div{
+    display: block;
+    margin: 0 auto;
+    width: 100%;
+    max-width: 430px;
+    padding-top: 50%;
+    max-height: 191px;
+    box-sizing: border-box;
+    background: url(/img/404.png);
+    background-position: top center;
+    background-repeat: no-repeat;
+    background-size: contain;
+}
+@media(max-width:1199px){
+    #error-page br{display:none;}
 }
 \ No newline at end of file