Skip to content

Commit c8f1fc3

Browse files
scottgonzalezscottgonzalez
committed
IMPORT jquery updates.
1 parent 2c8e974 commit c8f1fc3

16 files changed

+158
-47
lines changed

‎jquery.com/i/try-jquery.jpg

25.5 KB
Loading

‎jquery.com/i/try-jquery@2x.jpg

63.8 KB
Loading

‎jquery.com/i/whos-using-sprite.png

-2.39 KB
Loading

‎jquery.com/style.css

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ a,
1414

1515
/* Home Page */
1616

17+
#home-content {
18+
margin-bottom: 15px;
19+
}
20+
1721
#banner-secondary a,
1822
#banner-secondary a:hover {
1923
color: #b3b3b3;
@@ -52,7 +56,7 @@ a,
5256
-webkit-transition: all 0.7s linear;
5357
-webkit-transform: rotate(6.28rad);
5458
transition: all 0.7s;
55-
transform: rorate(6.28rad);
59+
transform: rotate(6.28rad);
5660
}
5761

5862
#content #banner-secondary .downloads-box p {
@@ -112,13 +116,20 @@ a,
112116
}
113117

114118
#content li.try-jquery a {
115-
background: url('i/try-jquery.png') top left no-repeat;
116-
height: 221px;
117-
width: 220px;
119+
background: url('i/try-jquery.jpg') top left no-repeat;
120+
background-size: 100%;
121+
height: 126px;
122+
width: 277px;
118123
text-indent: -9999px;
119124
display: block;
120125
}
121126

127+
@media only screen and (-webkit-device-pixel-ratio: 2) {
128+
#content li.try-jquery a {
129+
background-image: url('i/try-jquery@2x.jpg');
130+
}
131+
}
132+
122133
#content #whos-using li {
123134
background: none;
124135
}
@@ -134,7 +145,7 @@ a,
134145
background-position: 0 -80px;
135146
}
136147

137-
#whos-using li a.backbone {
148+
#whos-using li a.maxcdn {
138149
background-position: 0 -160px;
139150
}
140151

‎jquery/content/books/jquery-ui-cookbook.jpg

7.06 KB
Loading

‎jquery/content/books/learning-jquery-4th-ed.jpg

6.86 KB
Loading

‎jquery/css/base.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2329,17 +2329,15 @@ input[type="submit"].dark:hover {
23292329
}
23302330

23312331
#sidebar li {
2332-
padding-left: 20px;
2333-
line-height: 15px;
2332+
padding: 5px 0 5px 20px;
23342333
list-style-type: none;
2335-
background: url(../images/bullet.png) no-repeat 0 14px;
2334+
background: url(../images/bullet.png) no-repeat 0 12px;
23362335
text-shadow: 0 1px 0 #ffffff;
23372336
}
23382337

23392338
#sidebar li a {
23402339
color: #4d4d4d;
23412340
text-decoration: none;
2342-
padding: 8px 0;
23432341
display: block;
23442342
}
23452343

@@ -2952,14 +2950,14 @@ footer li img {
29522950
margin-top: 1em;
29532951
}
29542952

2955-
#options, #methods, #events, #quick-nav {
2953+
#options, #methods, #extension-points, #events, #quick-nav {
29562954
border: 1px solid #CCC;
29572955
margin: 0 15px 15px;
29582956
padding: 10px;
29592957
overflow: auto;
29602958
}
29612959

2962-
#options header h2, #methods header h2, #events header h2, #quick-nav h2 {
2960+
#options header h2, #methods header h2, #extension-points header h2, #events header h2, #quick-nav h2 {
29632961
background: #cccccc; /* Old browsers */
29642962
background: -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 17%,#cccccc 100%); /* Chrome10+,Safari5.1+ */
29652963
background: linear-gradient(to bottom, #ffffff 0%,#eeeeee 17%,#cccccc 100%); /* W3C */
@@ -2980,11 +2978,13 @@ footer li img {
29802978
}
29812979

29822980
#methods .api-item li,
2981+
#extension-points .api-item li,
29832982
#events .api-item li {
29842983
margin-bottom: 1em;
29852984
}
29862985

29872986
#methods .api-item li ul,
2987+
#extension-points .api-item li ul,
29882988
#events .api-item li ul {
29892989
list-style: none;
29902990
}

