Commit 5869ded4a58448a279345cd6bf450a92105289cb
Merge remote-tracking branch 'origin/master'
Showing
4 changed files
with
75 additions
and
23 deletions
Show diff stats
composer.lock
| @@ -154,7 +154,7 @@ | @@ -154,7 +154,7 @@ | ||
| 154 | "shasum": "" | 154 | "shasum": "" |
| 155 | }, | 155 | }, |
| 156 | "require": { | 156 | "require": { |
| 157 | - "bower-asset/jquery": ">=1.9.1,<4.0" | 157 | + "bower-asset/jquery": ">=1.9.1,<=3" |
| 158 | }, | 158 | }, |
| 159 | "type": "bower-asset-library", | 159 | "type": "bower-asset-library", |
| 160 | "extra": { | 160 | "extra": { |
| @@ -1998,7 +1998,7 @@ | @@ -1998,7 +1998,7 @@ | ||
| 1998 | "role": "Developer" | 1998 | "role": "Developer" |
| 1999 | }, | 1999 | }, |
| 2000 | { | 2000 | { |
| 2001 | - "name": "Hans-Jürgen Petrich", | 2001 | + "name": "Hans-J?rgen Petrich", |
| 2002 | "email": "petrich@tronic-media.com", | 2002 | "email": "petrich@tronic-media.com", |
| 2003 | "role": "Developer" | 2003 | "role": "Developer" |
| 2004 | }, | 2004 | }, |
| @@ -2413,7 +2413,7 @@ | @@ -2413,7 +2413,7 @@ | ||
| 2413 | ], | 2413 | ], |
| 2414 | "authors": [ | 2414 | "authors": [ |
| 2415 | { | 2415 | { |
| 2416 | - "name": "Sérgio Peixoto", | 2416 | + "name": "S?rgio Peixoto", |
| 2417 | "email": "matematico2002@hotmail.com" | 2417 | "email": "matematico2002@hotmail.com" |
| 2418 | } | 2418 | } |
| 2419 | ], | 2419 | ], |
| @@ -2607,7 +2607,7 @@ | @@ -2607,7 +2607,7 @@ | ||
| 2607 | ], | 2607 | ], |
| 2608 | "authors": [ | 2608 | "authors": [ |
| 2609 | { | 2609 | { |
| 2610 | - "name": "Túbal Martín", | 2610 | + "name": "T?bal Mart?n", |
| 2611 | "homepage": "http://tubalmartin.me/" | 2611 | "homepage": "http://tubalmartin.me/" |
| 2612 | } | 2612 | } |
| 2613 | ], | 2613 | ], |
| @@ -3381,7 +3381,7 @@ | @@ -3381,7 +3381,7 @@ | ||
| 3381 | ], | 3381 | ], |
| 3382 | "authors": [ | 3382 | "authors": [ |
| 3383 | { | 3383 | { |
| 3384 | - "name": "François Zaninotto" | 3384 | + "name": "Fran?ois Zaninotto" |
| 3385 | } | 3385 | } |
| 3386 | ], | 3386 | ], |
| 3387 | "description": "Faker is a PHP library that generates fake data for you.", | 3387 | "description": "Faker is a PHP library that generates fake data for you.", |
| @@ -4943,7 +4943,7 @@ | @@ -4943,7 +4943,7 @@ | ||
| 4943 | ], | 4943 | ], |
| 4944 | "authors": [ | 4944 | "authors": [ |
| 4945 | { | 4945 | { |
| 4946 | - "name": "Jean-François Simon", | 4946 | + "name": "Jean-Fran?ois Simon", |
| 4947 | "email": "jeanfrancois.simon@sensiolabs.com" | 4947 | "email": "jeanfrancois.simon@sensiolabs.com" |
| 4948 | }, | 4948 | }, |
| 4949 | { | 4949 | { |
frontend/views/site/error.php
| @@ -10,26 +10,51 @@ use yii\helpers\Html; | @@ -10,26 +10,51 @@ use yii\helpers\Html; | ||
| 10 | $this->title = $name; | 10 | $this->title = $name; |
| 11 | ?> | 11 | ?> |
| 12 | 12 | ||
| 13 | +<style> | ||
| 14 | + #error-page .title{ | ||
| 15 | + font-size: 28px; | ||
| 16 | + font-weight: bold; | ||
| 17 | + line-height: 36px; | ||
| 18 | + color: #333333; | ||
| 19 | + } | ||
| 20 | + #error-page .subtitle{ | ||
| 21 | + color: #333333; | ||
| 22 | + font-size: 24px; | ||
| 23 | + margin-top: 3px; | ||
| 24 | + } | ||
| 25 | + #error-page .error-logo div{ | ||
| 26 | + display: block; | ||
| 27 | + margin: 0 auto; | ||
| 28 | + width: 100%; | ||
| 29 | + max-width: 430px; | ||
| 30 | + padding-top: 50%; | ||
| 31 | + max-height: 191px; | ||
| 32 | + box-sizing: border-box; | ||
| 33 | + background: url(/img/404.png); | ||
| 34 | + background-position: top center; | ||
| 35 | + background-repeat: no-repeat; | ||
| 36 | + background-size: contain; | ||
| 37 | + } | ||
| 38 | + @media(max-width:1199px){ | ||
| 39 | + #error-page br{display:none;} | ||
| 40 | + } | ||
| 41 | +</style> | ||
| 42 | + | ||
| 13 | <div id="content"> | 43 | <div id="content"> |
| 14 | <div class="container"> | 44 | <div class="container"> |
| 15 | 45 | ||
| 16 | - <div class="col-sm-6 col-sm-offset-3" id="error-page"> | ||
| 17 | - | ||
| 18 | - <div class="box"> | ||
| 19 | - | ||
| 20 | - <p class="text-center"> | ||
| 21 | - <a href="index.html"> | ||
| 22 | - <img src="img/logo.png" alt="Obaju template"> | ||
| 23 | - </a> | ||
| 24 | - </p> | ||
| 25 | - | ||
| 26 | - <h3>We are sorry - this page is not here anymore</h3> | ||
| 27 | - <h4 class="text-muted">Error 404 - Page not found</h4> | ||
| 28 | - | ||
| 29 | - <p class="buttons"><a href="index.html" class="btn btn-template-main"><i class="fa fa-home"></i> Go to Homepage</a> | ||
| 30 | - </p> | ||
| 31 | - </div> | ||
| 32 | - | 46 | + <div class="col-sm-12" id="error-page"> |
| 47 | + | ||
| 48 | + <div class="col-sm-6 error-logo"> | ||
| 49 | + <div></div> | ||
| 50 | + </div> | ||
| 51 | + <div class="col-sm-6"> | ||
| 52 | + <div class="text-left title">К сожалению, <br/>мы не можем найти такую страницу</div> | ||
| 53 | + <div class="text-left subtitle">Попробуйте еще раз или:</div> | ||
| 54 | + | ||
| 55 | + <p class="buttons text-right"><a href="/" class="btn btn-template-main">Перейти на главную</a></p> | ||
| 56 | + </div> | ||
| 57 | + | ||
| 33 | 58 | ||
| 34 | </div> | 59 | </div> |
| 35 | <!-- /.col-sm-6 --> | 60 | <!-- /.col-sm-6 --> |
frontend/web/css/custom.css
| @@ -175,4 +175,31 @@ span.panel-title{ | @@ -175,4 +175,31 @@ span.panel-title{ | ||
| 175 | } | 175 | } |
| 176 | .pages#get-it { | 176 | .pages#get-it { |
| 177 | padding: 20px 0 20px; | 177 | padding: 20px 0 20px; |
| 178 | +} | ||
| 179 | +#error-page .title{ | ||
| 180 | + font-size: 28px; | ||
| 181 | + font-weight: bold; | ||
| 182 | + line-height: 36px; | ||
| 183 | + color: #333333; | ||
| 184 | +} | ||
| 185 | +#error-page .subtitle{ | ||
| 186 | + color: #333333; | ||
| 187 | + font-size: 24px; | ||
| 188 | + margin-top: 3px; | ||
| 189 | +} | ||
| 190 | +#error-page .error-logo div{ | ||
| 191 | + display: block; | ||
| 192 | + margin: 0 auto; | ||
| 193 | + width: 100%; | ||
| 194 | + max-width: 430px; | ||
| 195 | + padding-top: 50%; | ||
| 196 | + max-height: 191px; | ||
| 197 | + box-sizing: border-box; | ||
| 198 | + background: url(/img/404.png); | ||
| 199 | + background-position: top center; | ||
| 200 | + background-repeat: no-repeat; | ||
| 201 | + background-size: contain; | ||
| 202 | +} | ||
| 203 | +@media(max-width:1199px){ | ||
| 204 | + #error-page br{display:none;} | ||
| 178 | } | 205 | } |
| 179 | \ No newline at end of file | 206 | \ No newline at end of file |
73.9 KB