Merge pull request #120 from LeoColomb/master
Fixes some bugs and improve Grunt tasks
This commit is contained in:
commit
f73e2995b6
16
Gruntfile.js
16
Gruntfile.js
@ -1,4 +1,6 @@
|
||||
module.exports = function (grunt) {
|
||||
'use strict';
|
||||
|
||||
grunt.loadNpmTasks('grunt-php');
|
||||
grunt.loadNpmTasks('grunt-contrib-less');
|
||||
grunt.loadNpmTasks('grunt-contrib-watch');
|
||||
@ -15,11 +17,15 @@ module.exports = function(grunt) {
|
||||
},
|
||||
less: {
|
||||
development: {
|
||||
options: {
|
||||
cleancss: true,
|
||||
report: 'min'
|
||||
},
|
||||
files: {
|
||||
"css/daux-blue.css": "less/daux-blue.less",
|
||||
"css/daux-green.css": "less/daux-green.less",
|
||||
"css/daux-navy.css": "less/daux-navy.less",
|
||||
"css/daux-red.css": "less/daux-red.less"
|
||||
"css/daux-blue.min.css": "less/daux-blue.less",
|
||||
"css/daux-green.min.css": "less/daux-green.less",
|
||||
"css/daux-navy.min.css": "less/daux-navy.less",
|
||||
"css/daux-red.min.css": "less/daux-red.less"
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -36,4 +42,4 @@ module.exports = function(grunt) {
|
||||
|
||||
//grunt.registerTask('default', ['less', 'watch']);
|
||||
grunt.registerTask('default', ['php']);
|
||||
}
|
||||
};
|
4
css/daux-blue.min.css
vendored
4
css/daux-blue.min.css
vendored
File diff suppressed because one or more lines are too long
4
css/daux-green.min.css
vendored
4
css/daux-green.min.css
vendored
File diff suppressed because one or more lines are too long
4
css/daux-navy.min.css
vendored
4
css/daux-navy.min.css
vendored
File diff suppressed because one or more lines are too long
4
css/daux-red.min.css
vendored
4
css/daux-red.min.css
vendored
File diff suppressed because one or more lines are too long
@ -64,14 +64,6 @@ code {
|
||||
color: @light;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 767px) {
|
||||
padding: 6px 10px; .navbar-text {
|
||||
line-height: 16px;
|
||||
margin: 12px 6px;
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 768px) and (max-width: 979px) {
|
||||
|
@ -211,8 +211,11 @@ html, body {
|
||||
|
||||
.content-area, .article-tree {
|
||||
overflow: auto;
|
||||
height: 100%;
|
||||
padding: 0px;
|
||||
|
||||
@media (min-width: 767px) {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
//mobile friendly sub-nav
|
||||
|
@ -1,13 +1,13 @@
|
||||
{
|
||||
"name": "daux.io",
|
||||
"version": "0.1.0",
|
||||
"version": "0.1.1",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"grunt": "~0.4.1",
|
||||
"grunt-php": "~0.1.1",
|
||||
"grunt-contrib-less": "~0.5.2"
|
||||
"grunt-php": "~0.3.0",
|
||||
"grunt-contrib-less": "~0.9.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"grunt-contrib-watch": "~0.4.4"
|
||||
"grunt-contrib-watch": "~0.5.0"
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user