Skip to content
This repository was archived by the owner on Feb 28, 2020. It is now read-only.

Commit 5ad0386

Browse files
oakesoakes
committed
Revert all recent changes due to unresolved styling problems
1 parent 1edb450 commit 5ad0386

File tree

11 files changed

+97
-224
lines changed

11 files changed

+97
-224
lines changed

‎build.boot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
(task-options!
3939
pom {:project 'nightlight
40-
:version "2.2.6-SNAPSHOT"
40+
:version "2.3.0-SNAPSHOT"
4141
:description "An embedded Clojure editor"
4242
:url "https://github.com/oakes/Nightlight"
4343
:license {"Public Domain" "http://unlicense.org/UNLICENSE"}}

‎deps.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
:aliases {:cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.312" :scope "test"}
1414
paren-soup {:mvn/version "2.12.3" :scope "test"}
1515
cljsjs/codemirror {:mvn/version "5.31.0-0" :scope "test"}
16-
reagent {:mvn/version "0.8.1" :scope "test"}
16+
reagent {:mvn/version "0.8.0-alpha2" :scope "test"}
1717
cljs-react-material-ui {:mvn/version "0.2.50" :scope "test"}}}}}

‎resources/nightlight-public/paren-soup-dark.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ button {
6262
outline: 0px solid transparent;
6363
white-space: pre;
6464
word-wrap: normal;
65+
overflow: scroll;
6566
}
6667

