Merge branch 'master' of https://github.com/flashwave/sakura
This commit is contained in:
commit
031dd79c56
4 changed files with 21 additions and 17 deletions
|
@ -188,7 +188,9 @@ class Router
|
||||||
try {
|
try {
|
||||||
return self::$dispatcher->dispatch($method, $url);
|
return self::$dispatcher->dispatch($method, $url);
|
||||||
} catch (HttpMethodNotAllowedException $e) {
|
} catch (HttpMethodNotAllowedException $e) {
|
||||||
|
http_response_code(403);
|
||||||
} catch (HttpRouteNotFoundException $e) {
|
} catch (HttpRouteNotFoundException $e) {
|
||||||
|
http_response_code(404);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default to the not found page
|
// Default to the not found page
|
||||||
|
|
|
@ -156,7 +156,7 @@ class BaseTables extends Migration
|
||||||
$table->integer('attempt_timestamp')
|
$table->integer('attempt_timestamp')
|
||||||
->unsigned();
|
->unsigned();
|
||||||
|
|
||||||
$table->string('attempt_ip', 255);
|
$table->binary('attempt_ip');
|
||||||
|
|
||||||
$table->integer('user_id')
|
$table->integer('user_id')
|
||||||
->unsigned();
|
->unsigned();
|
||||||
|
@ -254,7 +254,7 @@ class BaseTables extends Migration
|
||||||
->unsigned()
|
->unsigned()
|
||||||
->default(0);
|
->default(0);
|
||||||
|
|
||||||
$table->string('poster_ip', 40);
|
$table->binary('poster_ip');
|
||||||
|
|
||||||
$table->integer('post_time')
|
$table->integer('post_time')
|
||||||
->unsigned()
|
->unsigned()
|
||||||
|
@ -338,7 +338,7 @@ class BaseTables extends Migration
|
||||||
$table->integer('user_id')
|
$table->integer('user_id')
|
||||||
->unsigned();
|
->unsigned();
|
||||||
|
|
||||||
$table->string('user_ip', 255);
|
$table->binary('user_ip');
|
||||||
|
|
||||||
$table->string('user_agent', 255)
|
$table->string('user_agent', 255)
|
||||||
->nullable()
|
->nullable()
|
||||||
|
@ -506,9 +506,9 @@ class BaseTables extends Migration
|
||||||
->nullable()
|
->nullable()
|
||||||
->default(null);
|
->default(null);
|
||||||
|
|
||||||
$table->string('register_ip', 255);
|
$table->binary('register_ip');
|
||||||
|
|
||||||
$table->string('last_ip', 255);
|
$table->binary('last_ip');
|
||||||
|
|
||||||
$table->string('user_title', 64)
|
$table->string('user_title', 64)
|
||||||
->nullable()
|
->nullable()
|
||||||
|
@ -523,7 +523,8 @@ class BaseTables extends Migration
|
||||||
->default(0);
|
->default(0);
|
||||||
|
|
||||||
$table->date('user_birthday')
|
$table->date('user_birthday')
|
||||||
->default('0000-00-00');
|
->nullable()
|
||||||
|
->default(null);
|
||||||
|
|
||||||
$table->char('user_country', 2)
|
$table->char('user_country', 2)
|
||||||
->default('XX');
|
->default('XX');
|
||||||
|
|
|
@ -136,7 +136,7 @@ h3,
|
||||||
h4,
|
h4,
|
||||||
h5,
|
h5,
|
||||||
h6 {
|
h6 {
|
||||||
font-family: "Segoe UI", sans-serif;
|
font-family: "Open Sans", sans-serif;
|
||||||
font-weight: 100;
|
font-weight: 100;
|
||||||
margin: 5px 0;
|
margin: 5px 0;
|
||||||
}
|
}
|
||||||
|
@ -323,7 +323,7 @@ a.default:active {
|
||||||
min-width: 200px;
|
min-width: 200px;
|
||||||
border: 2px solid #9475B2;
|
border: 2px solid #9475B2;
|
||||||
float: left;
|
float: left;
|
||||||
font-family: "Segoe UI", sans-serif;
|
font-family: "Open Sans", sans-serif;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin: 0 2px;
|
margin: 0 2px;
|
||||||
transition: background .5s;
|
transition: background .5s;
|
||||||
|
@ -432,7 +432,7 @@ a.default:active {
|
||||||
}
|
}
|
||||||
|
|
||||||
#headerLoginForm label {
|
#headerLoginForm label {
|
||||||
font-family: "Segoe UI", sans-serif;
|
font-family: "Open Sans", sans-serif;
|
||||||
font-weight: 100;
|
font-weight: 100;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
}
|
}
|
||||||
|
@ -457,7 +457,7 @@ a.default:active {
|
||||||
}
|
}
|
||||||
|
|
||||||
.panelQuickLinks > li > a > .count {
|
.panelQuickLinks > li > a > .count {
|
||||||
font: 100 1em "Segoe UI", sans-serif;
|
font: 100 1em "Open Sans", sans-serif;
|
||||||
margin-left: 6px;
|
margin-left: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -495,7 +495,7 @@ a.default:active {
|
||||||
width: auto;
|
width: auto;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font: 100 70px/80px "Segoe UI", sans-serif;
|
font: 100 70px/80px "Open Sans", sans-serif;
|
||||||
color: #B06AC4;
|
color: #B06AC4;
|
||||||
transition: color .2s, text-shadow .2s;
|
transition: color .2s, text-shadow .2s;
|
||||||
}
|
}
|
||||||
|
@ -513,7 +513,7 @@ a.default:active {
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
|
|
||||||
.header .logo {
|
.header .logo {
|
||||||
font: 100 50px/60px "Segoe UI", sans-serif;
|
font: 100 50px/60px "Open Sans", sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -931,7 +931,7 @@ a.default:active {
|
||||||
bottom: 5px;
|
bottom: 5px;
|
||||||
right: 5px;
|
right: 5px;
|
||||||
z-index: 3;
|
z-index: 3;
|
||||||
font-family: "Segoe UI", sans-serif;
|
font-family: "Open Sans", sans-serif;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
|
@ -1679,7 +1679,7 @@ a.default:active {
|
||||||
}
|
}
|
||||||
|
|
||||||
.settings .notification-history > a > .notif-hist-content > .notif-hist-inside > .notif-hist-title {
|
.settings .notification-history > a > .notif-hist-content > .notif-hist-inside > .notif-hist-title {
|
||||||
font-family: "Segoe UI", sans-serif;
|
font-family: "Open Sans", sans-serif;
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
font-size: 1.7em;
|
font-size: 1.7em;
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
|
@ -2185,7 +2185,7 @@ textarea.inputStyling {
|
||||||
}
|
}
|
||||||
|
|
||||||
.forum.viewtopic .posts .userpanel .username {
|
.forum.viewtopic .posts .userpanel .username {
|
||||||
font: 1.5em/1.7em "Segoe UI", sans-serif;
|
font: 1.5em/1.7em "Open Sans", sans-serif;
|
||||||
text-shadow: 0 0 7px #888; padding: 0 0 2px;
|
text-shadow: 0 0 7px #888; padding: 0 0 2px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
@ -2271,7 +2271,7 @@ textarea.inputStyling {
|
||||||
}
|
}
|
||||||
|
|
||||||
.posting-bbcode-description {
|
.posting-bbcode-description {
|
||||||
font: .9em/1.2em "Segoe UI", sans-serif;
|
font: .9em/1.2em "Open Sans", sans-serif;
|
||||||
padding: 2px 0 3px;
|
padding: 2px 0 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2423,7 +2423,7 @@ button.forumbtn {
|
||||||
min-width: 300px;
|
min-width: 300px;
|
||||||
flex-grow: 2;
|
flex-grow: 2;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
font: 12px/20px "Segoe UI", sans-serif;
|
font: 12px/20px "Open Sans", sans-serif;
|
||||||
background: #F6F6F6;
|
background: #F6F6F6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ block('meta') }}
|
{{ block('meta') }}
|
||||||
|
|
||||||
|
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
|
||||||
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css">
|
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css">
|
||||||
<link rel="stylesheet" type="text/css" href="/css/libraries.css">
|
<link rel="stylesheet" type="text/css" href="/css/libraries.css">
|
||||||
<link rel="stylesheet" type="text/css" href="/css/yuuno.css">
|
<link rel="stylesheet" type="text/css" href="/css/yuuno.css">
|
||||||
|
|
Reference in a new issue