Skip to content

Commit

Permalink
Merge pull request #60 from pixelsign/develop
Browse files Browse the repository at this point in the history
3.2.0
  • Loading branch information
ben182 authored Nov 14, 2017
2 parents 0040dc2 + fa2ffb1 commit b50bdc3
Show file tree
Hide file tree
Showing 134 changed files with 74 additions and 46,485 deletions.
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ test
tests
src
js
images
img
fonts
css
index.html
Expand Down
14 changes: 5 additions & 9 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,10 @@ module.exports = function (grunt) {

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
less: {
development: {
options: {
plugins: [
new (require('less-plugin-autoprefix'))({browsers: ["last 2 versions"]})
],
},
sass: {
dist: {
files: {
'dist/device-mockups.css': 'src/less/device-mockups.less'
'dist/device-mockups.css': 'src/less/device-mockups.scss'
}
}
},
Expand Down Expand Up @@ -38,7 +33,8 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-banner');
grunt.loadNpmTasks('grunt-sass');

grunt.registerTask('default', ['less', 'cssmin', 'usebanner']);
grunt.registerTask('default', ['sass', 'cssmin', 'usebanner']);

};
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
[![npm](https://img.shields.io/npm/v/html5-device-mockups.svg)]()
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

HTML5 device mockups :iphone::computer:
HTML5 device mockups v3 :iphone::computer:
====================

You can view the demo page of all devices here: https://pixelsign.github.io/html5-device-mockups/
You can view the demo page here: <https://pixelsign.github.io/html5-device-mockups/>

Use on...
* Your website / splash screen
Expand Down Expand Up @@ -82,7 +82,7 @@ npm i html5-device-mockups

### Old traditional way
```
<link rel="stylesheet" type="text/css" href="dist/main.min.css">
<link rel="stylesheet" type="text/css" href="dist/device-mockups.min.css">
```
## Usage

Expand All @@ -101,6 +101,12 @@ Use this example or grap the code from the HTML generator on our demo site:
</div>
```

## FAQ

"I can not control the height of the device"

<https://github.com/pixelsign/html5-device-mockups/issues/47>

Created by:
---

Expand Down
Loading

0 comments on commit b50bdc3

Please sign in to comment.