mirror of
https://github.com/opensupports/opensupports.git
synced 2025-07-31 01:35:15 +02:00
Merge 6dbe99806284bcf655e44ef41600a5491d4dd54a into 20720ca4f9175373ee8075fc18ce823707350534
This commit is contained in:
commit
74f492e10e
20276
client/package-lock.json
generated
20276
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -46,14 +46,14 @@
|
||||
"jsdom": "^8.4.1",
|
||||
"mocha": "^6.2.0",
|
||||
"morgan": "^1.6.1",
|
||||
"node-sass": "^4.12.0",
|
||||
"nodemon": "^1.19.1",
|
||||
"path": "^0.12.7",
|
||||
"proxyquire": "^1.7.4",
|
||||
"react-addons-test-utils": "^15.0.1",
|
||||
"rimraf": "^2.6.3",
|
||||
"run-sequence": "^1.1.1",
|
||||
"sass-loader": "^7.1.0",
|
||||
"sass": "^1.75.0",
|
||||
"sass-loader": "^9.0.0",
|
||||
"sinon": "^1.17.3",
|
||||
"sinon-chai": "^2.8.0",
|
||||
"style-loader": "^0.23.1",
|
||||
|
@ -8,7 +8,7 @@ p {
|
||||
&.-large {
|
||||
font-size: $font-size--lg;
|
||||
font-weight: bold;
|
||||
line-height: $half-space * 3 / 2;
|
||||
line-height: calc($half-space * 3 / 2);
|
||||
}
|
||||
|
||||
&.-medium {
|
||||
@ -20,7 +20,7 @@ p {
|
||||
&.-small {
|
||||
font-size: $font-size--sm;
|
||||
font-weight: bold;
|
||||
line-height: $half-space * 2 / 3;
|
||||
line-height: calc($half-space * 2 / 3);
|
||||
}
|
||||
|
||||
&.-smallest {
|
||||
@ -30,13 +30,13 @@ p {
|
||||
}
|
||||
|
||||
h1 {
|
||||
@extend .heading.-large;
|
||||
@extend .heading, .-large;
|
||||
}
|
||||
|
||||
h2 {
|
||||
@extend .heading.-medium;
|
||||
@extend .heading, .-medium;
|
||||
}
|
||||
|
||||
h3 {
|
||||
@extend .heading.-small;
|
||||
@extend .heading, .-small;
|
||||
}
|
@ -16,3 +16,5 @@ define('MYSQL_PORT', $mysql_port);
|
||||
define('MYSQL_USER', $mysql_user);
|
||||
define('MYSQL_PASSWORD', $mysql_password);
|
||||
define('MYSQL_DATABASE', $mysql_database);
|
||||
|
||||
error_reporting(E_ALL ^ E_DEPRECATED);
|
||||
|
Loading…
x
Reference in New Issue
Block a user