Skip to content

Commit 6ca4789

Browse files
ZhangYiJiangZhangYiJiang
committed
Minor fixes for everyone!
1 parent 09db0bf commit 6ca4789

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

‎doc/en/function/scopes.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Each time a variable is referenced, JavaScript will traverse upwards through all
2323
the scopes until it finds it. In the case that it reaches the global scope and
2424
still has not found the requested name, it will raise a `ReferenceError`.
2525

26-
### The bane of global variables
26+
### The Bane of Global Variables
2727

2828
// script A
2929
foo = '42';
@@ -70,7 +70,7 @@ overwrites the global value of `i`. Using a `var` for the second `for` loop woul
7070
have easily avoided this error. The `var` statement should **never** be left out
7171
unless the *desired effect* is to affect the outer scope.
7272

73-
### Local variables
73+
### Local Variables
7474

7575
The only source for local variables in JavaScript are
7676
[function](#function.general) parameters and variables that were declared via the
@@ -170,7 +170,7 @@ moved to the top of the *global scope*.
170170
SomeImportantThing = {};
171171
}
172172

173-
### Name resolution order
173+
### Name Resolution Order
174174

175175
All scopes in JavaScript, including the *global scope*, have the special name
176176
[`this`](#function.this) defined in them, which refers to the *current object*.
@@ -220,7 +220,7 @@ while different in syntax, do behave the exact same way.
220220
+function(){}();
221221
(function(){}());
222222

223-
### In conclusion
223+
### In Conclusion
224224

225225
It is recommended to always use an *anonymous wrapper* for encapsulating code in
226226
its own namespace. This does not only protect code against name clashes, it

‎doc/ru/core/semicolon.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@
6262
'и ещё одну на всякий случай'
6363
); // <- вставлена
6464

65-
return; // <- вставлена, в результате оператор return разбит на два блока
65+
return; // <- вставлена, в результате
66+
// оператор return разбит на два блока
6667
{ // теперь парсер считает этот блок отдельным
6768

6869
// метка и одинокое выражение

‎garden.jade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ html(lang=language)
8383
a(href='https://github.com/visionmedia/jade/') jade
8484
| template.
8585

86-
script(src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js')
86+
script(src='http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js')
8787

8888
- if (language === baseLanguage)
8989
script(src='javascript/prettify.js')

‎site/javascript/garden.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Sections.prototype = {
5252
}
5353

5454
if (articleID !== page.article) {
55-
nav.find('a[href=#' + page.article + ']').removeClass('active');
56-
nav.find('a[href=#' + articleID + ']').addClass('active');
55+
nav.find('a[href="#' + page.article + '"]').removeClass('active');
56+
nav.find('a[href="#' + articleID + '"]').addClass('active');
5757

5858
page.article = articleID;
5959
this.mobile(articleID);

‎site/style/garden.css‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ nav {
8383

8484
nav > div li {
8585
float: left;
86-
margin-right: 4px;
86+
margin-right: 1px;
8787
}
8888

8989
nav > div li a, #top, #hide_menu {
@@ -107,11 +107,11 @@ nav > div li.active a {
107107

108108
#nav_main > div {
109109
overflow: hidden;
110+
border-bottom: 1px solid #6E8294;
110111
}
111112

112113
#nav_main > div ul {
113114
float: left;
114-
height: 40px;
115115
}
116116

117117
nav li {
@@ -125,7 +125,7 @@ nav > ul li:last-child a {
125125
}
126126

127127
nav > ul > li {
128-
border-bottom: 1px solid rgba(255, 255, 255, 0.4);
128+
border-bottom: 1px solid #6E8294;
129129
}
130130

131131
/* Sprite map for sidebar icons */
@@ -191,7 +191,6 @@ nav a:hover, nav ul.active a:hover, nav a, nav li {
191191
display: none;
192192
}
193193

194-
195194
section {
196195
border-bottom: 4px dotted #8696a5;
197196
font-size: 16px;
@@ -272,7 +271,7 @@ section:after {
272271
top: 30px;
273272
right: -190px;
274273
font-size: 80px;
275-
color: rgba(255, 255, 255, 0.3);
274+
color: #566D82;
276275
width: 180px;
277276
text-align: center;
278277
}
@@ -331,6 +330,10 @@ aside {
331330
width: 180px;
332331
right: -190px;
333332
opacity: 0.7;
333+
334+
-moz-transition: opacity 0.3s;
335+
-webkit-transition: opacity 0.3s;
336+
-o-transition: opacity 0.3s;
334337
}
335338

336339
aside:last-child {
@@ -360,6 +363,8 @@ aside.es5:after {
360363
font-style: italic;
361364
top: -18px;
362365
right: -3px;
366+
367+
-ms-filter: “progid:DXImageTransform.Microsoft.Alpha(Opacity=25)”; /* Just kill me already... */
363368
opacity: 0.25;
364369
}
365370

@@ -418,7 +423,7 @@ a abbr {
418423

419424
/* Desktop override */
420425

421-
@media screen and (min-width: 1000px) {
426+
@media not device and screen and (min-width: 1000px) {
422427
#nav_main {
423428
display: block !important;
424429
top: 0 !important;
@@ -478,11 +483,6 @@ a abbr {
478483
margin-top: 10px;
479484
}
480485

481-
#nav_main > div {
482-
overflow: hidden;
483-
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
484-
}
485-
486486
#nav_main > div ul {
487487
height: auto;
488488
}

‎site/zh/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1764,4 +1764,4 @@ <h2>中文翻译</h2>
17641764
<a href="https://github.com/visionmedia/jade/">jade
17651765

17661766
</a>template.
1767-
</p></footer><script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script><script src="../javascript/prettify.js"></script><script src="../javascript/plugin.js"></script><script src="../javascript/garden.js"></script></body></html>
1767+
</p></footer><script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script><script src="../javascript/prettify.js"></script><script src="../javascript/plugin.js"></script><script src="../javascript/garden.js"></script></body></html>

0 commit comments

Comments
 (0)