Skip to content

Commit 3ac07ce

Browse files
raphamorimraphamorim
committed
Merge pull request #32 from t4r0/master
Refactored project to fit atom conventions
2 parents e73fc1b + 43b6e11 commit 3ac07ce

File tree

6 files changed

+204
-167
lines changed

6 files changed

+204
-167
lines changed

‎index.less‎

Lines changed: 2 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -2,170 +2,6 @@
22
*
33
* @project https://github.com/raphamorim/lucario
44
* @author Raphael Amorim <rapha850@gmail.com>
5+
*
56
*/
6-
7-
.editor, .editor .gutter {
8-
background-color: #2b3e50;
9-
color: #F8F8F2;
10-
}
11-
12-
.editor.is-focused .cursor {
13-
border-color: #f8f8f0;
14-
}
15-
16-
.editor.is-focused .selection .region {
17-
background-color: #19242f;
18-
}
19-
20-
.editor .gutter .line-number.git-line-added {
21-
border-left: 2px solid #199C4B;
22-
}
23-
24-
.editor .gutter .line-number.git-line-modified {
25-
border-left: 2px solid #f0cc04;
26-
}
27-
28-
.editor .gutter .line-number.git-line-removed {
29-
border-left: 2px solid #E94B35;
30-
}
31-
32-
.editor.is-focused .line-number.cursor-line-no-selection, .editor.is-focused .line.cursor-line {
33-
background-color: #243443;
34-
}
35-
36-
.editor .invisible-character {
37-
color: #666;
38-
}
39-
40-
.editor .indent-guide {
41-
box-shadow: 1px 0 #444;
42-
}
43-
44-
.comment {
45-
color: #5c98cd;
46-
}
47-
48-
.string {
49-
color: #E6DB74;
50-
}
51-
52-
.editor .gutter .line-number.git-line-modified,
53-
.editor .gutter .line-number.git-line-removed,
54-
.editor .gutter .line-number.git-line-added {
55-
border-left-width: 5px;
56-
padding-left: calc(0.5em - 5px);
57-
}
58-
59-
.constant.numeric {
60-
color: #ca94ff;
61-
}
62-
63-
.constant.language {
64-
color: #ca94ff;
65-
}
66-
67-
.constant.character, .constant.other {
68-
color: #ca94ff;
69-
}
70-
71-
.variable {
72-
}
73-
74-
.variable.other.readwrite.instance {
75-
color: #ffab28;
76-
}
77-
78-
.constant.character.escaped, .constant.character.escape, .string .source, .string .source.ruby {
79-
color: #ca94ff;
80-
}
81-
82-
.keyword {
83-
color: #ff6541;
84-
}
85-
86-
.storage {
87-
color: #ff6541;
88-
}
89-
90-
.storage.type {
91-
font-style: italic;
92-
color: #66D9EF;
93-
}
94-
95-
.entity.name.class {
96-
text-decoration: underline;
97-
color: #72C05D;
98-
}
99-
100-
.entity.other.inherited-class {
101-
font-style: italic;
102-
text-decoration: underline;
103-
color: #72C05D;
104-
}
105-
106-
.entity.name.function {
107-
color: #72C05D;
108-
}
109-
110-
.variable.parameter {
111-
font-style: italic;
112-
color: #ffab28;
113-
}
114-
115-
.entity.name.tag {
116-
color: #ff6541;
117-
}
118-
119-
.entity.other.attribute-name {
120-
color: #72C05D;
121-
}
122-
123-
.support.function {
124-
color: #8be9fd;
125-
}
126-
127-
.support.constant {
128-
color: #6be5fd;
129-
}
130-
131-
.support.type, .support.class {
132-
font-style: italic;
133-
color: #66d9ef;
134-
}
135-
136-
.support.other.variable {
137-
}
138-
139-
.invalid {
140-
color: #F8F8F2;
141-
background-color: #19242f;
142-
}
143-
144-
.invalid.deprecated {
145-
color: #F8F8F2;
146-
background-color: #19242f;
147-
}
148-
149-
.markup.heading {
150-
color: #72C05D;
151-
}
152-
153-
.variable.unordered, .variable.ordered {
154-
color: #ffab28;
155-
}
156-
157-
.markup.bold, .markup.italic {
158-
color: #ff6541;
159-
}
160-
161-
.markup.raw {
162-
color: #66D9EF;
163-
}
164-
165-
.punctuation.definition.tag.xml.plist, .constant.name.xml {
166-
color: #f8f8f2;
167-
}
168-
169-
.editor .wrap-guide {
170-
background-color: #243443;
171-
}
7+
@import 'styles/editor';

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Lucario",
2+
"name": "Lucario-fork",
33
"theme": "syntax",
44
"version": "1.0.0",
55
"description": "The best colorful flat theme ever.",

‎styles/colors.less‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@background: #2b3e50;
2+
@current_line: #243443;
3+
@selection: #19242f;
4+
@foreground: #f8f8f2;
5+
@comment: #5c98cd;
6+
@string: #e6db74;
7+
@border: #f8f8f0;
8+
@green: #199c4b;
9+
@yellow: #f0cc04;
10+
@orange: #e94b35;
11+
@invisible: #666;
12+
@number: #ca94ff;
13+
@instance: #ffab28;
14+
@storage: #66d9ef;
15+
@soft-green: #72cc5a;
16+
@entity: #ff6541;
17+
@function: #8be0fd;
18+
@constant: #6be5fd;

