Skip to content

Commit 02166e0

Browse files
ThibautThibaut
committed
Add new sponsors
1 parent 05d5b93 commit 02166e0

25 files changed

+166
-79
lines changed

‎README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
DevDocs combines multiple API documentations in a fast, organized, and searchable interface.
44

55
* Created by [Thibaut Courouble](http://thibaut.me)
6-
* Made at [Shopify](http://devdocs.io/s/shopify)
7-
* Powered by [MaxCDN](http://devdocs.io/s/maxcdn)
6+
* Supported by [JetBrains](http://devdocs.io/s/jetbrains), [Code School](http://devdocs.io/s/code-school) and [Shopify](http://devdocs.io/s/shopify)
87

98
Keep track of development and community news:
109

‎assets/images/code-school-bw.png

1.21 KB
Loading

‎assets/images/[email protected]

3.21 KB
Loading

‎assets/images/code-school.png

2.52 KB
Loading

‎assets/images/[email protected]

5.51 KB
Loading

‎assets/images/jetbrains-bw.png

1.36 KB
Loading

‎assets/images/[email protected]

3.23 KB
Loading

‎assets/images/jetbrains.png

2.32 KB
Loading

‎assets/images/[email protected]

5.04 KB
Loading

‎assets/images/maxcdn-bw.png

-1.9 KB
Binary file not shown.

‎assets/images/[email protected]

-3.78 KB
Binary file not shown.

‎assets/images/maxcdn.png

-3.29 KB
Binary file not shown.

‎assets/images/[email protected]

-7.4 KB
Binary file not shown.

‎assets/javascripts/news.json

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
[
22
[
3+
"2015-07-12",
4+
"New sponsors: <a href=\"http://devdocs.io/s/jetbrains\">JetBrains</a> and <a href=\"http://devdocs.io/s/code-school\">Code School</a>\nIf you like DevDocs, please take a moment to check out their products — they're awesome!"
5+
], [
36
"2015-07-05",
47
"New documentations: <a href=\"/drupal/\">Drupal</a>, <a href=\"/vue/\">Vue.js</a>, <a href=\"/phaser/\">Phaser</a> and <a href=\"/webpack/\">webpack</a>"
58
], [

‎assets/javascripts/templates/notif_tmpl.coffee

+4-3
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ app.templates.notifShare = ->
3434

3535
app.templates.notifThanks = ->
3636
textNotif """ Hi there! """,
37-
""" <p class="_notif-text">Quick shout-out to our awesome sponsors:
37+
""" <p class="_notif-text">Like DevDocs? Check out these awesome companies who are making it possible:
3838
<ul class="_notif-list">
39-
<li><a href="http://devdocs.io/s/maxcdn" target="_blank">MaxCDN</a> has been supporting DevDocs since day one. They provide CDN solutions that make DevDocs and countless other sites faster.</li>
40-
<li><a href="http://devdocs.io/s/shopify" target="_blank">Shopify</a> is where I spend my weekdays. Interested in working on one of the biggest commerce platforms in the world, in a delightful work environment? We're hiring!
39+
<li><a href="http://devdocs.io/s/jetbrains" target="_blank">JetBrains</a> — We make software development a more productive and enjoyable experience through smart IDEs and code editors.
40+
<li><a href="http://devdocs.io/s/code-school" target="_blank">Code School</a> — Learn new skills from the comfort of your own browser. Offering more than 45 courses covering JavaScript, HTML/CSS, Ruby, Git, and iOS for only $29/month.
41+
<li><a href="http://devdocs.io/s/shopify" target="_blank">Shopify</a> — Interested in working on one of the biggest commerce platforms in the world, in a delightful work environment? We're hiring!
4142
</ul>
4243
<p class="_notif-text">Have a great day :) """
4344

‎assets/javascripts/templates/pages/about_tmpl.coffee

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ app.templates.aboutPage = -> """
1313
<p>DevDocs combines multiple API documentations in a fast, organized, and searchable interface.
1414
<ul>
1515
<li>Created and maintained by <a href="http://thibaut.me">Thibaut Courouble</a>
16-
<li>Supported by <a href="http://devdocs.io/s/shopify">Shopify</a>
17-
<li>Powered by <a href="http://devdocs.io/s/maxcdn" title="Content Delivery Network Services">MaxCDN</a>
16+
<li>Supported by <a href="http://devdocs.io/s/jetbrains">JetBrains</a>, <a href="http://devdocs.io/s/code-school">Code School</a> and <a href="http://devdocs.io/s/shopify">Shopify</a>
1817
<li>Free and <a href="https://github.com/Thibaut/devdocs">open source</a>
1918
<iframe class="_github-btn" src="https://ghbtns.com/github-btn.html?user=Thibaut&repo=devdocs&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100" height="20"></iframe>
2019
</ul>

‎assets/javascripts/templates/pages/root_tmpl.coffee.erb

+46-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,37 @@
1-
maxcdnLink = (className) -> """
2-
<a href="http://devdocs.io/s/maxcdn" class="#{className}">
3-
<span class="_logo-thx _maxcdn-logo">MaxCDN</span>
4-
<span class="_logo-info">MaxCDN has been supporting DevDocs since day one. They provide CDN solutions that make DevDocs and countless other sites faster.</span>
1+
jetBrainsLink = (className) ->
2+
type = jetBrainsType()
3+
path = "/#{type}" if type
4+
5+
"""
6+
<a href="http://devdocs.io/s/jetbrains#{path || ''}" class="#{className}">
7+
<span class="_logo-thx _jetbrains-logo">JetBrains</span>
8+
<span class="_logo-info">#{JETBRAINS_INFO[type || 'default']}</span>
9+
</a>
10+
"""
11+
12+
JETBRAINS_INFO =
13+
ruby: 'Developing in Ruby? Boost your productivity with RubyMine, a powerful IDE with smart coding assistance and advanced testing and debugging features.'
14+
python: 'Developing in Python? Enjoy productive development with PyCharm, an intelligent Python IDE offering unique coding experience.'
15+
c: 'Developing in C? Now benefit from CLion, a C/C++ IDE enhancing your productivity with on-thy-fly static analysis and automated refactorings.'
16+
web: 'Doing client-side development? Try WebStorm, an IDE that really understands JavaScript and modern frameworks like AngularJS and boosts your productivity.'
17+
default: 'JetBrains makes software development a more productive and enjoyable experience through smart IDEs and code editors.'
18+
19+
jetBrainsType = ->
20+
docs = if app.settings then app.settings.getDocs() else []
21+
22+
if docs.indexOf('ruby') != -1
23+
'ruby'
24+
else if docs.indexOf('python') != -1 || docs.indexOf('python2') != -1
25+
'python'
26+
else if docs.indexOf('c') != -1 or docs.indexOf('cpp') != -1
27+
'c'
28+
else if docs.indexOf('javascript') != -1 or docs.indexOf('jquery') != -1
29+
'web'
30+
31+
codeSchoolLink = (className) -> """
32+
<a href="http://devdocs.io/s/code-school" class="#{className}">
33+
<span class="_logo-thx _code-school-logo">Code School</span>
34+
<span class="_logo-info">With more than 45 courses covering JavaScript, HTML/CSS, Ruby, Git, and iOS, Code School pairs experienced instructors with engaging content. Start learning at codeschool.com.</span>
535
</a>
636
"""
737

@@ -12,10 +42,13 @@ shopifyLink = (className) -> """
1242
</a>
1343
"""
1444

15-
app.templates.splash = """
45+
app.templates.splash = -> """
1646
<div class="_splash-title">DevDocs</div>
17-
#{maxcdnLink '_splash-sponsor'}
18-
#{shopifyLink '_splash-sponsor'}
47+
<div class="_splash-sponsors">
48+
#{jetBrainsLink '_splash-sponsor'}
49+
#{codeSchoolLink '_splash-sponsor'}
50+
#{shopifyLink '_splash-sponsor'}
51+
</div>
1952
"""
2053

2154
<% if App.development? %>
@@ -39,8 +72,8 @@ app.templates.intro = """
3972
<li>If you like the app, please consider supporting the project on <a href="https://gratipay.com/devdocs/">Gratipay</a>. Thanks!
4073
</ol>
4174
<p class="_intro-sponsors">
42-
Thanks to#{shopifyLink '_intro-sponsor'} #{maxcdnLink '_intro-sponsor'}
43-
<p>That's all. Happy coding!
75+
#{jetBrainsLink '_intro-sponsor'} #{codeSchoolLink '_intro-sponsor'} #{shopifyLink '_intro-sponsor'}
76+
<p>Happy coding!
4477
</div></div>
4578
"""
4679
<% else %>
@@ -63,8 +96,8 @@ app.templates.intro = """
6396
<li>If you like the app, please consider supporting the project on <a href="https://gratipay.com/devdocs/">Gratipay</a>. Thanks!
6497
</ol>
6598
<p class="_intro-sponsors">
66-
Thanks to#{shopifyLink '_intro-sponsor'} #{maxcdnLink '_intro-sponsor'}
67-
<p>That's all. Happy coding!
99+
#{jetBrainsLink '_intro-sponsor'} #{codeSchoolLink '_intro-sponsor'} #{shopifyLink '_intro-sponsor'}
100+
<p>Happy coding!
68101
</div></div>
69102
"""
70103
<% end %>
@@ -90,8 +123,8 @@ app.templates.mobileIntro = """
90123
<li>For the latest news, subscribe to the <a href="http://eepurl.com/HnLUz">newsletter</a> or follow <a href="https://twitter.com/DevDocs">@DevDocs</a>
91124
<li>DevDocs is <a href="https://github.com/Thibaut/devdocs">open source</a>
92125
</ol>
93-
<p>That's all. Happy coding!
94-
<p class="_intro-sponsors">#{shopifyLink '_intro-sponsor'} #{maxcdnLink '_intro-sponsor'}</p>
126+
<p>Happy coding!
127+
<p class="_intro-sponsors">#{jetBrainsLink '_intro-sponsor'} #{codeSchoolLink '_intro-sponsor'} #{shopifyLink '_intro-sponsor'}</p>
95128
<a class="_intro-hide" data-hide-intro>Stop showing this message</a>
96129
</div>
97130
"""

‎assets/stylesheets/components/_content.scss

+60-29
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,32 @@
6868
color: $splashText;
6969
cursor: default;
7070
opacity: 1;
71+
margin-top: -1.25em;
7172
@extend ._booting:before, %user-select-none;
7273
}
7374

74-
._splash-sponsor {
75+
._splash-sponsors {
7576
position: absolute;
76-
display: block;
77-
bottom: 1.25rem;
78-
right: 1rem;
77+
top: 50%;
78+
left: 0;
79+
right: 0;
80+
margin-top: 1.25rem;
81+
text-align: center;
82+
line-height: 2rem;
83+
}
7984

80-
._logo-thx { opacity: .25; }
81-
&:hover ._logo-thx { opacity: .5; }
85+
._splash-sponsor {
86+
position: relative;
87+
display: inline-block;
88+
vertical-align: top;
89+
margin: .5rem 1.5rem;
8290

83-
& + & {
84-
left: 1rem;
85-
right: auto;
91+
._logo-thx { opacity: .3; }
92+
&:hover ._logo-thx { opacity: .6; }
8693

87-
._logo-info {
88-
right: auto;
89-
left: 0;
90-
}
94+
._logo-info {
95+
right: 50%;
96+
margin-right: -9rem;
9197
}
9298
}
9399

@@ -409,54 +415,79 @@
409415
margin-bottom: .75rem;
410416
padding: .5rem .75rem;
411417
line-height: 1.375rem;
418+
text-align: left;
412419
pointer-events: none;
413420
@extend %notif;
414421

415422
:hover > & { opacity: 1; }
416423
}
417424

418-
._maxcdn-logo {
419-
width: 6.25rem;
420-
background-image: image-url('maxcdn.png');
421-
background-size: 6.25rem 1rem;
425+
._shopify-logo {
426+
width: 5.5rem;
427+
background-image: image-url('shopify.png');
428+
background-size: 5.5rem 1.5rem;
422429

423430
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
424-
background-image: image-url('maxcdn@2x.png');
431+
background-image: image-url('shopify@2x.png');
425432
}
426433
}
427434

428-
._splash-sponsor > ._maxcdn-logo {
429-
background-image: image-url('maxcdn-bw.png');
435+
._splash-sponsor > ._shopify-logo {
436+
background-image: image-url('shopify-bw.png');
430437

431438
@if $style == 'dark' {
432439
filter: invert(100%);
433440
-webkit-filter: invert(100%);
434441
}
435442

436443
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
437-
background-image: image-url('maxcdn[email protected]');
444+
background-image: image-url('shopify[email protected]');
438445
}
439446
}
440447

441-
._shopify-logo {
442-
width: 5.5rem;
443-
background-image: image-url('shopify.png');
444-
background-size: 5.5rem 1.5rem;
448+
._jetbrains-logo {
449+
top: 1px;
450+
width: 5rem;
451+
background-image: image-url('jetbrains.png');
452+
background-size: 5rem 1.5rem;
445453

446454
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
447-
background-image: image-url('shopify@2x.png');
455+
background-image: image-url('jetbrains@2x.png');
448456
}
449457
}
450458

451-
._splash-sponsor > ._shopify-logo {
452-
background-image: image-url('shopify-bw.png');
459+
._splash-sponsor > ._jetbrains-logo {
460+
background-image: image-url('jetbrains-bw.png');
453461

454462
@if $style == 'dark' {
455463
filter: invert(100%);
456464
-webkit-filter: invert(100%);
457465
}
458466

459467
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
460-
background-image: image-url('[email protected]');
468+
background-image: image-url('[email protected]');
469+
}
470+
}
471+
472+
._code-school-logo {
473+
width: 7rem;
474+
background-image: image-url('code-school.png');
475+
background-size: 7rem 1.25rem;
476+
477+
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
478+
background-image: image-url('[email protected]');
479+
}
480+
}
481+
482+
._splash-sponsor > ._code-school-logo {
483+
background-image: image-url('code-school-bw.png');
484+
485+
@if $style == 'dark' {
486+
filter: invert(100%);
487+
-webkit-filter: invert(100%);
488+
}
489+
490+
@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
491+
background-image: image-url('[email protected]');
461492
}
462493
}

‎assets/stylesheets/components/_mobile.scss

+18-2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,22 @@
9090
box-shadow: 0 1px $noteGreenBorder, 0 -1px $noteGreenBorder;
9191
}
9292

93+
// Splash
94+
95+
._splash-sponsors { margin-top: 1rem; }
96+
97+
._splash-sponsor {
98+
position: static;
99+
100+
._logo-info {
101+
left: 1rem;
102+
right: 1rem;
103+
width: auto;
104+
max-width: none;
105+
margin: 0;
106+
}
107+
}
108+
93109
// Notice
94110

95111
._notice {
@@ -189,9 +205,9 @@
189205
position: static;
190206
float: none;
191207
display: block;
192-
margin-top: 1.25rem;
208+
margin-top: .75rem;
193209
text-align: center;
194210
}
195211

196-
._intro-sponsor { margin: 0 1em; }
212+
._intro-sponsor { margin: .5em .75em; }
197213
}

‎assets/stylesheets/components/_notif.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,15 @@
5555
overflow-y: auto;
5656

5757
> ._notif-title {
58-
margin: -.125rem 0 1em;
58+
margin-bottom: .5rem;
5959
text-align: center;
6060
}
6161

6262
> ._news-row {
6363
line-height: 1.125rem;
6464
font-size: .6875rem;
6565
color: $notifColorLight;
66+
margin-bottom: .25rem;
6667

6768
+ ._news-row { margin-top: .75rem; }
6869
}

‎assets/stylesheets/global/_variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $focusBorder: #d4d4d4;
2020
$focusText: #000;
2121

2222
$loadingText: #e6e6e6;
23-
$splashText: #d7d7d7;
23+
$splashText: #bbb;
2424
$promoText: #bbb;
2525

2626
$selectionBackground: #398df0;

‎assets/stylesheets/global/variables-dark.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ $focusBackground: #3d3d3e;
1919
$focusBorder: #3d3d3e;
2020
$focusText: #f7f2f2;
2121

22-
$loadingText: #616161;
23-
$splashText: #616161;
24-
$promoText: #616161;
22+
$loadingText: #666;
23+
$splashText: #666;
24+
$promoText: #666;
2525

2626
$selectionBackground: #346fce;
2727
$selectionBorder: #346fce;

0 commit comments

Comments
 (0)