Skip to content

Commit 520edd9

Browse files
scottgonzalezscottgonzalez
committed
IMPORT jquery updates
1 parent 28324e8 commit 520edd9

File tree

4 files changed

+42
-37
lines changed

4 files changed

+42
-37
lines changed

‎jquery/css/base.css

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,25 @@ pre {
238238
* Improves readability of pre-formatted text in all browsers.
239239
*/
240240

241-
pre {
241+
pre, code {
242242
white-space: pre;
243243
white-space: pre-wrap;
244244
word-wrap: break-word;
245+
word-spacing: 0;
246+
font-size: 13px;
247+
line-height: 16px;
248+
}
249+
code {
250+
padding: 0 3px;
251+
background-color: #eee;
252+
border-radius: 3px;
253+
}
254+
pre code {
255+
background-color: transparent;
256+
font-size: 16px;
257+
font-weight: bold;
258+
white-space: pre;
259+
word-wrap: normal;
245260
}
246261

247262
/*
@@ -697,7 +712,6 @@ table {
697712

698713
[class^="icon-"],
699714
[class*=" icon-"] {
700-
font-family: FontAwesome;
701715
font-weight: normal;
702716
font-style: normal;
703717
text-decoration: inherit;
@@ -1205,8 +1219,8 @@ ul.icons li [class*=" icon-"] {
12051219
.icon-folder-open-alt:before { content: "\f115"; }
12061220

12071221
/* Manual Font Awesome Styles */
1208-
[class^="icon-"],
1209-
[class*=" icon-"] {
1222+
[class^="icon-"]::before, [class^="icon-"]::after,
1223+
[class*=" icon-"]::before, [class*=" icon-"]::after {
12101224
font-family: FontAwesome, "Helvetica Neue", Helvetica, Arial, sans-serif;
12111225
}
12121226

@@ -1890,23 +1904,6 @@ hr {
18901904
margin: .75em 0;
18911905
}
18921906

1893-
pre, code {
1894-
font: 13px/16px "source-code-pro", Consolas, monospace;
1895-
word-spacing: 0;
1896-
}
1897-
1898-
code {
1899-
padding: 0 3px;
1900-
background-color: #eee;
1901-
border-radius: 3px;
1902-
white-space: pre;
1903-
}
1904-
1905-
pre code {
1906-
background-color: transparent;
1907-
font-size: 16px;
1908-
font-weight: bold;
1909-
}
19101907
#content code a {
19111908
text-decoration: none;
19121909
}
@@ -2796,18 +2793,18 @@ footer li img {
27962793
position: relative;
27972794
}
27982795

2799-
.toc-linked a {
2796+
.toc-linked .toc-link {
28002797
position: absolute;
28012798
left: -1em;
28022799
text-decoration: none;
28032800
opacity: 0;
28042801
}
28052802
/* TODO: Remove (https://github.com/jquery/jquery-wp-content/issues/143) */
2806-
#content .toc-linked a {
2803+
#content .toc-linked .toc-link {
28072804
text-decoration: none;
28082805
}
28092806

2810-
.toc-linked:hover a {
2807+
.toc-linked:hover .toc-link {
28112808
opacity: 1;
28122809
}
28132810

@@ -3170,7 +3167,12 @@ footer li img {
31703167
}
31713168

31723169
#logo-events aside {
3173-
display: none;
3170+
display: inline-block;
3171+
position: relative;
3172+
left: 50%;
3173+
margin-left: -200px;
3174+
float: none;
3175+
padding: 10px 0;
31743176
}
31753177

31763178
#logo-events h2.logo {
@@ -3285,6 +3287,11 @@ footer li img {
32853287
display: none;
32863288
}
32873289

3290+
#logo-events aside {
3291+
width: 300px;
3292+
margin-left: -150px;
3293+
}
3294+
32883295
#container {
32893296
border-top: none !important;
32903297
}

‎jquery/footer-qunit.php

Lines changed: 4 additions & 4 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="//code.jquery.com/qunit/qunit-1.12.0.css" readonly>
11+
<input value="//code.jquery.com/qunit/qunit-1.13.0.css" readonly>
1212
</div>
1313
<div class="cdn">
1414
<strong>CDN <em>JS</em></strong>
15-
<input value="//code.jquery.com/qunit/qunit-1.12.0.js" readonly>
15+
<input value="//code.jquery.com/qunit/qunit-1.13.0.js" readonly>
1616
</div>
1717
<div class="download">
18-
<strong>Download QUnit 1.12.0:</strong>
19-
<span><a href="http://code.jquery.com/qunit/qunit-1.12.0.js">qunit.js</a><a href="http://code.jquery.com/qunit/qunit-1.12.0.css">qunit.css</a></span>
18+
<strong>Download QUnit 1.13.0:</strong>
19+
<span><a href="http://code.jquery.com/qunit/qunit-1.13.0.js">qunit.js</a><a href="http://code.jquery.com/qunit/qunit-1.13.0.css">qunit.css</a></span>
2020
</div>
2121
<ul class="footer-icon-links">
2222
<li><a class="icon-github" href="http://github.com/jquery/qunit">GitHub <small>QUnit <br>Source</small></a></li>

‎jquery/footer-ui.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
<h3><span>Quick Access</span></h3>
99
<div class="cdn">
1010
<strong>CDN <em>CSS</em></strong>
11-
<input value="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" readonly>
11+
<input value="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css" readonly>
1212
</div>
1313
<div class="cdn">
1414
<strong>CDN <em>JS</em></strong>
15-
<input value="//code.jquery.com/jquery-1.9.1.js" readonly>
15+
<input value="//code.jquery.com/jquery-1.10.2.js" readonly>
1616
</div>
1717
<div class="cdn">
1818
<strong>CDN <em>JS</em></strong>
19-
<input value="//code.jquery.com/ui/1.10.3/jquery-ui.js" readonly>
19+
<input value="//code.jquery.com/ui/1.10.4/jquery-ui.js" readonly>
2020
</div>
2121
<div class="download">
22-
<div><strong>Download jQuery UI 1.10.3 (for jQuery 1.6+):</strong></div>
22+
<div><strong>Download jQuery UI 1.10.4 (for jQuery 1.6+):</strong></div>
2323
<span>
24-
<a href="http://jqueryui.com/resources/download/jquery-ui-1.10.3.zip">Development Bundle</a>
25-
<a href="http://jqueryui.com/resources/download/jquery-ui-themes-1.10.3.zip">Themes</a>
24+
<a href="http://jqueryui.com/resources/download/jquery-ui-1.10.4.zip">Development Bundle</a>
25+
<a href="http://jqueryui.com/resources/download/jquery-ui-themes-1.10.4.zip">Themes</a>
2626
<a href="http://jqueryui.com/download/">Download Builder →</a>
2727
</span>
2828
</div>

‎jquery/header.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
</li>
8080
<li class="dropdown"><a href="http://events.jquery.org/">Events</a>
8181
<ul class="wide">
82-
<li><a href="http://modernweb.com/training/jquery-dec-2013.php">Dec 17-19 | jQuery Virtual Training</a></li>
83-
<li><a href="http://www.deque.com/register-javascript-accessibility-summit">Jan 16-17 | jQuery Accessibility Summit</a></li>
8482
<li><a href="http://events.jquery.org/2014/san-diego/">Feb 12-13 | jQuery San Diego</a></li>
8583
<li><a href="http://www.gentics.com/jquery-europe">Feb 28-Mar 1 | jQuery Europe</a></li>
8684
<li><a href="http://jqueryuk.com">May 16 | jQuery UK</a></li>

0 commit comments

Comments
 (0)