Skip to content

Commit 30ecf5c

Browse files
author
ben182
authored
Merge pull request #46 from pixelsign/3.0.0
3.0.0
2 parents 4c5757d + fcacccf commit 30ecf5c

File tree

797 files changed

+149398
-60654
lines changed

Some content is hidden

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

797 files changed

+149398
-60654
lines changed

.gitignore

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Ignore docs files
2+
_gh_pages
3+
_site
4+
5+
# Ignore ruby files
6+
.ruby-version
7+
.bundle
8+
vendor/cache
9+
vendor/bundle
10+
11+
# Numerous always-ignore extensions
12+
*.diff
13+
*.err
14+
*.log
15+
*.orig
16+
*.rej
17+
*.swo
18+
*.swp
19+
*.vi
20+
*.zip
21+
*~
22+
23+
# OS or Editor folders
24+
._*
25+
.cache
26+
.DS_Store
27+
.idea
28+
.project
29+
.settings
30+
.tmproj
31+
*.esproj
32+
*.sublime-project
33+
*.sublime-workspace
34+
nbproject
35+
Thumbs.db
36+
37+
# Komodo
38+
.komodotools
39+
*.komodoproject
40+
41+
# SCSS-Lint
42+
scss-lint-report.xml
43+
44+
# grunt-contrib-sass cache
45+
.sass-cache
46+
47+
# Jekyll metadata
48+
docs/.jekyll-metadata
49+
50+
# Folders to ignore
51+
#bower_components
52+
node_modules

.npmignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
**/.*
2+
node_modules
3+
bower_components
4+
test
5+
tests
6+
src
7+
js
8+
images
9+
fonts
10+
css
11+
index.html
12+
device-mockups/**/*.psd

CREDITS.txt

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
For this resource we have used many different resources already provided by other designers. They have enabled us to realize this project and we are forever grateful to them.
2-
— Resources in Vector PSD’s —
1+
For this resource we have used many different resources already provided by other designers. They have enabled us to realise this project and we are forever grateful to them.
2+
3+
— Resources in Vector PSD’s —
34
Apple iPhone 5 Black:
45
http://dribbble.com/shots/727359-iPhone-5-freebie
56
Apple iPhone 5 White:
@@ -16,7 +17,7 @@ Microsoft Surface:
1617
http://dribbble.com/shots/860650-Freebie-Microsoft-Surface-RT-psd-and-ai-templates
1718
Nokia Lumia 920:
1819
http://dribbble.com/shots/780376-lumia-920-yellow
19-
— New devices added 10.11.2014 —
20+
— New devices added 10.11.2014 —
2021

2122
Samsung Galaxy S5:
2223
http://www.pixeden.com/psd-mock-up-templates/samsung-galaxy-s5-psd-mockup
@@ -39,11 +40,13 @@ http://graphicburger.com/nexus-6-psd-mockup/
3940
Samsung TV:
4041
http://themt.deviantart.com/art/Photoshop-da-Samsung-Smart-TV-PSD-Yapmak-288963322
4142

42-
— New devices added 24.03.2015 —
43+
44+
— New devices added 24.03.2015 —
4345

4446
Samsung Galaxy Tab 4 10.1", & 8"
4547
http://tweakers.net (original pictures, edited.)
4648

49+
4750
- New devices added by ben182
4851

4952
iPhone6
@@ -60,3 +63,54 @@ http://www.pixeden.com/psd-mock-up-templates/the-new-macbook-psd-mockup
6063

6164
Apple Watch
6265
https://dribbble.com/shots/1719188--Watch-PSD-Template
66+
67+
iPhone 6 Hand
68+
https://www.behance.net/gallery/51510707/-free-iphone-6-6s-mockup-
69+
70+
iPhone 7 Hand 1 & 2
71+
http://www.designlazy.com/iphone-7-mockup-psd/
72+
73+
74+
- Devices added by pixelsign 28.04.2017
75+
76+
iPhone 7 & 7plus
77+
http://www.pixeden.com/psd-mock-up-templates/iphone-7-psd-mockup-vector
78+
79+
iPhone 7 Red
80+
http://www.designbolts.com/2017/03/23/free-vector-apple-iphone-7-red-mock-up-in-ai-eps-format/
81+
82+
Acer Chromebook
83+
https://dribbble.com/shots/2760880-Acer-Chromebook-Mockup
84+
85+
Galaxy S7
86+
https://dribbble.com/shots/2548712-Free-Vector-Ai-Samsung-Galaxy-S7-S7-Edge-Mockups
87+
88+
Macbook 2015
89+
http://www.pixeden.com/psd-mock-up-templates/the-new-macbook-psd-mockup
90+
91+
Macbook Pro 2016
92+
http://www.designbolts.com/2016/10/30/beautiful-realistic-apple-macbook-pro-with-touch-bar-vector-ai-eps-mock-up/
93+
94+
HTC One m8
95+
https://dribbble.com/shots/1480205-Free-HTC-ONE-M8-Mock-Up-Template-Rheinfabrik
96+
97+
HTC One mini
98+
https://dribbble.com/shots/1201333-HTC-One-Mini-PSD
99+
100+
OnePlus One
101+
https://dribbble.com/shots/1587380-OnePlus-One-Mockup-PSD
102+
103+
Huawei P8
104+
https://dribbble.com/shots/2346279-Huawei-P8-Template-PSD-freebie
105+
106+
Google Pixel
107+
http://www.designbolts.com/2016/10/19/free-vector-google-pixel-mockup-in-ai-eps-format/
108+
109+
Surface Book
110+
https://dribbble.com/shots/2756057-Microsoft-Surface-Book-Free-PSD-AI-Mockup
111+
112+
Surface Studio
113+
https://dribbble.com/shots/3051544-Microsoft-Surface-Studio-Mockup
114+
115+
Surface Pro
116+
http://www.titanui.com/44913-microsoft-surface-pro-3-mockup-psd-2/

DEMOPIC/IMG_0068.PNG

-207 KB
Binary file not shown.

DEMOPIC/demo1.gif

-658 KB
Binary file not shown.

Device Berechnung.xlsx

-8.68 KB
Binary file not shown.

Device Examples/galaxy_s3_landscape_black.html

Lines changed: 0 additions & 64 deletions
This file was deleted.

Device Examples/galaxy_s3_landscape_white.html

Lines changed: 0 additions & 64 deletions
This file was deleted.

Device Examples/galaxy_s3_portrait_black.html

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)