‎styles/editor.less‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
@import 'colors';
2+
@import 'language';
3+
@import 'syntax-variables';
4+
atom-text-editor,
5+
:host{
6+
background-color: @background;
7+
color: @foreground;
8+
9+
.line.cursor-line{
10+
background-color: @current_line;
11+
}
12+
13+
.invisible, .invisible-character{
14+
color: @invisible;
15+
}
16+
17+
.selection{
18+
.region{
19+
background-color: @selection;
20+
}
21+
.cursor {
22+
border-color: @border;
23+
}
24+
}
25+
26+
.ident-guide{
27+
box-shadow: 1px 0 #444;
28+
}
29+
30+
.wrap-guide{
31+
background-color: current_line;
32+
}
33+
.gutter{
34+
.line-number{
35+
background-color: darken(@background, 2.3%);
36+
color: @border;
37+
-webkit-font-smoothing: antialised;
38+
&.git-line-removed, &.git-line-modified, &.git-line-added{
39+
border-left-width: 5px;
40+
padding-left: calc(0.5em + 5px);
41+
}
42+
43+
&.git-line-added{
44+
border-left: 2px solid green;
45+
}
46+
47+
&.git-line-modified{
48+
border-left: 2px solid @yellow;
49+
}
50+
51+
&.git-line-removed{
52+
border-left: 2px solid @orange;
53+
}
54+
}
55+
}
56+
}

‎styles/language.less‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
@import "colors";
2+
.comment {
3+
color: @comment;
4+
}
5+
6+
.string {
7+
color: @string;
8+
}
9+
10+
.constant {
11+
color: @number;
12+
}
13+
14+
.variable {
15+
color: @orange;
16+
}
17+
18+
.variable.other.readwrite.instance {
19+
color: @instance;
20+
}
21+
22+
.constant.character.escaped, .constant.character.escape, .string .source, .string .source.ruby {
23+
color: @number;
24+
}
25+
26+
.keyword, .storage{
27+
color: @entity;
28+
}
29+
30+
.storage.type {
31+
font-style: italic;
32+
color: @storage;
33+
}
34+
35+
.entity.name.class {
36+
text-decoration: underline;
37+
color: @soft-green;
38+
}
39+
40+
.entity.other.inherited-class {
41+
font-style: italic;
42+
text-decoration: underline;
43+
color: @soft-green;
44+
}
45+
46+
.entity.name.function {
47+
color: @soft-green;
48+
}
49+
50+
.variable.parameter {
51+
font-style: italic;
52+
color: @instance;
53+
}
54+
55+
.entity.name.tag {
56+
color: @entity;
57+
font-style: italic;;
58+
}
59+
60+
.entity.other.attribute-name, .markup.heading {
61+
color: @soft-green;
62+
}
63+
64+
.support.function {
65+
color: @function;
66+
}
67+
68+
.support.constant {
69+
color: @constant;
70+
}
71+
72+
.support.type, .support.class {
73+
font-style: italic;
74+
color: @constant;
75+
}
76+
77+
.support.other.variable, .variable.unordered, .variable.ordered {
78+
color: @instance;
79+
}
80+
81+
.invalid, .invalid.deprecated {
82+
color: @foreground;
83+
background-color: @selection;
84+
}
85+
86+
.markup.bold, .markup.italic {
87+
color: @entity;
88+
}
89+
90+
.markup.raw {
91+
color: @storage;
92+
}
93+
94+
.punctuation.definition.tag.xml.plist, .constant.name.xml {
95+
color: @foreground;
96+
}

‎styles/syntax-variables.less‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
@import "colors";
2+
// General colors
3+
@syntax-text-color: @foreground;
4+
@syntax-cursor-color: #c0c5ce;
5+
@syntax-selection-color: rgba(128, 203, 196, 0.13);
6+
@syntax-background-color: @selection;
7+
8+
// Guide colors
9+
@syntax-wrap-guide-color: #65737e;
10+
@syntax-indent-guide-color: #65737e;
11+
@syntax-invisible-character-color: #65737e;
12+
13+
// For find and replace markers
14+
@syntax-result-marker-color: #65737e;
15+
@syntax-result-marker-color-selected: #CDD3DE;
16+
17+
// Gutter colors
18+
@syntax-gutter-text-color: #CDD3DE;
19+
@syntax-gutter-text-color-selected: #CDD3DE;
20+
@syntax-gutter-background-color: #263238;
21+
@syntax-gutter-background-color-selected: rgba(0, 0, 0, 0.19);
22+
23+
// For git diff info. i.e. in the gutter
24+
// These are static and were not extracted from your textmate theme
25+
@syntax-color-renamed: #96CBFE;
26+
@syntax-color-added: #A8FF60;
27+
@syntax-color-modified: #E9C062;
28+
@syntax-color-removed: #CC6666;
29+
@text-color-subtle: #666;
30+
@text-color-dark: #333;
31+
@text-color-info: #2196F3;

0 commit comments

Comments
 (0)