Commit 95f0dda0046bf8e6df9673de3ea160b1739a6b00
1 parent
47cf20df
error-page2
Showing
2 changed files
with
9 additions
and
6 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
@@ -22,6 +22,9 @@ $this->title = $name; | @@ -22,6 +22,9 @@ $this->title = $name; | ||
22 | font-size: 24px; | 22 | font-size: 24px; |
23 | margin-top: 3px; | 23 | margin-top: 3px; |
24 | } | 24 | } |
25 | + @media(max-width:1199px){ | ||
26 | + #error-page br{display:none;} | ||
27 | + } | ||
25 | </style> | 28 | </style> |
26 | 29 | ||
27 | <div id="content"> | 30 | <div id="content"> |