Skip to content

Commit c3b8b67

Browse files
committed
Initial work tidying up API, fixing usage of options, simplfiying.
1 parent 8abf459 commit c3b8b67

35 files changed

+266
-492
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.syntax-theme-base .syntax .apache .tag {
2-
color: #0000cc; }
2+
color: #00c; }
33
.syntax-theme-base .syntax .apache .tag-name {
4-
color: blue; }
4+
color: #00f; }
55
.syntax-theme-base .syntax .apache .tag-name {
66
font-weight: bold; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.syntax-theme-base .syntax .applescript {
22
font-family: Geneva, Helvetica, sans-serif; }
33
.syntax-theme-base .syntax .applescript .keyword {
4-
color: blue;
4+
color: #00f;
55
font-weight: bold; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.syntax-theme-base .syntax .bash-script .function {
22
font-weight: bold; }
33
.syntax-theme-base .syntax .bash-script .option {
4-
color: #0033ff; }
4+
color: #03f; }
55
.syntax-theme-base .syntax .bash-script .env {
66
font-style: italic; }

dist/base/jquery.syntax.brush.bash.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
.syntax-theme-base .syntax .bash {
2-
color: #555555;
3-
font-style: italic; }
2+
color: #555; }
43
.syntax-theme-base .syntax .bash .prompt {
5-
color: #00cc00;
4+
color: #0c0;
65
font-weight: bold; }
76
.syntax-theme-base .syntax .bash .bash-script {
87
font-style: normal;

dist/base/jquery.syntax.brush.css.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.syntax-theme-base .syntax .css .selector {
2-
color: #445588;
2+
color: #458;
33
font-weight: bold; }
44
.syntax-theme-base .syntax .css .property {
55
color: teal; }
66
.syntax-theme-base .syntax .css .color-box {
77
position: relative; }
88
.syntax-theme-base .syntax .css .color-box .sample {
9-
border: 1px solid black;
9+
border: 1px solid #000;
1010
position: absolute;
1111
left: 0.2em;
1212
right: 0.2em;

dist/base/jquery.syntax.brush.diff.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
.syntax-theme-base .syntax .insert {
66
color: green; }
77
.syntax-theme-base .syntax .insert-line {
8-
background-color: #ccffcc !important; }
8+
background-color: #cfc !important; }
99
.syntax-theme-base .syntax .remove {
1010
color: red; }
1111
.syntax-theme-base .syntax .remove-line {
12-
background-color: #ffcccc !important; }
12+
background-color: #fcc !important; }
1313
.syntax-theme-base .syntax .offset {
1414
color: blue; }
1515
.syntax-theme-base .syntax .offset-line {
16-
background-color: #ccccff !important; }
16+
background-color: #ccf !important; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.syntax-theme-base .syntax .html .doctype {
22
font-weight: bold;
3-
color: #993388; }
3+
color: #938; }
44
.syntax-theme-base .syntax .html .javascript, .syntax-theme-base .syntax .html .css {
55
font-style: italic; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.syntax .ocaml .operator {
2-
color: #0066cc;
2+
color: #06C;
33
font-weight: bold; }

dist/base/jquery.syntax.brush.python.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
color: #ffb600;
33
font-weight: bold; }
44
.syntax-theme-base .syntax .python .builtin {
5-
color: #3333ff;
5+
color: #33f;
66
font-style: italic; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
.syntax-theme-base .syntax .ruby .string .ruby {
2-
color: black; }
2+
color: #000; }

dist/base/jquery.syntax.brush.xml.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
.syntax-theme-base .syntax .xml .cdata-content {
2-
color: #004466;
2+
color: #046;
33
border-radius: 0.5em; }
44
.syntax-theme-base .syntax .xml .xml-tag, .syntax-theme-base .syntax .xml .cdata {
5-
color: #0000cc; }
5+
color: #00c; }
66
.syntax-theme-base .syntax .xml .tag-name, .syntax-theme-base .syntax .xml .cdata-tag {
7-
color: blue;
7+
color: #00f;
88
font-weight: bold; }
99
.syntax-theme-base .syntax .xml .namespace {
10-
color: #0000cc; }
10+
color: #00c; }
1111
.syntax-theme-base .syntax .xml .attribute {
12-
color: #0000cc; }
12+
color: #00c; }
1313
.syntax-theme-base .syntax .xml .instruction {
14-
color: #0000cc; }
14+
color: #00c; }
1515
.syntax-theme-base .syntax .xml .entity, .syntax-theme-base .syntax .xml .percent-escape {
16-
color: #666666;
17-
background-color: #dddddd;
16+
color: #666;
17+
background-color: #ddd;
1818
border-radius: 0.5em; }

dist/base/jquery.syntax.core.css

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
.syntax-theme-base .syntax {
1+
.syntax-theme-base {
2+
tab-size: 4;
23
font-family: Menlo, Monaco, Consolas, monospace;
3-
line-height: 1.5em; }
4-
.syntax-theme-base .syntax .function {
5-
color: #3333ff; }
6-
.syntax-theme-base .syntax .keyword, .syntax-theme-base .syntax .access {
4+
line-height: 1.15em; }
5+
.syntax-theme-base .function {
6+
color: #33f; }
7+
.syntax-theme-base .keyword, .syntax-theme-base .access {
78
color: #7a0968; }
8-
.syntax-theme-base .syntax .type {
9-
color: #3239d6; }
10-
.syntax-theme-base .syntax .comment {
11-
color: #66aacc; }
12-
.syntax-theme-base .syntax .constant {
9+
.syntax-theme-base .type {
10+
color: #3239D6; }
11+
.syntax-theme-base .comment {
12+
color: #6ac; }
13+
.syntax-theme-base .constant {
1314
color: #1c00ce; }
14-
.syntax-theme-base .syntax .string, .syntax-theme-base .syntax .symbol {
15+
.syntax-theme-base .string, .syntax-theme-base .symbol {
1516
color: #c41a15; }
16-
.syntax-theme-base .syntax .string .escape {
17-
color: #ff9999; }
18-
.syntax-theme-base .syntax .operator {
19-
color: black; }
20-
.syntax-theme-base .syntax .href {
17+
.syntax-theme-base .string .escape {
18+
color: #f99; }
19+
.syntax-theme-base .operator {
20+
color: #000000; }
21+
.syntax-theme-base .href {
2122
color: #0e0eff;
2223
text-decoration: underline; }
23-
.syntax-theme-base .syntax .variable {
24+
.syntax-theme-base .variable {
2425
color: #466997; }
25-
.syntax-theme-base .syntax .highlight {
26+
.syntax-theme-base .highlight {
2627
background-color: #fdfdba; }
27-
.syntax-theme-base .syntax pre {
28+
.syntax-theme-base pre {
2829
overflow: auto;
2930
font-family: inherit; }
3031

@@ -41,4 +42,4 @@
4142
padding: 0 0.4em 0 !important;
4243
margin: 0 !important;
4344
background-color: #f0f0f0;
44-
border: 1px solid #aaaaaa; }
45+
border: 1px solid #aaa; }

dist/bright/jquery.syntax.core.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
font-family: Menlo, Monaco, Consolas, monospace;
33
line-height: 1.5em; }
44
.syntax-container.syntax-theme-bright .syntax .function {
5-
color: #3333ff; }
5+
color: #33f; }
66
.syntax-container.syntax-theme-bright .syntax .keyword {
7-
color: #33cc33; }
7+
color: #3c3; }
88
.syntax-container.syntax-theme-bright .syntax .access {
99
color: #ffb600;
1010
font-weight: bold; }
1111
.syntax-container.syntax-theme-bright .syntax .type {
12-
color: #119911;
12+
color: #191;
1313
font-weight: bold; }
1414
.syntax-container.syntax-theme-bright .syntax .comment {
15-
color: #66aacc;
15+
color: #6ac;
1616
font-style: italic; }
1717
.syntax-container.syntax-theme-bright .syntax .string, .syntax-container.syntax-theme-bright .syntax .constant {
18-
color: #ff3333; }
18+
color: #f33; }
1919
.syntax-container.syntax-theme-bright .syntax .string .escape {
20-
color: #ff9999; }
20+
color: #f99; }
2121
.syntax-container.syntax-theme-bright .syntax .operator {
22-
color: #cc0000; }
22+
color: #c00; }
2323
.syntax-container.syntax-theme-bright .syntax .href {
24-
color: blue;
24+
color: #00f;
2525
text-decoration: underline; }
2626
.syntax-container.syntax-theme-bright .syntax .variable {
27-
color: #2222cc; }
27+
color: #22c; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.syntax-container.syntax-theme-grey div.editor.syntax {
22
background-color: white;
3-
border: 1px inset #aaaaaa; }
3+
border: 1px inset #aaa; }
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
.syntax-container.syntax-theme-grey div.fixed.syntax {
22
background-color: #e3e3e3;
3-
border: 1px solid #aaaaaa; }
3+
border: 1px solid #aaa; }
44
.syntax-container.syntax-theme-grey div.fixed.syntax .numbers-column {
55
color: #979797;
66
background-color: #e3e3e3; }
77
.syntax-container.syntax-theme-grey div.fixed.syntax .code-column {
8-
border-left: 1px solid #aaaaaa;
8+
border-left: 1px solid #aaa;
99
background-color: #f0f0f0; }
1010
.syntax-container.syntax-theme-grey div.fixed.syntax .code-column .source {
11-
color: #333333; }
11+
color: #333; }
1212
.syntax-container.syntax-theme-grey div.fixed.syntax .code-column .source.alt {
1313
background-color: whitesmoke; }
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
.syntax-container.syntax-theme-grey ol.syntax {
22
background-color: #e3e3e3;
3-
border: 1px solid #aaaaaa; }
3+
border: 1px solid #aaa; }
44
.syntax-container.syntax-theme-grey ol.syntax li {
55
color: #979797; }
66
.syntax-container.syntax-theme-grey ol.syntax li div.source {
7-
color: #333333;
8-
border-left: 1px solid #aaaaaa;
7+
color: #333;
8+
border-left: 1px solid #aaa;
99
background-color: #f0f0f0; }
1010
.syntax-container.syntax-theme-grey ol.syntax li.alt div.source {
1111
background-color: whitesmoke; }
1212
.syntax-container.syntax-theme-grey ul.syntax {
1313
background-color: #e3e3e3;
14-
border: 1px solid #aaaaaa; }
14+
border: 1px solid #aaa; }
1515
.syntax-container.syntax-theme-grey ul.syntax li div.source {
16-
color: #333333;
16+
color: #333;
1717
background-color: #f0f0f0; }
1818
.syntax-container.syntax-theme-grey ul.syntax li.alt div.source {
1919
background-color: whitesmoke; }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.syntax-container.syntax-theme-grey .syntax.plain {
22
background-color: #f0f0f0;
3-
border: 1px solid #aaaaaa; }
3+
border: 1px solid #aaa; }
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.syntax-container.syntax-theme-grey table.syntax {
22
background-color: #f0f0f0;
3-
border: 1px solid #aaaaaa; }
3+
border: 1px solid #aaa; }
44
.syntax-container.syntax-theme-grey table.syntax tr.alt td.source {
55
background-color: whitesmoke; }
66
.syntax-container.syntax-theme-grey table.syntax td.source {
7-
color: #333333; }
7+
color: #333; }
88
.syntax-container.syntax-theme-grey table.syntax td.number {
9-
border-right: 1px solid #aaaaaa;
9+
border-right: 1px solid #aaa;
1010
color: #979797;
1111
background-color: #e3e3e3; }

dist/jquery.syntax.brush.go.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Syntax.register('go', function(brush) {
1313
/complex\d+/g,
1414
"byte",
1515
"uintptr",
16-
"string",
16+
"string"
1717
];
1818

1919
var operators = ["+", "&", "+=", "&=", "&&", "==", "!=", "-", "|", "-=", "|=", "||", "<", "<=", "*", "^", "*=", "^=", "<-", ">", ">=", "/", "<<", "/=", "<<=", "++", "=", ":=", ",", ";", "%", ">>", "%=", ">>=", "--", "!", "...", ".", ":", "&^", "&^="];

dist/jquery.syntax.brush.ruby.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Syntax.register('ruby', function(brush) {
4040
matches: Syntax.extractMatches({
4141
brush: 'ruby',
4242
only: ['string']
43-
}),
43+
})
4444
});
4545

4646
// Regular expressions

0 commit comments

Comments
 (0)