Merge pull request #567 from publicarray/remove-google-fonts
Remove google fonts and update node devDependencies
This commit is contained in:
commit
c98f82578c
|
|
@ -7,6 +7,7 @@ module.exports = function (grunt) {
|
|||
development: {
|
||||
options: {
|
||||
compress: true,
|
||||
javascriptEnabled: true,
|
||||
},
|
||||
files: {
|
||||
"./public/assets/stylesheet/application.css": "./public/assets/stylesheet/application.less",
|
||||
|
|
|
|||
20
package.json
20
package.json
|
|
@ -4,20 +4,20 @@
|
|||
"description": "Attendize Ticketing Platform",
|
||||
"main": "public/index.php",
|
||||
"dependencies": {
|
||||
"less": "~1.7.0"
|
||||
"less": "^3.9.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"bower": "^1.8.4",
|
||||
"grunt": "^0.4.5",
|
||||
"grunt-cli": "^1.2.0",
|
||||
"grunt-contrib-concat": "^0.5.1",
|
||||
"grunt-contrib-less": "^0.12.0",
|
||||
"grunt-contrib-uglify": "^0.6.0",
|
||||
"grunt-contrib-watch": "^0.6.1",
|
||||
"gulp": "^3.8.8",
|
||||
"laravel-elixir": "*"
|
||||
"bower": "^1.8.8",
|
||||
"grunt": "^1.0.3",
|
||||
"grunt-cli": "^1.3.2",
|
||||
"grunt-contrib-concat": "^1.0.1",
|
||||
"grunt-contrib-less": "^2.0.0",
|
||||
"grunt-contrib-uglify": "^4.0.0",
|
||||
"grunt-contrib-watch": "^1.1.0",
|
||||
"laravel-elixir": "6.0.0-18"
|
||||
},
|
||||
"scripts": {
|
||||
"build-frontend": "grunt",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,3 @@
|
|||
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700);
|
||||
|
||||
@import "../../vendor/bootstrap/less/bootstrap.less";
|
||||
// Copied the bootstrap vars file to allow customisation
|
||||
@import "bootstrap_custom_variables.less";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,12 +1,9 @@
|
|||
@import url(https://fonts.googleapis.com/css?family=Open+Sans:100,400,300);
|
||||
@import url(https://fonts.googleapis.com/css?family=Roboto:300,100);
|
||||
|
||||
html, body {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
table {
|
||||
|
|
|
|||
Loading…
Reference in New Issue