Skip to content

Commit b63bc32

Browse files
committed
Update public distribution.
1 parent b229b13 commit b63bc32

23 files changed

+140
-64
lines changed

public/base/jquery.syntax.layout.editor.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.syntax-container.syntax-theme-base div.editor.syntax {
2-
background-color: white;
3-
border: 1px inset #aaaaaa;
42
padding: 0.2em !important;
53
margin: 0 !important;
64
white-space: pre; }
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
.syntax-container.syntax-theme-base div.fixed.syntax {
2-
background-color: #e3e3e3;
3-
border: 1px solid #aaaaaa;
42
padding: 0 !important;
53
margin: 0 !important; }
64
.syntax-container.syntax-theme-base div.fixed.syntax .numbers-column {
75
float: left;
86
text-align: right;
97
margin-right: 0em;
10-
width: 3em;
11-
color: #979797;
12-
background-color: #e3e3e3; }
8+
width: 3em; }
139
.syntax-container.syntax-theme-base div.fixed.syntax .numbers-column div {
1410
padding: 0 0.4em 0 !important; }
1511
.syntax-container.syntax-theme-base div.fixed.syntax .code-column {
16-
border-left: 1px solid #aaaaaa;
17-
overflow: auto;
18-
background-color: #f0f0f0; }
12+
overflow: auto; }
1913
.syntax-container.syntax-theme-base div.fixed.syntax .code-column table {
2014
border-collapse: collapse;
2115
width: 100%;
2216
white-space: pre; }
2317
.syntax-container.syntax-theme-base div.fixed.syntax .code-column .source {
2418
margin: auto !important;
25-
color: #333333;
2619
padding: 0 0.4em 0 !important; }
27-
.syntax-container.syntax-theme-base div.fixed.syntax .code-column .source.alt {
28-
background-color: #f5f5f5; }

public/base/jquery.syntax.layout.inline.css

Whitespace-only changes.
Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
.syntax-container.syntax-theme-base ol.syntax {
2-
background-color: #e3e3e3;
3-
border: 1px solid #aaaaaa;
42
padding: 0 0 0 5em !important;
53
margin: 0 !important; }
64
.syntax-container.syntax-theme-base ol.syntax li {
75
padding: 0 !important;
86
margin: 0 !important;
9-
color: #979797;
107
/* CSS2.1 */
118
white-space: pre-wrap;
129
/* Mozilla, since 1999 */
@@ -17,16 +14,9 @@
1714
word-wrap: break-word;
1815
_white-space: pre; }
1916
.syntax-container.syntax-theme-base ol.syntax li div.source {
20-
color: #333333;
2117
margin-left: -0.5em;
22-
border-left: 1px solid #aaaaaa;
23-
background-color: #f0f0f0;
2418
padding: 0 0.4em 0 !important; }
25-
.syntax-container.syntax-theme-base ol.syntax li.alt div.source {
26-
background-color: #f5f5f5; }
2719
.syntax-container.syntax-theme-base ul.syntax {
28-
background-color: #e3e3e3;
29-
border: 1px solid #aaaaaa;
3020
padding: 0 !important;
3121
margin: 0 !important;
3222
list-style-type: none; }
@@ -44,8 +34,4 @@
4434
_white-space: pre; }
4535
.syntax-container.syntax-theme-base ul.syntax li div.source {
4636
margin: 0 !important;
47-
color: #333333;
48-
background-color: #f0f0f0;
4937
padding: 0 0.4em 0 !important; }
50-
.syntax-container.syntax-theme-base ul.syntax li.alt div.source {
51-
background-color: #f5f5f5; }

public/base/jquery.syntax.layout.plain.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
.syntax-container.syntax-theme-base .syntax.plain {
2-
background-color: #f0f0f0;
3-
padding: 0.6em;
4-
border: 1px solid #aaaaaa; }
2+
padding: 0.6em; }
53
.syntax-container.syntax-theme-base .syntax.plain pre {
64
margin: 0;
75
font-family: inherit;
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
.syntax-container.syntax-theme-base table.syntax {
22
border-collapse: collapse;
3-
background-color: #f0f0f0;
4-
border: 1px solid #aaaaaa;
53
padding: 0 !important;
64
margin: 0 !important;
75
width: 100%; }
8-
.syntax-container.syntax-theme-base table.syntax tr.alt td.source {
9-
background-color: #f5f5f5; }
106
.syntax-container.syntax-theme-base table.syntax td.source {
117
padding: 0 0.4em 0;
12-
color: #333333;
138
/* CSS2.1 */
149
white-space: pre-wrap;
1510
/* Mozilla, since 1999 */
@@ -24,8 +19,5 @@
2419
user-select: none;
2520
-moz-user-select: none;
2621
-webkit-user-select: none;
27-
border-right: 1px solid #aaaaaa;
2822
text-align: right;
29-
width: 2.5em;
30-
color: #979797;
31-
background-color: #e3e3e3; }
23+
width: 2.5em; }

public/bright/theme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Syntax.themes["bright"] = ["base"]
1+
Syntax.themes["bright"] = ["grey", "base"]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.syntax-container.syntax-theme-grey div.editor.syntax {
2+
background-color: white;
3+
border: 1px inset #aaaaaa; }
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.syntax-container.syntax-theme-grey div.fixed.syntax {
2+
background-color: #e3e3e3;
3+
border: 1px solid #aaaaaa; }
4+
.syntax-container.syntax-theme-grey div.fixed.syntax .numbers-column {
5+
color: #979797;
6+
background-color: #e3e3e3; }
7+
.syntax-container.syntax-theme-grey div.fixed.syntax .code-column {
8+
border-left: 1px solid #aaaaaa;
9+
background-color: #f0f0f0; }
10+
.syntax-container.syntax-theme-grey div.fixed.syntax .code-column .source {
11+
color: #333333; }
12+
.syntax-container.syntax-theme-grey div.fixed.syntax .code-column .source.alt {
13+
background-color: #f5f5f5; }
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.syntax-container.syntax-theme-grey code.syntax {
2+
background-color: #f0f0f0; }
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.syntax-container.syntax-theme-grey ol.syntax {
2+
background-color: #e3e3e3;
3+
border: 1px solid #aaaaaa; }
4+
.syntax-container.syntax-theme-grey ol.syntax li {
5+
color: #979797; }
6+
.syntax-container.syntax-theme-grey ol.syntax li div.source {
7+
color: #333333;
8+
border-left: 1px solid #aaaaaa;
9+
background-color: #f0f0f0; }
10+
.syntax-container.syntax-theme-grey ol.syntax li.alt div.source {
11+
background-color: #f5f5f5; }
12+
.syntax-container.syntax-theme-grey ul.syntax {
13+
background-color: #e3e3e3;
14+
border: 1px solid #aaaaaa; }
15+
.syntax-container.syntax-theme-grey ul.syntax li div.source {
16+
color: #333333;
17+
background-color: #f0f0f0; }
18+
.syntax-container.syntax-theme-grey ul.syntax li.alt div.source {
19+
background-color: #f5f5f5; }
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.syntax-container.syntax-theme-grey .syntax.plain {
2+
background-color: #f0f0f0;
3+
border: 1px solid #aaaaaa; }
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.syntax-container.syntax-theme-grey table.syntax {
2+
background-color: #f0f0f0;
3+
border: 1px solid #aaaaaa; }
4+
.syntax-container.syntax-theme-grey table.syntax tr.alt td.source {
5+
background-color: #f5f5f5; }
6+
.syntax-container.syntax-theme-grey table.syntax td.source {
7+
color: #333333; }
8+
.syntax-container.syntax-theme-grey table.syntax td.number {
9+
border-right: 1px solid #aaaaaa;
10+
color: #979797;
11+
background-color: #e3e3e3; }

public/grey/theme.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Syntax.themes["grey"] = ["base"]

public/jquery.syntax.cache.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,31 @@ Syntax.alias("xml", []);
3939
Syntax.alias("yaml", []);
4040

4141
// CSS Extensions
42-
Syntax.styles["jquery.syntax.layout.list"] = ["base/jquery.syntax.layout.list.css"];
43-
Syntax.styles["jquery.syntax.layout.inline"] = ["base/jquery.syntax.layout.inline.css", "modern/jquery.syntax.layout.inline.css"];
44-
Syntax.styles["jquery.syntax.brush.ruby"] = ["base/jquery.syntax.brush.ruby.css"];
45-
Syntax.styles["jquery.syntax.layout.plain"] = ["base/jquery.syntax.layout.plain.css", "modern/jquery.syntax.layout.plain.css"];
46-
Syntax.styles["jquery.syntax.brush.xml"] = ["base/jquery.syntax.brush.xml.css"];
47-
Syntax.styles["jquery.syntax.brush.bash-script"] = ["base/jquery.syntax.brush.bash-script.css"];
48-
Syntax.styles["jquery.syntax.brush.assembly"] = ["base/jquery.syntax.brush.assembly.css"];
49-
Syntax.styles["jquery.syntax.brush.python"] = ["base/jquery.syntax.brush.python.css"];
42+
Syntax.styles["jquery.syntax.brush.protobuf"] = ["base/jquery.syntax.brush.protobuf.css"];
43+
Syntax.styles["jquery.syntax.brush.apache"] = ["base/jquery.syntax.brush.apache.css"];
5044
Syntax.styles["jquery.syntax.brush.css"] = ["base/jquery.syntax.brush.css.css"];
45+
Syntax.styles["jquery.syntax.layout.table"] = ["base/jquery.syntax.layout.table.css", "grey/jquery.syntax.layout.table.css"];
46+
Syntax.styles["jquery.syntax.core"] = ["base/jquery.syntax.core.css", "bright/jquery.syntax.core.css", "paper/jquery.syntax.core.css"];
47+
Syntax.styles["jquery.syntax.layout.inline"] = ["grey/jquery.syntax.layout.inline.css", "modern/jquery.syntax.layout.inline.css", "paper/jquery.syntax.layout.inline.css"];
48+
Syntax.styles["jquery.syntax.layout.editor"] = ["base/jquery.syntax.layout.editor.css", "grey/jquery.syntax.layout.editor.css", "modern/jquery.syntax.layout.editor.css"];
49+
Syntax.styles["jquery.syntax.brush.ocaml"] = ["base/jquery.syntax.brush.ocaml.css"];
50+
Syntax.styles["jquery.syntax.brush.bash-script"] = ["base/jquery.syntax.brush.bash-script.css"];
51+
Syntax.styles["jquery.syntax.layout.fixed"] = ["base/jquery.syntax.layout.fixed.css", "grey/jquery.syntax.layout.fixed.css", "paper/jquery.syntax.layout.fixed.css"];
5152
Syntax.styles["jquery.syntax.brush.clang"] = ["base/jquery.syntax.brush.clang.css"];
52-
Syntax.styles["jquery.syntax.brush.applescript"] = ["base/jquery.syntax.brush.applescript.css"];
53-
Syntax.styles["jquery.syntax.layout.fixed"] = ["base/jquery.syntax.layout.fixed.css"];
54-
Syntax.styles["jquery.syntax.layout.editor"] = ["base/jquery.syntax.layout.editor.css", "modern/jquery.syntax.layout.editor.css"];
55-
Syntax.styles["jquery.syntax.brush.protobuf"] = ["base/jquery.syntax.brush.protobuf.css"];
56-
Syntax.styles["jquery.syntax.layout.table"] = ["base/jquery.syntax.layout.table.css"];
53+
Syntax.styles["jquery.syntax.brush.ruby"] = ["base/jquery.syntax.brush.ruby.css"];
54+
Syntax.styles["jquery.syntax.brush.python"] = ["base/jquery.syntax.brush.python.css"];
5755
Syntax.styles["jquery.syntax.brush.bash"] = ["base/jquery.syntax.brush.bash.css"];
58-
Syntax.styles["jquery.syntax.core"] = ["base/jquery.syntax.core.css", "bright/jquery.syntax.core.css"];
56+
Syntax.styles["jquery.syntax.brush.assembly"] = ["base/jquery.syntax.brush.assembly.css"];
57+
Syntax.styles["jquery.syntax.brush.applescript"] = ["base/jquery.syntax.brush.applescript.css"];
5958
Syntax.styles["jquery.syntax.brush.html"] = ["base/jquery.syntax.brush.html.css"];
60-
Syntax.styles["jquery.syntax.brush.ocaml"] = ["base/jquery.syntax.brush.ocaml.css"];
59+
Syntax.styles["jquery.syntax.layout.plain"] = ["base/jquery.syntax.layout.plain.css", "grey/jquery.syntax.layout.plain.css", "modern/jquery.syntax.layout.plain.css"];
60+
Syntax.styles["jquery.syntax.layout.list"] = ["base/jquery.syntax.layout.list.css", "grey/jquery.syntax.layout.list.css"];
61+
Syntax.styles["jquery.syntax.brush.xml"] = ["base/jquery.syntax.brush.xml.css"];
6162
Syntax.styles["jquery.syntax.brush.diff"] = ["base/jquery.syntax.brush.diff.css"];
62-
Syntax.styles["jquery.syntax.brush.apache"] = ["base/jquery.syntax.brush.apache.css"];
6363

6464
// Theme Configuration
6565
Syntax.themes["base"] = []
66-
Syntax.themes["bright"] = ["base"]
66+
Syntax.themes["bright"] = ["grey", "base"]
67+
Syntax.themes["grey"] = ["base"]
6768
Syntax.themes["modern"] = ["base"]
69+
Syntax.themes["paper"] = ["base"]

public/jquery.syntax.core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ Syntax.lib.cStyleComment = {pattern: /\/\*[\s\S]*?\*\//gm, klass: 'comment', all
254254
Syntax.lib.cppStyleComment = {pattern: /\/\/.*$/gm, klass: 'comment', allow: ['href']};
255255
Syntax.lib.perlStyleComment = {pattern: /#.*$/gm, klass: 'comment', allow: ['href']};
256256

257-
Syntax.lib.perlStyleRegularExpression = {pattern: /\B\/([^\/]|\\\/)*?\/[a-z]*(?=\s*($|[^\w\s'"\(]))/gm, klass: 'constant', incremental: true};
257+
Syntax.lib.perlStyleRegularExpression = {pattern: /\B\/([^\\\/]|\\.)*\/[a-z]*(?=\s*($|[^\w\s'"\(]))/gm, klass: 'constant', incremental: true};
258258

259259
Syntax.lib.cStyleFunction = {pattern: /([a-z_][a-z0-9_]*)\s*\(/gi, matches: Syntax.extractMatches({klass: 'function'})};
260260
Syntax.lib.camelCaseType = {pattern: /\b_*[A-Z][\w]*\b/g, klass: 'type'};

public/jquery.syntax.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ var Syntax = {
111111
themes: {},
112112
lib: {},
113113
defaultOptions: {
114-
cacheScripts: false,
115-
cacheStyleSheets: false,
114+
cacheScripts: true,
115+
cacheStyleSheets: true,
116116
theme: "base"
117117
},
118118

0 commit comments

Comments
 (0)