‎jquery/footer-mobile.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
<h3><span>Quick Access</span></h3>
99
<div class="cdn">
1010
<strong>CDN <em>CSS</em></strong>
11-
<input value="http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.css">
11+
<input value="http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.css" readonly>
1212
</div>
1313
<div class="cdn">
1414
<strong>CDN <em>JS</em></strong>
15-
<input value="http://code.jquery.com/jquery-1.9.1.min.js">
15+
<input value="http://code.jquery.com/jquery-1.9.1.min.js" readonly>
1616
</div>
1717
<div class="cdn">
1818
<strong>CDN <em>JS</em></strong>
19-
<input value="http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.js">
19+
<input value="http://code.jquery.com/mobile/1.3.2/jquery.mobile-1.3.2.min.js" readonly>
2020
</div>
2121
<div class="download">
2222
<strong>Download jQuery Mobile 1.3.2:</strong>

‎jquery/footer-qunit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<h3><span>Quick Access</span></h3>
99
<div class="cdn">
1010
<strong>CDN <em>CSS</em></strong>
11-
<input value="http://code.jquery.com/qunit/qunit-1.12.0.css">
11+
<input value="http://code.jquery.com/qunit/qunit-1.12.0.css" readonly>
1212
</div>
1313
<div class="cdn">
1414
<strong>CDN <em>JS</em></strong>
15-
<input value="http://code.jquery.com/qunit/qunit-1.12.0.js">
15+
<input value="http://code.jquery.com/qunit/qunit-1.12.0.js" readonly>
1616
</div>
1717
<div class="download">
1818
<strong>Download QUnit 1.12.0:</strong>

‎jquery/footer-ui.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
<h3><span>Quick Access</span></h3>
99
<div class="cdn">
1010
<strong>CDN <em>CSS</em></strong>
11-
<input value="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
11+
<input value="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" readonly>
1212
</div>
1313
<div class="cdn">
1414
<strong>CDN <em>JS</em></strong>
15-
<input value="http://code.jquery.com/jquery-1.9.1.js">
15+
<input value="http://code.jquery.com/jquery-1.9.1.js" readonly>
1616
</div>
1717
<div class="cdn">
1818
<strong>CDN <em>JS</em></strong>
19-
<input value="http://code.jquery.com/ui/1.10.3/jquery-ui.js">
19+
<input value="http://code.jquery.com/ui/1.10.3/jquery-ui.js" readonly>
2020
</div>
2121
<div class="download">
2222
<div><strong>Download jQuery UI 1.10.3 (for jQuery 1.6+):</strong></div>
@@ -50,6 +50,13 @@
5050
<cite>Adam Boduch</cite>
5151
</a>
5252
</li>
53+
<li>
54+
<a href="http://www.packtpub.com/jquery-userinterface-cookbook/book">
55+
<span><img src="<?php echo get_template_directory_uri(); ?>/content/books/jquery-ui-cookbook.jpg" alt="jQuery UI Cookbook by Adam Boduch" width="92" height="114"></span>
56+
<strong>jQuery UI Cookbook</strong><br>
57+
<cite>Adam Boduch</cite>
58+
</a>
59+
</li>
5360
</ul>
5461
</div>
5562
</div>

‎jquery/footer.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<h3><span>Quick Access</span></h3>
99
<div class="cdn">
1010
<strong>CDN</strong>
11-
<input value="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js">
11+
<input value="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js" readonly>
1212
</div>
1313
<div class="download">
1414
<strong><a href="http://jquery.com/download/">Download jQuery 1.10.2 →</a></strong>
@@ -24,9 +24,9 @@
2424
<h3><span>Books</span></h3>
2525
<ul class="books">
2626
<li>
27-
<a href="http://link.packtpub.com/S3Fr9Q">
28-
<span class="bottom"><img src="<?php echo get_template_directory_uri(); ?>/content/books/learning-jquery-3rd-ed.jpg" alt="Learning jQuery 3rd Edition by Karl Swedberg and Jonathan Chaffer" width="92" height="114" /></span>
29-
<strong>Learning jQuery Third Edition</strong><br />
27+
<a href="http://www.packtpub.com/learning-jquery-with-simple-javascript-techniques-fourth-edition/book">
28+
<span class="bottom"><img src="<?php echo get_template_directory_uri(); ?>/content/books/learning-jquery-4th-ed.jpg" alt="Learning jQuery 4th Edition by Karl Swedberg and Jonathan Chaffer" width="92" height="114" /></span>
29+
<strong>Learning jQuery Fourth Edition</strong><br />
3030
<cite>Karl Swedberg and Jonathan Chaffer</cite>
3131
</a>
3232
</li>