6768
.paren-soup .content .symbol {
@@ -114,4 +115,4 @@ button {
114115

115116
.paren-soup .content .rainbow-4 {
116117
color: lime;
117-
}
118+
}

‎resources/nightlight-public/paren-soup-light.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ html, body, .paren-soup {
6060
outline: 0px solid transparent;
6161
white-space: pre;
6262
word-wrap: normal;
63+
overflow: scroll;
6364
background-color: white;
6465
}
6566

@@ -113,4 +114,4 @@ html, body, .paren-soup {
113114

114115
.paren-soup .content .rainbow-4 {
115116
color: lime;
116-
}
117+
}

‎resources/nightlight-public/style.css‎

Lines changed: 65 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,87 @@
11
@font-face {
2-
font-family: 'Fira Code';
3-
src: url('fonts/FiraCode-Regular.otf') format('opentype');
4-
}
5-
html,
6-
body,
7-
.paren-soup,
8-
.CodeMirror {
9-
-webkit-font-feature-settings: 'liga' on, 'calt' on;
10-
-webkit-font-smoothing: antialiased;
11-
text-rendering: optimizeLegibility;
12-
font-family: 'Fira Code';
13-
font-size: 16px;
14-
height: 100%;
15-
margin: 0;
16-
}
17-
html,
18-
body {
19-
overflow: hidden;
20-
}
21-
.editor {
22-
position: fixed;
23-
top: 60px;
24-
left: 300px;
25-
right: 0px;
26-
bottom: 0px;
2+
font-family: 'Fira Code';
3+
src: url('fonts/FiraCode-Regular.otf') format('opentype');
4+
}
5+
html, body, .paren-soup, .CodeMirror {
6+
-webkit-font-feature-settings: "liga" on, "calt" on;
7+
-webkit-font-smoothing: antialiased;
8+
text-rendering: optimizeLegibility;
9+
font-family: 'Fira Code';
10+
font-size: 16px;
11+
height: 100%;
12+
margin: 0;
13+
}
14+
html, body {
15+
overflow: hidden;
16+
}
17+
.outer-editor {
18+
position: fixed;
19+
top: 0px;
20+
left: 300px;
21+
right: 0px;
22+
bottom: 0px;
2723
}
2824
.toolbar {
29-
position: fixed;
30-
left: 300px;
31-
right: 0px;
32-
height: 60px;
33-
z-index: 100;
25+
height: 60px;
26+
z-index: 100;
27+
}
28+
.paren-soup, .CodeMirror {
29+
height: calc(100% - 60px);
3430
}
3531
.paren-soup {
36-
overflow: scroll;
32+
overflow: auto;
3733
}
3834
.paren-soup .content {
39-
height: 100%;
40-
padding-right: 150px;
35+
min-height: 100%;
36+
padding-right: 150px;
4137
}
4238
.settings {
43-
position: fixed;
44-
left: 0px;
45-
height: 60px;
46-
padding: 5px 10px;
39+
position: fixed;
40+
left: 0px;
41+
height: 60px;
42+
padding: 5px;
4743
}
4844
.leftsidebar {
49-
position: fixed;
50-
left: 0px;
51-
top: 60px;
52-
bottom: 0px;
53-
padding: 0px 5px;
54-
box-sizing: border-box;
55-
z-index: 1;
56-
}
57-
.tree-view {
58-
overflow: auto;
59-
height: 100%;
60-
}
61-
.resizer {
62-
width: 8px;
63-
height: 100%;
64-
position: absolute;
65-
top: 0;
66-
right: 0;
67-
cursor: ew-resize;
68-
z-index: 1;
69-
}
70-
.resizer:hover .resizer-button {
71-
display: block;
72-
cursor: pointer;
73-
}
74-
.resizer-button {
75-
width: 30px;
76-
height: 60px;
77-
position: absolute;
78-
transform: translate3d(-0, -50%, 0);
79-
overflow: hidden;
80-
display: none;
81-
}
82-
.resizer-button-inner {
83-
height: 60px;
84-
width: 60px;
85-
background: #6e6e6e;
86-
display: flex;
87-
justify-content: center;
88-
align-items: center;
89-
}
90-
.resizer-button.left {
91-
left: -25px;
92-
}
93-
.resizer-button.left .resizer-button-inner {
94-
border-radius: 50% 0 0 50%;
95-
}
96-
.resizer-button.right {
97-
left: 0px;
98-
}
99-
.resizer-button.right .resizer-button-inner {
100-
border-radius: 0 50% 50% 0;
101-
left: -30px;
102-
position: absolute;
103-
}
104-
.resizer-button-inner span {
105-
position: relative;
106-
color: #fff;
107-
}
108-
.resizer-button.right .resizer-button-inner span {
109-
left: 12px;
110-
}
111-
.resizer-button.left .resizer-button-inner span {
112-
left: -12px;
45+
position: fixed;
46+
width: 300px;
47+
left: 0px;
48+
top: 60px;
49+
bottom: 0px;
50+
padding: 5px;
51+
overflow: auto;
11352
}
11453
.rightsidebar {
115-
margin: 5px;
116-
position: fixed;
117-
width: 150px;
118-
right: 0px;
119-
top: 50px;
120-
bottom: 0px;
121-
padding: 5px;
122-
overflow: auto;
54+
margin: 5px;
55+
position: fixed;
56+
width: 150px;
57+
right: 0px;
58+
top: 50px;
59+
bottom: 0px;
60+
padding: 5px;
61+
overflow: auto;
12362
}
12463
li {
125-
white-space: nowrap;
126-
overflow: hidden;
64+
white-space: nowrap;
65+
overflow: hidden;
12766
}
12867
.lower-half {
129-
position: fixed;
130-
top: 50%;
131-
right: 0px;
132-
border: none;
133-
height: 50%;
134-
width: 100%;
68+
position: fixed;
69+
left: 300px;
70+
top: 50%;
71+
border: none;
72+
padding-right: 300px;
73+
height: 50%;
74+
width: 100%;
13575
}
13676
.card {
137-
float: left;
138-
padding: 10px;
139-
margin: 10px;
77+
float: left;
78+
padding: 10px;
79+
margin: 10px;
14080
}
14181
.overlay {
142-
position: fixed;
143-
top: 50px;
144-
left: 300px;
145-
right: 0px;
146-
bottom: 0px;
82+
position: fixed;
83+
top: 50px;
84+
left: 300px;
85+
right: 0px;
86+
bottom: 0px;
14787
}

‎src/cljs/nightlight/ajax.cljs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"read-state"
3131
(fn [e]
3232
(when (.isSuccess (.-target e))
33-
(swap! s/pref-state merge (read-string (.. e -target getResponseText))))
33+
(reset! s/pref-state (read-string (.. e -target getResponseText))))
3434
(download-tree cb))
3535
"GET"))
3636

0 commit comments

Comments
 (0)