Skip to content

Commit 3927ef5

Browse files
scottgonzalezscottgonzalez
committed
IMPORT jquery updates.
1 parent ba47be5 commit 3927ef5

File tree

9 files changed

+53
-44
lines changed

9 files changed

+53
-44
lines changed

‎jquery/archive.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
endwhile;
2626
?>
2727

28-
<?php twentyeleven_content_nav( 'nav-below' ); ?>
28+
<?php echo jq_content_nav(); ?>
2929
<?php else : ?>
3030
<article id="post-0" class="post no-results not-found">
3131
<header class="entry-header">

‎jquery/author.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
endwhile;
5454
?>
5555

56-
<?php twentyeleven_content_nav( 'nav-below' ); ?>
56+
<?php echo jq_content_nav(); ?>
5757

5858
<?php else : ?>
5959

‎jquery/category.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
endwhile;
3030
?>
3131

32-
<?php twentyeleven_content_nav( 'nav-below' ); ?>
32+
<?php echo jq_content_nav(); ?>
3333

3434
<?php else : ?>
3535

‎jquery/css/base.css

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ iframe {
959959
}
960960

961961
.jquery-foundation #container {
962-
background: #131B28;
962+
background: #333;
963963
}
964964

965965
.jquery-learn #container {
@@ -1021,18 +1021,10 @@ iframe {
10211021
float: right;
10221022
margin-right: -25px;
10231023
position: relative;
1024-
-moz-border-image: -moz-linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
1025-
-webkit-border-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(15%, #e7e7e7), color-stop(85%, #e7e7e7), color-stop(100%, #ffffff));
10261024
-webkit-border-image: -webkit-linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
1027-
-o-border-image: -o-linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
10281025
border-image: linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
1029-
-webkit-box-shadow: inset 15px 0 5px -16px #e7e7e7;
10301026
box-shadow: inset 15px 0 5px -16px #e7e7e7;
1031-
background-image: -webkit-gradient(radial, 0% 50%, 0, 0% 50%, 80, color-stop(0%, #f2f2f2), color-stop(80%, #ffffff));
10321027
background-image: -webkit-radial-gradient(left, #f2f2f2, #ffffff 80%);
1033-
background-image: -moz-radial-gradient(left, #f2f2f2, #ffffff 80%);
1034-
background-image: -o-radial-gradient(left, #f2f2f2, #ffffff 80%);
1035-
background-image: -ms-radial-gradient(left, #f2f2f2, #ffffff 80%);
10361028
background-image: radial-gradient(left, #f2f2f2, #ffffff 80%);
10371029
border: 0;
10381030
border-left: 1px solid #efefef;
@@ -1045,18 +1037,10 @@ iframe {
10451037
border-left: 0;
10461038
border-right: 1px solid #e7e7e7;
10471039
margin: -20px 0 0 -25px;
1048-
-moz-border-image: -moz-linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
1049-
-webkit-border-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(15%, #e7e7e7), color-stop(85%, #e7e7e7), color-stop(100%, #ffffff));
10501040
-webkit-border-image: -webkit-linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
1051-
-o-border-image: -o-linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
10521041
border-image: linear-gradient(#ffffff, #e7e7e7 15%, #e7e7e7 85%, #ffffff);
1053-
-webkit-box-shadow: inset 15px 0 5px -16px #e7e7e7;
10541042
box-shadow: inset 15px 0 5px -16px #e7e7e7;
1055-
background-image: -webkit-gradient(radial, 0% 50%, 0, 0% 50%, 80, color-stop(0%, #f2f2f2), color-stop(80%, #ffffff));
10561043
background-image: -webkit-radial-gradient(right, #f2f2f2, #ffffff 80%);
1057-
background-image: -moz-radial-gradient(right, #f2f2f2, #ffffff 80%);
1058-
background-image: -o-radial-gradient(right, #f2f2f2, #ffffff 80%);
1059-
background-image: -ms-radial-gradient(right, #f2f2f2, #ffffff 80%);
10601044
background-image: radial-gradient(right, #f2f2f2, #ffffff 80%);
10611045
}
10621046

@@ -1390,7 +1374,7 @@ h2.logo a {
13901374
}
13911375
.jquery-events.logo.small {
13921376
width: 109px;
1393-
background-position: -218px 0px;
1377+
background-position: -219px 0px;
13941378
}
13951379
.jqueryui.logo.small {
13961380
width: 114px;
@@ -2010,8 +1994,8 @@ input[type="submit"].dark:hover {
20101994

20111995
#sidebar h3 {
20121996
font: 20px/18px;
2013-
background-image: -webkit-gradient(linear, left bottom, right bottom, from(#efefef), to(#f3f3f3));
2014-
background-image: -moz-linear-gradient(360deg, #efefef 0%, #f3f3f3 100%);
1997+
background-image: -webkit-linear-gradient(left, #efefef, #f3f3f3);
1998+
background-image: linear-gradient(to right, #efefef, #f3f3f3);
20151999
margin-left: -20px;
20162000
margin-right: -20px;
20172001
padding: 12px 20px;
@@ -2099,8 +2083,6 @@ footer .cdn strong {
20992083
text-shadow: #000 0 -1px 0;
21002084
font-weight: bold;
21012085
background-color: #7a7a7a;
2102-
background-image: -moz-linear-gradient(top, #7a7a7a, #5e5e5e); /* FF3.6 */
2103-
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #7a7a7a),color-stop(1, #5e5e5e)); /* Saf4+, Chrome */
21042086
background-image: -webkit-linear-gradient(#7a7a7a, #5e5e5e); /* Chrome 10+, Saf6 */
21052087
background-image: linear-gradient(top, #7a7a7a, #5e5e5e);
21062088
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#7a7a7a', EndColorStr='#5e5e5e'); /* IE6–IE9 */
@@ -2210,9 +2192,8 @@ footer .footer-icon-links li:hover a:before {
22102192
}
22112193

22122194
.multiplebgs.cssgradients footer {
2213-
background-image: -moz-linear-gradient(top, rgba(0,0,0,0.3), rgba(0,0,0,0.0)), url(../images/bg-footer-noise.jpg); /* FF3.6 */
2214-
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, rgba(0,0,0,0.3)),color-stop(1, rgba(0,0,0,0.0))), url(../images/bg-footer-noise.jpg); /* Saf4+, Chrome */
22152195
background-image: -webkit-linear-gradient(rgba(0,0,0,0.3), rgba(0,0,0,0.0)), url(../images/bg-footer-noise.jpg); /* Chrome 10+, Saf6 */
2196+
background-image: linear-gradient(to bottom, rgba(0,0,0,.3), rgba(0,0,0,0)), url(../images/bg-footer-noise.jpg); /* Firefox 16+, IE 10+, Opera 12.50+ */
22162197
background-repeat: repeat-x, repeat;
22172198
background-size: 100px 15px, 140px 140px;
22182199
}
@@ -2393,15 +2374,10 @@ footer .books li a > span:after {
23932374
left: 0;
23942375
right: 0;
23952376
bottom: 0;
2396-
background: -webkit-gradient(linear, 100% 0%, 55% 100%, from(rgba(255,255,255,0.02)), color-stop(0.5, rgba(255,255,255,0.1)), color-stop(0.505, rgba(255,255,255,0)), to(rgba(255,255,255,0)));
2397-
-webkit-background-clip: padding-box;
23982377
border: solid 1px rgba(255,255,255,0.2);
23992378
border-radius: 4px;
24002379
}
24012380

2402-
footer .presentations li a:hover > span:after,
2403-
footer .books li a:hover > span:after { background: -webkit-gradient(linear, 100% 0%, 55% 100%, from(rgba(255,255,255,0.02)), color-stop(0.5, rgba(255,255,255,0.3)), color-stop(0.505, rgba(255,255,255,0)), to(rgba(255,255,255,0))); }
2404-
24052381
footer .presentations li a > span img {
24062382
max-width: 100%;
24072383
height: auto;
@@ -2520,6 +2496,16 @@ footer li img {
25202496
text-decoration: none;
25212497
}
25222498

2499+
.pagination {
2500+
text-align: center;
2501+
margin-top: 2em;
2502+
}
2503+
2504+
.page-numbers {
2505+
padding: 0 10px;
2506+
}
2507+
2508+
25232509

25242510
/* API Sites
25252511
========================================================================== */
@@ -2611,10 +2597,7 @@ footer li img {
26112597

26122598
#options header h2, #methods header h2, #events header h2, #quick-nav h2 {
26132599
background: #cccccc; /* Old browsers */
2614-
background: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 17%, #cccccc 100%); /* FF3.6+ */
2615-
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(17%,#eeeeee), color-stop(100%,#cccccc)); /* Chrome,Safari4+ */
26162600
background: -webkit-linear-gradient(top, #ffffff 0%,#eeeeee 17%,#cccccc 100%); /* Chrome10+,Safari5.1+ */
2617-
background: -o-linear-gradient(top, #ffffff 0%,#eeeeee 17%,#cccccc 100%); /* Opera 11.10+ */
26182601
background: linear-gradient(to bottom, #ffffff 0%,#eeeeee 17%,#cccccc 100%); /* W3C */
26192602
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#cccccc',GradientType=0 ); /* IE6-9 */
26202603
margin: -10px -10px 10px -10px;

‎jquery/functions.jquery.php

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,24 @@ function jq_page_links_for_category( $category ) {
121121
}
122122

123123
function jq_get_github_url() {
124-
global $post;
125-
$source_path = get_post_meta( $post->ID, "source_path" );
126-
$github_prefix = 'https://github.com/jquery/' . get_stylesheet() . '/tree/master/' . $source_path[0];
127-
return $github_prefix;
124+
global $post;
125+
$source_path = get_post_meta( $post->ID, "source_path" );
126+
$github_prefix = 'https://github.com/jquery/' . get_stylesheet() . '/tree/master/' . $source_path[0];
127+
return $github_prefix;
128128
}
129129

130-
?>
130+
function jq_content_nav() {
131+
global $wp_query;
132+
133+
if ( $wp_query->max_num_pages == 1 ) {
134+
return '';
135+
}
136+
137+
$big = 999999999;
138+
return '<div class="pagination">' . paginate_links( array(
139+
'base' => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
140+
'format' => '?paged=%#%',
141+
'current' => max( 1, get_query_var('paged') ),
142+
'total' => $wp_query->max_num_pages
143+
)) . '</div>';
144+
}

‎jquery/header.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,22 @@
6767
</ul>
6868
<ul class="links">
6969
<li><a href="http://plugins.jquery.com/">Plugins</a></li>
70+
<li class="dropdown"><a href="http://contribute.jquery.org/">Contribute</a>
71+
<ul>
72+
<li><a href="http://contribute.jquery.org/cla/">CLA</a></li>
73+
<li><a href="http://contribute.jquery.org/style-guide/">Style Guides</a></li>
74+
<li><a href="http://contribute.jquery.org/triage/">Bug Triage</a></li>
75+
<li><a href="http://contribute.jquery.org/code/">Code</a></li>
76+
<li><a href="http://contribute.jquery.org/documentation/">Documentation</a></li>
77+
<li><a href="http://contribute.jquery.org/web-sites/">Web Sites</a></li>
78+
</ul>
79+
</li>
7080
<li class="dropdown"><a href="http://events.jquery.org/">Events</a>
7181
<ul>
7282
<li><a href="http://events.jquery.org/2013/eu/">Europe</a></li>
7383
<li><a href="http://jqueryto.com">Toronto</a></li>
74-
<li><a href="http://events.jquery.org/2013/UK/">UK</a></li>
84+
<li><a href="http://events.jquery.org/2013/uk/">UK</a></li>
85+
<li><a href="http://events.jquery.org/2013/portland/">Portland</a></li>
7586
</ul>
7687
</li>
7788
<li class="dropdown"><a href="#">Support</a>

‎jquery/menu-header.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88

99
function menu_header_jquery_com() {
1010
return array(
11-
'http://plugins.jquery.com/' => 'Plugins',
1211
'http://jquery.com/download/' => 'Download',
1312
'http://api.jquery.com/' => 'API Documentation',
13+
'http://blog.jquery.com/' => 'Blog',
14+
'http://plugins.jquery.com/' => 'Plugins',
1415
'http://jquery.com/browser-support/' => 'Browser Support',
1516
);
1617
}

‎jquery/search.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
endwhile;
2323
?>
2424

25-
<?php twentyeleven_content_nav( 'nav-below' ); ?>
25+
<?php echo jq_content_nav(); ?>
2626

2727
<?php else : ?>
2828

‎jquery/tag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
endwhile;
3030
?>
3131

32-
<?php twentyeleven_content_nav( 'nav-below' ); ?>
32+
<?php echo jq_content_nav(); ?>
3333

3434
<?php else : ?>
3535

0 commit comments

Comments
 (0)