‎jquery/functions.jquery.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,3 +166,14 @@ function jq_post_heirarchy() {
166166
'Posted in: ' . implode( ' > ', array_reverse( $parents ) ) .
167167
'</div>';
168168
}
169+
170+
function jq_logo_link() {
171+
// TODO: remove when blog.jquery.com-theme is gone
172+
if ( !function_exists( 'jquery_sites' ) ) {
173+
return '/';
174+
}
175+
176+
$sites = jquery_sites();
177+
return empty( $sites[ JQUERY_LIVE_SITE ][ 'logo_link' ] ) ? '/' :
178+
$sites[ JQUERY_LIVE_SITE ][ 'logo_link' ];
179+
}

‎jquery/header.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,14 @@
7979
</li>
8080
<li class="dropdown"><a href="http://events.jquery.org/">Events</a>
8181
<ul class="wide">
82-
<li><a href="http://events.jquery.org/2013/austin/#training">Sep 9 | jQuery Training Austin</a></li>
83-
<li><a href="http://events.jquery.org/2013/austin/">Sep 10-11 | jQuery Conference Austin</a></li>
84-
<li><a href="http://jquery.itmozg.ru/">Oct 15 | jQuery Russia 2013</a></li>
82+
<li><a href="http://www.deque.com/deque-partners-jquery-create-accessibility-summit">Oct 10-11 | jQuery Accessibility Summit</a></li>
83+
<li><a href="http://jquery.itmozg.ru/">Oct 15 | jQuery Russia</a></li>
84+
<li><a href="http://modernweb.com/training/jquery-oct-2013.php">Oct 15-17 | jQuery Virtual Training</a></li>
8585
<li><a href="http://2013.cssdevconf.com/">Oct 21-22 | CSS Dev Conf</a></li>
8686
<li><a href="http://javascriptsummit.com/">Nov 19-21 | JavaScript Summit</a></li>
87+
<li><a href="http://events.jquery.org/2014/san-diego/">Feb 12-13 | jQuery San Diego</a></li>
88+
<li><a href="http://www.gentics.com/jquery-europe">Feb 28-Mar 1 | jQuery Europe</a></li>
89+
<li><a href="http://jqueryuk.com">May 16 | jQuery UK</a></li>
8790
</ul>
8891
</li>
8992
<li class="dropdown"><a href="https://jquery.org/support/">Support</a>
@@ -113,7 +116,7 @@
113116

114117
<div id="container">
115118
<div id="logo-events" class="constrain clearfix">
116-
<h2 class="logo"><a href="/" title="<?php bloginfo( 'name' ); ?>"><?php bloginfo( 'name' ); ?></a></h2>
119+
<h2 class="logo"><a href="<?php echo jq_logo_link(); ?>" title="<?php bloginfo( 'name' ); ?>"><?php bloginfo( 'name' ); ?></a></h2>
117120

118121
<aside><?php jq_banner(); ?></aside>
119122
</div>

