Skip to content

Commit b50bdc3

Browse files
authored
Merge pull request #60 from pixelsign/develop
3.2.0
2 parents 0040dc2 + fa2ffb1 commit b50bdc3

File tree

134 files changed

+74
-46485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+74
-46485
lines changed

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ test
55
tests
66
src
77
js
8-
images
8+
img
99
fonts
1010
css
1111
index.html

Gruntfile.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ module.exports = function (grunt) {
22

33
grunt.initConfig({
44
pkg: grunt.file.readJSON('package.json'),
5-
less: {
6-
development: {
7-
options: {
8-
plugins: [
9-
new (require('less-plugin-autoprefix'))({browsers: ["last 2 versions"]})
10-
],
11-
},
5+
sass: {
6+
dist: {
127
files: {
13-
'dist/device-mockups.css': 'src/less/device-mockups.less'
8+
'dist/device-mockups.css': 'src/less/device-mockups.scss'
149
}
1510
}
1611
},
@@ -38,7 +33,8 @@ module.exports = function (grunt) {
3833
grunt.loadNpmTasks('grunt-contrib-less');
3934
grunt.loadNpmTasks('grunt-contrib-cssmin');
4035
grunt.loadNpmTasks('grunt-banner');
36+
grunt.loadNpmTasks('grunt-sass');
4137

42-
grunt.registerTask('default', ['less', 'cssmin', 'usebanner']);
38+
grunt.registerTask('default', ['sass', 'cssmin', 'usebanner']);
4339

4440
};

README.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
[![npm](https://img.shields.io/npm/v/html5-device-mockups.svg)]()
55
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
66

7-
HTML5 device mockups :iphone::computer:
7+
HTML5 device mockups v3 :iphone::computer:
88
====================
99

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

1212
Use on...
1313
* Your website / splash screen
@@ -82,7 +82,7 @@ npm i html5-device-mockups
8282

8383
### Old traditional way
8484
```
85-
<link rel="stylesheet" type="text/css" href="dist/main.min.css">
85+
<link rel="stylesheet" type="text/css" href="dist/device-mockups.min.css">
8686
```
8787
## Usage
8888

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

104+
## FAQ
105+
106+
"I can not control the height of the device"
107+
108+
<https://github.com/pixelsign/html5-device-mockups/issues/47>
109+
104110
Created by:
105111
---
106112

0 commit comments

Comments
 (0)