flammarion 0.1.9 → 0.1.10pre1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
- app = require 'app'
2
- BrowserWindow = require('browser-window')
1
+ app = require('electron').app
2
+ {BrowserWindow} = require('electron')
3
3
  path = require('path')
4
4
  shell = require('electron').shell
5
5
 
@@ -8,8 +8,9 @@ app.on 'ready', ->
8
8
  main_window = new BrowserWindow
9
9
  width: parseInt(process.argv[3]) || 800
10
10
  height: parseInt(process.argv[4]) || 600
11
- "node-integration": false
12
- "web-security":false
11
+ webPreferences:
12
+ nodeIntegration: false
13
+ webSecurity: false
13
14
  icon:"icon.png"
14
15
  preload:preload
15
16
  main_window.loadURL(process.argv[2])
@@ -2,9 +2,9 @@
2
2
  (function() {
3
3
  var BrowserWindow, app, path, shell;
4
4
 
5
- app = require('app');
5
+ app = require('electron').app;
6
6
 
7
- BrowserWindow = require('browser-window');
7
+ BrowserWindow = require('electron').BrowserWindow;
8
8
 
9
9
  path = require('path');
10
10
 
@@ -16,8 +16,10 @@
16
16
  main_window = new BrowserWindow({
17
17
  width: parseInt(process.argv[3]) || 800,
18
18
  height: parseInt(process.argv[4]) || 600,
19
- "node-integration": false,
20
- "web-security": false,
19
+ webPreferences: {
20
+ nodeIntegration: false,
21
+ webSecurity: false
22
+ },
21
23
  icon: "icon.png",
22
24
  preload: preload
23
25
  });
@@ -25,7 +25,9 @@ module Flammarion
25
25
  else
26
26
  development_mode = system("lsof -i:#{4567}", out: '/dev/null') and File.exist?("#{File.dirname(__FILE__)}/../html/source/index.html.slim")
27
27
  end
28
- host = "file://#{File.dirname(File.absolute_path(__FILE__))}/../html/build/index.html"
28
+ host_path = File.absolute_path(File.join(File.dirname(File.absolute_path(__FILE__)), "/../html/build/index.html"))
29
+ host_path = `cygpath -w '#{host_path}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
30
+ host = "file://#{host_path}"
29
31
  host = "http://localhost:4567/" if development_mode
30
32
 
31
33
  @expect_title = options[:title] || "Flammarion-#{rand.to_s[2..-1]}"
@@ -58,18 +60,6 @@ module Flammarion
58
60
  @@browsers << OpenStruct.new(name: name, method:define_method(name, block))
59
61
  end
60
62
 
61
- browser :chrome_windows do |options|
62
- return false unless RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
63
- file_path = File.absolute_path(File.join(File.dirname(__FILE__), ".."))
64
- file_path = `cygpath -w '#{file_path}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
65
- resource = %[file\://#{file_path}/html/build/index.html]
66
- resource = "http://localhost:4567/" if options[:development_mode]
67
- chrome_path = CHROME_PATH
68
- chrome_path = `cygpath -u '#{CHROME_PATH}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
69
- return false unless File.exist?(chrome_path)
70
- Process.detach(spawn(chrome_path, %[--app=#{resource}?path=#{@window_id}&port=#{server.port}&title="#{options[:title] || "Flammarion%20Engraving"}"]))
71
- end
72
-
73
63
  browser :osx do |options|
74
64
  return false unless RbConfig::CONFIG["host_os"] =~ /darwin|mac os/
75
65
  executable = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
@@ -79,12 +69,26 @@ module Flammarion
79
69
 
80
70
  browser :electron do |options|
81
71
  if which('electron') then
82
- Process.detach(spawn("electron #{File.dirname(File.absolute_path(__FILE__))}/../../electron '#{options[:url]}' #{options[:width]} #{options[:height]}"))
72
+ electron_path = "#{File.dirname(File.absolute_path(__FILE__))}/../../electron"
73
+ electron_path = `cygpath -w #{electron_path}`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
74
+ Process.detach(spawn("electron '#{electron_path}' '#{options[:url]}' #{options[:width]} #{options[:height]}"))
83
75
  return true
84
76
  end
85
77
  false
86
78
  end
87
79
 
80
+ browser :chrome_windows do |options|
81
+ return false unless RbConfig::CONFIG["host_os"] =~ /cygwin|mswin|mingw/
82
+ file_path = File.absolute_path(File.join(File.dirname(__FILE__), ".."))
83
+ file_path = `cygpath -w '#{file_path}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
84
+ resource = %[file\://#{file_path}/html/build/index.html]
85
+ resource = "http://localhost:4567/" if options[:development_mode]
86
+ chrome_path = CHROME_PATH
87
+ chrome_path = `cygpath -u '#{CHROME_PATH}'`.strip if RbConfig::CONFIG["host_os"] == "cygwin"
88
+ return false unless File.exist?(chrome_path)
89
+ Process.detach(spawn(chrome_path, %[--app=#{resource}?path=#{@window_id}&port=#{server.port}&title="#{options[:title] || "Flammarion%20Engraving"}"]))
90
+ end
91
+
88
92
  browser :chrome do |options|
89
93
  %w[google-chrome google-chrome-stable chromium chromium-browser chrome].each do |executable|
90
94
  next unless which(executable)
@@ -1,3 +1,3 @@
1
1
  module Flammarion
2
- VERSION = "0.1.9"
2
+ VERSION = "0.1.10pre1"
3
3
  end
@@ -303,6 +303,10 @@ module Flammarion
303
303
  return d
304
304
  end
305
305
 
306
+ def js(text, options = {}, &block)
307
+ script(text, options.merge(coffee:false), &block)
308
+ end
309
+
306
310
  # Sets CSS styles attributes on the current pane.
307
311
  # @overload style(attribute, value)
308
312
  # @param attribute [String] The css attribute to set. Currently does not
@@ -144,9 +144,9 @@
144
144
  }
145
145
  .full-button {
146
146
  background-color: #1d1f21;
147
- color: #eee;
148
- font-family: monospace;
149
- border: 1px solid #a7a7a7;
147
+ color: #ccc;
148
+ font-family: Menlo, Consolas, monospace;
149
+ border: 1px solid #8f8f8f;
150
150
  padding: 1em;
151
151
  text-decoration: none;
152
152
  display: block;
@@ -167,7 +167,7 @@
167
167
  background-image: linear-gradient(top, #323539 0%, #1a1c1e 20%);
168
168
  }
169
169
  .full-button:hover {
170
- color: #eee;
170
+ color: #ccc;
171
171
  background-color: #323539;
172
172
  background-color: #45494e;
173
173
  background-image: -webkit-linear-gradient(top, #45494e 0%, #2d3033 20%);
@@ -194,9 +194,9 @@
194
194
  .inline-text-input,
195
195
  .inline-dropdown {
196
196
  background-color: #1d1f21;
197
- color: #eee;
198
- font-family: monospace;
199
- border: 1px solid #a7a7a7;
197
+ color: #ccc;
198
+ font-family: Menlo, Consolas, monospace;
199
+ border: 1px solid #8f8f8f;
200
200
  padding: 1em;
201
201
  text-decoration: none;
202
202
  display: block;
@@ -216,7 +216,7 @@
216
216
  }
217
217
  .inline-text-input:hover,
218
218
  .inline-dropdown:hover {
219
- color: #eee;
219
+ color: #ccc;
220
220
  background-color: #323539;
221
221
  }
222
222
  .inline-text-input:active,
@@ -233,14 +233,14 @@
233
233
  }
234
234
  .inline-text-input.unclicked,
235
235
  .inline-dropdown.unclicked {
236
- color: #777;
236
+ color: #666;
237
237
  }
238
238
  textarea.inline-text-input,
239
239
  textarea.inline-dropdown {
240
240
  height: 25em;
241
241
  }
242
242
  input::-webkit-input-placeholder {
243
- color: #777;
243
+ color: #666;
244
244
  }
245
245
  input:focus::-webkit-input-placeholder {
246
246
  opacity: 0;
@@ -254,7 +254,7 @@ input:focus::-webkit-input-placeholder {
254
254
  -moz-user-select: none;
255
255
  -ms-user-select: none;
256
256
  user-select: none;
257
- font-family: monospace;
257
+ font-family: Menlo, Consolas, monospace;
258
258
  min-height: 1.4em;
259
259
  display: inline-block;
260
260
  }
@@ -270,7 +270,7 @@ input:focus::-webkit-input-placeholder {
270
270
  content: " ";
271
271
  width: 1em;
272
272
  height: 1em;
273
- border: 1px solid #a7a7a7;
273
+ border: 1px solid #8f8f8f;
274
274
  margin-right: 0.5em;
275
275
  background-color: #323539;
276
276
  background-image: -webkit-linear-gradient(top, #323539 0%, #1a1c1e 20%);
@@ -297,7 +297,7 @@ input:focus::-webkit-input-placeholder {
297
297
  #toolbar {
298
298
  background-color: #000;
299
299
  margin: 0px;
300
- font-family: monospace;
300
+ font-family: Menlo, Consolas, monospace;
301
301
  height: calc(2% + 15px);
302
302
  }
303
303
  .tool-button {
@@ -305,7 +305,7 @@ input:focus::-webkit-input-placeholder {
305
305
  padding: 0.5em;
306
306
  margin: 0;
307
307
  text-decoration: none;
308
- color: #eee;
308
+ color: #ccc;
309
309
  border-right: 1px solid;
310
310
  border-left: 1px solid;
311
311
  margin-right: 0em;
@@ -339,10 +339,10 @@ input:focus::-webkit-input-placeholder {
339
339
  width: auto;
340
340
  }
341
341
  .button-box .inline-checkbox {
342
- border: 1px solid #a7a7a7;
342
+ border: 1px solid #8f8f8f;
343
343
  }
344
344
  .button-box .inline-checkbox:before {
345
- border: 1px solid #474747;
345
+ border: 1px solid #3d3d3d;
346
346
  height: 50%;
347
347
  }
348
348
  .button-box .label-icon-left,
@@ -351,9 +351,9 @@ input:focus::-webkit-input-placeholder {
351
351
  }
352
352
  .inline-button {
353
353
  background-color: #1d1f21;
354
- color: #eee;
355
- font-family: monospace;
356
- border: 1px solid #a7a7a7;
354
+ color: #ccc;
355
+ font-family: Menlo, Consolas, monospace;
356
+ border: 1px solid #8f8f8f;
357
357
  padding: 1em;
358
358
  text-decoration: none;
359
359
  display: block;
@@ -369,7 +369,7 @@ input:focus::-webkit-input-placeholder {
369
369
  display: inline-block;
370
370
  }
371
371
  .inline-button:hover {
372
- color: #eee;
372
+ color: #ccc;
373
373
  background-color: #323539;
374
374
  }
375
375
  .inline-button:active {
@@ -383,9 +383,9 @@ input:focus::-webkit-input-placeholder {
383
383
  }
384
384
  .floating-button {
385
385
  background-color: #1d1f21;
386
- color: #eee;
387
- font-family: monospace;
388
- border: 1px solid #a7a7a7;
386
+ color: #ccc;
387
+ font-family: Menlo, Consolas, monospace;
388
+ border: 1px solid #8f8f8f;
389
389
  padding: 1em;
390
390
  text-decoration: none;
391
391
  display: block;
@@ -403,7 +403,7 @@ input:focus::-webkit-input-placeholder {
403
403
  padding: 0.2em;
404
404
  }
405
405
  .floating-button:hover {
406
- color: #eee;
406
+ color: #ccc;
407
407
  background-color: #323539;
408
408
  }
409
409
  .floating-button:active {
@@ -597,7 +597,7 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
597
597
  height: 70%;
598
598
  padding: 1em;
599
599
  background-color: #17191a;
600
- border: 1px solid #a7a7a7;
600
+ border: 1px solid #8f8f8f;
601
601
  box-shadow: 2px 2px 4px 2px #333;
602
602
  -webkit-touch-callout: none;
603
603
  -webkit-user-select: none;
@@ -624,7 +624,7 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
624
624
 
625
625
  body {
626
626
  background-color: #1d1f21;
627
- color: #eee;
627
+ color: #ccc;
628
628
  padding: 0px;
629
629
  margin: 0px;
630
630
  height: 100%;
@@ -650,10 +650,10 @@ html {
650
650
  }
651
651
  a {
652
652
  text-decoration: none;
653
- color: #909193;
653
+ color: #7f8082;
654
654
  }
655
655
  a:hover {
656
- color: #9a9d9f;
656
+ color: #898c8e;
657
657
  }
658
658
  p a,
659
659
  .markdown a {
@@ -677,7 +677,8 @@ p a,
677
677
  -moz-user-select: text;
678
678
  -ms-user-select: text;
679
679
  user-select: text;
680
- font-family: monospace;
680
+ font-family: Menlo, Consolas, monospace;
681
+ font-size: 14px;
681
682
  white-space: pre-wrap;
682
683
  }
683
684
  .pane > .pane {
@@ -699,7 +700,7 @@ p a,
699
700
  }
700
701
  hr {
701
702
  width: 95%;
702
- background-color: #eee;
703
+ background-color: #ccc;
703
704
  border: 1px solid #323539;
704
705
  }
705
706
  .emojione {
@@ -3446,7 +3447,7 @@ hr {
3446
3447
  #plot-mouseover {
3447
3448
  position: absolute;
3448
3449
  background-color: rgba(71,76,81,0.5);
3449
- color: #eee;
3450
+ color: #ccc;
3450
3451
  pointer-events: none;
3451
3452
  font-family: Monospace;
3452
3453
  padding: 0.25em;
@@ -3459,14 +3460,14 @@ hr {
3459
3460
  border: 1px solid #012;
3460
3461
  }
3461
3462
  #plot-style {
3462
- color: #eee;
3463
+ color: #ccc;
3463
3464
  background-color: #1d1f21;
3464
3465
  }
3465
3466
  #plot-style .tickmarks {
3466
- color: #a7a7a7;
3467
+ color: #8f8f8f;
3467
3468
  }
3468
3469
  #plot-style .markers {
3469
- color: #a7a7a7;
3470
+ color: #8f8f8f;
3470
3471
  }
3471
3472
  #plot-style .zero {
3472
3473
  color: rgba(71,76,81,0.75);
@@ -3503,7 +3504,7 @@ hr {
3503
3504
  padding: 5px;
3504
3505
  padding-top: 0px;
3505
3506
  background-color: #1d1f21;
3506
- border: 1px solid #a7a7a7;
3507
+ border: 1px solid #8f8f8f;
3507
3508
  border-top: 0px;
3508
3509
  border-radius: 0 0 4px 4px;
3509
3510
  box-shadow: 2px 2px 4px 2px #17191a;
@@ -3512,11 +3513,11 @@ hr {
3512
3513
  margin-left: 1em;
3513
3514
  }
3514
3515
  #status {
3515
- background-color: #000;
3516
+ background-color: #1a1b1d;
3516
3517
  margin: 0px;
3517
3518
  padding: 5px;
3518
3519
  padding-bottom: 10px;
3519
- font-family: Monospace;
3520
+ font-family: Menlo, Consolas, monospace;
3520
3521
  height: 1em;
3521
3522
  white-space: nowrap;
3522
3523
  overflow: hidden;
@@ -3527,12 +3528,7 @@ hr {
3527
3528
  -moz-user-select: none;
3528
3529
  -ms-user-select: none;
3529
3530
  user-select: none;
3530
- background-color: #1a1a1a;
3531
- background-image: -webkit-linear-gradient(top, #1a1a1a 10%, #000 100%);
3532
- background-image: -moz-linear-gradient(top, #1a1a1a 10%, #000 100%);
3533
- background-image: -ms-linear-gradient(top, #1a1a1a 10%, #000 100%);
3534
- background-image: -o-linear-gradient(top, #1a1a1a 10%, #000 100%);
3535
- background-image: linear-gradient(top, #1a1a1a 10%, #000 100%);
3531
+ border-top: 1px solid #303135;
3536
3532
  }
3537
3533
  #status:before {
3538
3534
  color: #781111;
@@ -1,8 +1,8 @@
1
1
  .full-button {
2
2
  background-color: #1d1f21;
3
- color: #eee;
4
- font-family: monospace;
5
- border: 1px solid #a7a7a7;
3
+ color: #ccc;
4
+ font-family: Menlo, Consolas, monospace;
5
+ border: 1px solid #8f8f8f;
6
6
  padding: 1em;
7
7
  text-decoration: none;
8
8
  display: block;
@@ -23,7 +23,7 @@
23
23
  background-image: linear-gradient(top, #323539 0%, #1a1c1e 20%);
24
24
  }
25
25
  .full-button:hover {
26
- color: #eee;
26
+ color: #ccc;
27
27
  background-color: #323539;
28
28
  background-color: #45494e;
29
29
  background-image: -webkit-linear-gradient(top, #45494e 0%, #2d3033 20%);
@@ -50,9 +50,9 @@
50
50
  .inline-text-input,
51
51
  .inline-dropdown {
52
52
  background-color: #1d1f21;
53
- color: #eee;
54
- font-family: monospace;
55
- border: 1px solid #a7a7a7;
53
+ color: #ccc;
54
+ font-family: Menlo, Consolas, monospace;
55
+ border: 1px solid #8f8f8f;
56
56
  padding: 1em;
57
57
  text-decoration: none;
58
58
  display: block;
@@ -72,7 +72,7 @@
72
72
  }
73
73
  .inline-text-input:hover,
74
74
  .inline-dropdown:hover {
75
- color: #eee;
75
+ color: #ccc;
76
76
  background-color: #323539;
77
77
  }
78
78
  .inline-text-input:active,
@@ -89,14 +89,14 @@
89
89
  }
90
90
  .inline-text-input.unclicked,
91
91
  .inline-dropdown.unclicked {
92
- color: #777;
92
+ color: #666;
93
93
  }
94
94
  textarea.inline-text-input,
95
95
  textarea.inline-dropdown {
96
96
  height: 25em;
97
97
  }
98
98
  input::-webkit-input-placeholder {
99
- color: #777;
99
+ color: #666;
100
100
  }
101
101
  input:focus::-webkit-input-placeholder {
102
102
  opacity: 0;
@@ -110,7 +110,7 @@ input:focus::-webkit-input-placeholder {
110
110
  -moz-user-select: none;
111
111
  -ms-user-select: none;
112
112
  user-select: none;
113
- font-family: monospace;
113
+ font-family: Menlo, Consolas, monospace;
114
114
  min-height: 1.4em;
115
115
  display: inline-block;
116
116
  }
@@ -126,7 +126,7 @@ input:focus::-webkit-input-placeholder {
126
126
  content: " ";
127
127
  width: 1em;
128
128
  height: 1em;
129
- border: 1px solid #a7a7a7;
129
+ border: 1px solid #8f8f8f;
130
130
  margin-right: 0.5em;
131
131
  background-color: #323539;
132
132
  background-image: -webkit-linear-gradient(top, #323539 0%, #1a1c1e 20%);
@@ -153,7 +153,7 @@ input:focus::-webkit-input-placeholder {
153
153
  #toolbar {
154
154
  background-color: #000;
155
155
  margin: 0px;
156
- font-family: monospace;
156
+ font-family: Menlo, Consolas, monospace;
157
157
  height: calc(2% + 15px);
158
158
  }
159
159
  .tool-button {
@@ -161,7 +161,7 @@ input:focus::-webkit-input-placeholder {
161
161
  padding: 0.5em;
162
162
  margin: 0;
163
163
  text-decoration: none;
164
- color: #eee;
164
+ color: #ccc;
165
165
  border-right: 1px solid;
166
166
  border-left: 1px solid;
167
167
  margin-right: 0em;
@@ -195,10 +195,10 @@ input:focus::-webkit-input-placeholder {
195
195
  width: auto;
196
196
  }
197
197
  .button-box .inline-checkbox {
198
- border: 1px solid #a7a7a7;
198
+ border: 1px solid #8f8f8f;
199
199
  }
200
200
  .button-box .inline-checkbox:before {
201
- border: 1px solid #474747;
201
+ border: 1px solid #3d3d3d;
202
202
  height: 50%;
203
203
  }
204
204
  .button-box .label-icon-left,
@@ -207,9 +207,9 @@ input:focus::-webkit-input-placeholder {
207
207
  }
208
208
  .inline-button {
209
209
  background-color: #1d1f21;
210
- color: #eee;
211
- font-family: monospace;
212
- border: 1px solid #a7a7a7;
210
+ color: #ccc;
211
+ font-family: Menlo, Consolas, monospace;
212
+ border: 1px solid #8f8f8f;
213
213
  padding: 1em;
214
214
  text-decoration: none;
215
215
  display: block;
@@ -225,7 +225,7 @@ input:focus::-webkit-input-placeholder {
225
225
  display: inline-block;
226
226
  }
227
227
  .inline-button:hover {
228
- color: #eee;
228
+ color: #ccc;
229
229
  background-color: #323539;
230
230
  }
231
231
  .inline-button:active {
@@ -239,9 +239,9 @@ input:focus::-webkit-input-placeholder {
239
239
  }
240
240
  .floating-button {
241
241
  background-color: #1d1f21;
242
- color: #eee;
243
- font-family: monospace;
244
- border: 1px solid #a7a7a7;
242
+ color: #ccc;
243
+ font-family: Menlo, Consolas, monospace;
244
+ border: 1px solid #8f8f8f;
245
245
  padding: 1em;
246
246
  text-decoration: none;
247
247
  display: block;
@@ -259,7 +259,7 @@ input:focus::-webkit-input-placeholder {
259
259
  padding: 0.2em;
260
260
  }
261
261
  .floating-button:hover {
262
- color: #eee;
262
+ color: #ccc;
263
263
  background-color: #323539;
264
264
  }
265
265
  .floating-button:active {
@@ -20,7 +20,7 @@
20
20
  height: 70%;
21
21
  padding: 1em;
22
22
  background-color: #17191a;
23
- border: 1px solid #a7a7a7;
23
+ border: 1px solid #8f8f8f;
24
24
  box-shadow: 2px 2px 4px 2px #333;
25
25
  -webkit-touch-callout: none;
26
26
  -webkit-user-select: none;
@@ -1,7 +1,7 @@
1
1
  @charset "utf-8";
2
2
  body {
3
3
  background-color: #1d1f21;
4
- color: #eee;
4
+ color: #ccc;
5
5
  padding: 0px;
6
6
  margin: 0px;
7
7
  height: 100%;
@@ -27,10 +27,10 @@ html {
27
27
  }
28
28
  a {
29
29
  text-decoration: none;
30
- color: #909193;
30
+ color: #7f8082;
31
31
  }
32
32
  a:hover {
33
- color: #9a9d9f;
33
+ color: #898c8e;
34
34
  }
35
35
  p a,
36
36
  .markdown a {
@@ -54,7 +54,8 @@ p a,
54
54
  -moz-user-select: text;
55
55
  -ms-user-select: text;
56
56
  user-select: text;
57
- font-family: monospace;
57
+ font-family: Menlo, Consolas, monospace;
58
+ font-size: 14px;
58
59
  white-space: pre-wrap;
59
60
  }
60
61
  .pane > .pane {
@@ -76,7 +77,7 @@ p a,
76
77
  }
77
78
  hr {
78
79
  width: 95%;
79
- background-color: #eee;
80
+ background-color: #ccc;
80
81
  border: 1px solid #323539;
81
82
  }
82
83
  .emojione {
@@ -8,7 +8,7 @@
8
8
  #plot-mouseover {
9
9
  position: absolute;
10
10
  background-color: rgba(71,76,81,0.5);
11
- color: #eee;
11
+ color: #ccc;
12
12
  pointer-events: none;
13
13
  font-family: Monospace;
14
14
  padding: 0.25em;
@@ -21,14 +21,14 @@
21
21
  border: 1px solid #012;
22
22
  }
23
23
  #plot-style {
24
- color: #eee;
24
+ color: #ccc;
25
25
  background-color: #1d1f21;
26
26
  }
27
27
  #plot-style .tickmarks {
28
- color: #a7a7a7;
28
+ color: #8f8f8f;
29
29
  }
30
30
  #plot-style .markers {
31
- color: #a7a7a7;
31
+ color: #8f8f8f;
32
32
  }
33
33
  #plot-style .zero {
34
34
  color: rgba(71,76,81,0.75);
@@ -5,7 +5,7 @@
5
5
  padding: 5px;
6
6
  padding-top: 0px;
7
7
  background-color: #1d1f21;
8
- border: 1px solid #a7a7a7;
8
+ border: 1px solid #8f8f8f;
9
9
  border-top: 0px;
10
10
  border-radius: 0 0 4px 4px;
11
11
  box-shadow: 2px 2px 4px 2px #17191a;
@@ -1,9 +1,9 @@
1
1
  #status {
2
- background-color: #000;
2
+ background-color: #1a1b1d;
3
3
  margin: 0px;
4
4
  padding: 5px;
5
5
  padding-bottom: 10px;
6
- font-family: Monospace;
6
+ font-family: Menlo, Consolas, monospace;
7
7
  height: 1em;
8
8
  white-space: nowrap;
9
9
  overflow: hidden;
@@ -14,12 +14,7 @@
14
14
  -moz-user-select: none;
15
15
  -ms-user-select: none;
16
16
  user-select: none;
17
- background-color: #1a1a1a;
18
- background-image: -webkit-linear-gradient(top, #1a1a1a 10%, #000 100%);
19
- background-image: -moz-linear-gradient(top, #1a1a1a 10%, #000 100%);
20
- background-image: -ms-linear-gradient(top, #1a1a1a 10%, #000 100%);
21
- background-image: -o-linear-gradient(top, #1a1a1a 10%, #000 100%);
22
- background-image: linear-gradient(top, #1a1a1a 10%, #000 100%);
17
+ border-top: 1px solid #303135;
23
18
  }
24
19
  #status:before {
25
20
  color: #781111;
@@ -10,12 +10,12 @@ activate(color, ammount)
10
10
  $bg-color = rgb(29, 31, 33)
11
11
 
12
12
  if dark($bg-color)
13
- $fg-color = #eee
13
+ $fg-color = #ccc
14
14
  else
15
15
  $fg-color = #333
16
16
 
17
17
  if dark($bg-color)
18
- $status-bg-color = #000
18
+ $status-bg-color = mix(#000, $bg-color, 10%)
19
19
  else
20
20
  $status-bg-color = #aaa
21
21
 
@@ -26,11 +26,12 @@ else
26
26
 
27
27
  $highlight = activate($bg-color, 10%)
28
28
  $active-highlight = activate($bg-color, 20%)
29
- $normal-border = 1px solid darken($fg-color, 30%)
29
+ $normal-border = 1px solid activate($fg-color, 30%)
30
30
  $scrollbar-track-color = desaturate($active-highlight, 80%)
31
31
  $scrollbar-thumb-color = desaturate(activate($scrollbar-track-color, 30%), 20%)
32
32
  $fg-highlight = mix($fg-color, $highlight, 50%)
33
33
  $fg-active-highlight = mix($fg-color, $active-highlight, 50%)
34
34
 
35
35
  $enable-gradients = true
36
- $main-font = monospace
36
+ $main-font = Menlo, Consolas, monospace
37
+ $default-font-size = 14px
@@ -47,6 +47,7 @@ a
47
47
  position relative
48
48
  user-select text
49
49
  font-family $main-font
50
+ font-size $default-font-size
50
51
  white-space pre-wrap
51
52
 
52
53
  .pane > .pane
@@ -6,15 +6,17 @@
6
6
  margin 0px
7
7
  padding 5px
8
8
  padding-bottom 10px
9
- font-family Monospace
9
+ font-family $main-font
10
10
  height 1em
11
11
  white-space nowrap
12
12
  overflow hidden
13
13
  text-overflow ellipsis
14
14
  user-select none
15
- if $enable-gradients
16
-
17
- background-linear-gradient top, lighten($status-bg-color, 10%), 10%, darken($status-bg-color, 10%), 100%
15
+ if false //$enable-gradients
16
+ //background-linear-gradient top, lighten($status-bg-color, 10%), 10%, darken($status-bg-color, 10%), 100%
17
+ button-gradient $status-bg-color
18
+ else
19
+ border-top 1px solid activate($status-bg-color, 10%)
18
20
  &:before
19
21
  color #781111
20
22
  content "Detached"
@@ -60,7 +60,6 @@ module Rubame
60
60
  end
61
61
 
62
62
  return messages
63
-
64
63
  end
65
64
 
66
65
  def close(client)
@@ -74,7 +73,7 @@ module Rubame
74
73
  end
75
74
 
76
75
  def run(&blk)
77
- readable, writable = IO.select(@reading, @writing, nil, 5)
76
+ readable, writable = IO.select(@reading, @writing, nil, 1)
78
77
 
79
78
  if readable
80
79
  readable.each do |socket|
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flammarion
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.9
5
- prerelease:
4
+ version: 0.1.10pre1
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Zach Capalbo
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-07-27 00:00:00.000000000 Z
12
+ date: 2016-08-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rubame
@@ -3850,9 +3850,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
3850
3850
  required_rubygems_version: !ruby/object:Gem::Requirement
3851
3851
  none: false
3852
3852
  requirements:
3853
- - - ! '>='
3853
+ - - ! '>'
3854
3854
  - !ruby/object:Gem::Version
3855
- version: '0'
3855
+ version: 1.3.1
3856
3856
  requirements: []
3857
3857
  rubyforge_project:
3858
3858
  rubygems_version: 1.8.23