‎jquery/menu-header.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ function menu_header_qunitjs_com() {
5555

5656
function menu_header_jquerymobile_com() {
5757
return array(
58+
'http://jquerymobile.com/demos/' => 'Demos',
5859
'http://api.jquerymobile.com/' => 'API Documentation',
59-
'http://jquerymobile.com/download/' => 'Download',
60-
'http://jquerymobile.com/gbs/' => 'Platforms',
6160
'http://jquerymobile.com/themeroller/' => 'Themes',
6261
'http://jquerymobile.com/resources/' => 'Resources',
6362
'http://blog.jquerymobile.com/' => 'Blog',
63+
'http://jquerymobile.com/about/' => 'About'
6464
);
6565
}
6666

‎jquerymobile.com/style.css

Lines changed: 85 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,83 @@ a, .title, .entry-title { color: #108040; }
2323
box-shadow: rgba(255,255,255,0.1) 0 1px 0, rgba(0,0,0,0.2) 0 -1px 0, inset rgba(80,118,17,0.5) 0 -3px 5px;
2424
}
2525

26-
.page-header { margin-right: 400px; }
26+
#banner-secondary p.intro {
27+
padding: 0;
28+
float: left;
29+
width: 50%;
30+
}
31+
32+
#banner-secondary .download-box {
33+
border: 1px solid #aaa;
34+
background: #333;
35+
background: -moz-linear-gradient(left, #333 0%, #444 100%);
36+
background: -webkit-linear-gradient(left, #333 0%, #444 100%);
37+
background: -o-linear-gradient(left, #333 0%, #444 100%);
38+
background: linear-gradient(to right, #333 0%, #444 100%);
39+
float: right;
40+
width: 40%;
41+
text-align: center;
42+
font-size: 20px;
43+
padding: 10px;
44+
border-radius: 5px;
45+
box-shadow: 0 0 8px rgba(0, 0, 0, 0.8);
46+
}
47+
48+
#banner-secondary .download-box h2 {
49+
color: #71D1FF;
50+
font-size: 26px;
51+
}
52+
53+
#banner-secondary .download-box .button {
54+
float: none;
55+
display: block;
56+
margin-top: 15px;
57+
}
58+
59+
#banner-secondary .download-box p {
60+
margin: 15px 0 5px;
61+
}
62+
63+
#banner-secondary .download-option {
64+
width: 45%;
65+
float: left;
66+
font-size: 16px;
67+
}
68+
69+
#banner-secondary .download-notlatest {
70+
float: right;
71+
}
72+
73+
#banner-secondary .download-option span {
74+
display: block;
75+
font-size: 14px;
76+
color: #71D1FF;
77+
}
78+
79+
#content .dev-links {
80+
float: right;
81+
width: 30%;
82+
margin: -15px -25px .5em 1em;
83+
padding: 1em;
84+
border: 1px solid #666;
85+
border-width: 0 0 1px 1px;
86+
border-radius: 0 0 0 5px;
87+
box-shadow: -2px 2px 10px -2px #666;
88+
}
89+
90+
#content .dev-links ul {
91+
margin: 0;
92+
}
93+
94+
#content .dev-links li {
95+
padding: 0;
96+
margin: .25em 0 .25em 1em;
97+
background-image: none;
98+
}
99+
100+
#try {
101+
margin-top: 10px;
102+
}
27103

28104
#manufacturers {
29105
list-style: none;
@@ -34,6 +110,7 @@ a, .title, .entry-title { color: #108040; }
34110
left: -10px;
35111
}
36112

113+
37114
#manufacturers,
38115
#manufacturers a:hover {
39116
background: url(http://cdn.jquery.net/mobile/wp-content/themes/jquery-mobile/images/manufacturers.png) -11px -5px no-repeat;
@@ -47,6 +124,13 @@ a, .title, .entry-title { color: #108040; }
47124
margin-bottom: 20px;
48125
}
49126

127+
#content div ul li {
128+
background: none;
129+
padding-bottom: 0px;
130+
padding-left: 0px;
131+
padding-top: 0px;
132+
}
133+
50134
.ie6 #manufacturers li,
51135
.ie6 #manufacturers li a {
52136
display: inline;

‎jqueryui.com/sidebar.php

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
<div id="sidebar" class="widget-area" role="complementary">
22
<aside class="widget">
3-
<h3 class="widget-title">Categories</h3>
3+
<h3 class="widget-title">Interactions</h3>
44
<ul>
5-
<?php wp_list_categories(array(
6-
'depth' => 1,
7-
'title_li' => '',
8-
'exclude' => '1'
9-
)); ?>
5+
<?php echo jq_page_links_for_category( 'interactions' ); ?>
106
</ul>
117
</aside>
128
<aside class="widget">
13-
<h3 class="widget-title">Recent Posts</h3>
9+
<h3 class="widget-title">Widgets</h3>
1410
<ul>
15-
<?php
16-
$recent_posts = wp_get_recent_posts(array(
17-
'post_status' => 'publish'
18-
));
19-
foreach( $recent_posts as $recent ){
20-
echo '<li><a href="' . get_permalink($recent["ID"]) . '">' . $recent["post_title"].'</a></li>';
21-
}
22-
?>
11+
<?php echo jq_page_links_for_category( 'widgets' ); ?>
2312
</ul>
2413
</aside>
2514
<aside class="widget">
26-
<h3 class="widget-title">Archives</h3>
15+
<h3 class="widget-title">Effects</h3>
2716
<ul>
28-
<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
17+
<?php echo jq_page_links_for_category( 'effects' ); ?>
18+
</ul>
19+
</aside>
20+
<aside class="widget">
21+
<h3 class="widget-title">Utilities</h3>
22+
<ul>
23+
<?php echo jq_page_links_for_category( 'utilities' ); ?>
2924
</ul>
3025
</aside>
3126
</div>

0 commit comments

Comments
 (0)