Skip to content

Commit

Permalink
iPhone 6 + iPhone 6 Plus
Browse files Browse the repository at this point in the history
  • Loading branch information
olegtsaplin committed Sep 9, 2014
1 parent 01baad3 commit e0e3bf1
Show file tree
Hide file tree
Showing 15 changed files with 3,348 additions and 2,588 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@
.idea/scopes/scope_settings.xml

.idea/vcs.xml

.DS_Store

assets/js/site.js
43 changes: 43 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
watch: {
sass: {
files: 'assets/*/*.{scss,sass}',
tasks: ['sass:compressed'],
},
js: {
files: ['assets/js/*.js'],
tasks: ['uglify']
}
},
sass: {
compressed: {
options: {
style: 'compressed'
},

files: {
'assets/devices.min.css': 'assets/scss/devices.scss',
'assets/style.css': 'assets/scss/style.scss',
}
},
},
uglify: {
all: {
files: {
'assets/main.min.js': [
'assets/js/*.js'
]
}
},
},
});

grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-uglify');

grunt.registerTask('default', ['sass:compressed', 'uglify' , 'watch']);
};
39 changes: 2 additions & 37 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,41 +1,6 @@
See the demo [here](http://marvelapp.github.io/devices.css/)

# Usage
In order to use a device, visit the index.html file and pick which one you want, copying the 'device' class
and all it's children. The CSS is set up so that class has to be a wrapped in an element of ID which
corresponds to the device you're picking.
In order to use a device, include devices.min.css at the top of your document and then go back to the [demo](http://marvelapp.github.io/devices.css/) and select the combiantion you want, and simply copy out the generated HTML. That's it!

Similarly if you want a different colour or to toggle it to be landscape, just add the respective colour
class to the wrapping element, eg. 'red' or 'gold' or 'white' and the landscape class 'landscape':

# Possible combinations:
```
#iphone5s (black by default) - .landscape, .white + .gold
#iphone5c (black by default, could be an iPhone 5) - .landscape, .white + .red + .yellow + .green
#ipad (black by default) - .landscape, .silver
#iphone4s (black by default) - .landscape, .silver
#nexus5 - .landscape
#lumia920 (yellow by default) - .landscape, .black + .white + .yellow + .red + .blue
#s5 (white by default) - .landscape, .black
#htc-one - .landscape
```

# Example
```
#iphone5s.landscape.gold
.device
.inner
.sleep
.volume
.camera
.top-bar
.sensor
.speaker
.screen
Screen content goes here
.bottom-bar
.home
```

Will give you a gold landscape iPhone 5S! The CSS is quite messy (taken directly from the Prototype view of Marvel),
so use it, tweak it and improve however you want! Also sign up for [Marvel](http://marvelapp.com) if you haven't already because it's great
This will give you the device you selected, just like we use on Marvel. Use them, tweak them and improve however you want! Also sign up for [Marvel](http://marvelapp.com) if you haven't already because it's pretty good
1 change: 1 addition & 0 deletions assets/devices.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/main.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e0e3bf1

Please sign in to comment.