yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 11:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into front/context-api

Browse Source
This commit is contained in:
cyril lopez 2019-10-02 18:09:13 +02:00 committed by GitHub
commit 52e700d1ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/strapi-admin/admin/src/styles/main.scss
View File

@ -1,16 +1,16 @@
// Import variables // Import variables
@import "variables/variables"; @import 'variables/variables';
@import "base/fonts"; @import 'base/fonts';
:global { :global {
// Expose libs styles // Expose libs styles
@import "libs/bootstrap/bootstrap"; @import 'libs/bootstrap/bootstrap';
@import "libs/fontawesome/fontawesome"; @import 'libs/fontawesome/fontawesome';
// Expose base styles // Expose base styles
@import "base/bootstrap-override"; @import 'base/bootstrap-override';
@import "base/animations"; @import 'base/animations';
@import "base/animations"; @import 'base/animations';
// Set the global font-size in order // Set the global font-size in order
// to be able to have `1rem = 10px`. // to be able to have `1rem = 10px`.
@ -18,11 +18,6 @@
font-size: 62.5%; font-size: 62.5%;
} }
::-webkit-scrollbar {
display: none;
}
* { * {
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }

5
packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
View File

@ -412,6 +412,11 @@ const getType = ({ definition, attribute, name, tableExists = false }) => {
case 'date': case 'date':
case 'time': case 'time':
case 'datetime': case 'datetime':
if (client === 'pg') {
return 'timestamp with time zone';
}
return 'timestamp';
case 'timestamp': case 'timestamp':
if (client === 'pg') { if (client === 'pg') {
return 'timestamp with time zone'; return 'timestamp with time zone';