flammarion 0.0.10 → 0.0.11

data/lib/html/build/stylesheets/dialog.css

@@ -1,12 +1,27 @@
 #dialog {
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0,0,0,0.5);
+  position: absolute;
+  left: 0;
+  top: 0;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+#dialog > #content {
   position: absolute;
   top: 10%;
   left: 10%;
   width: 70%;
   height: 70%;
   padding: 1em;
-  background-color: #2d3233;
-  border: 1px solid #a7a7a7;
+  background-color: #bebebe;
+  border: 1px solid #242424;
+  box-shadow: 2px 2px 4px 2px #333;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
   -khtml-user-select: none;
@@ -14,7 +29,7 @@
   -ms-user-select: none;
   user-select: none;
 }
-#dialog > #message {
+#dialog > #content > #message {
   -webkit-touch-callout: all;
   -webkit-user-select: all;
   -khtml-user-select: all;
@@ -26,6 +41,6 @@
   word-wrap: normal;
   overflow: auto;
 }
-#dialog > .full-button {
+#dialog > #content > .full-button {
   height: 1em;
 }

data/lib/html/build/stylesheets/frontend.css

@@ -1,12 +1,17 @@
 @charset "utf-8";
 body {
-  background-color: #383e40;
-  color: #eee;
+  background-color: #eee;
+  color: #333;
   padding: 0px;
   margin: 0px;
   height: 100%;
   width: 100%;
   overflow: hidden;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
   user-select: none;
 }
 html {
@@ -20,10 +25,10 @@ a {
 }
 p a {
   text-decoration: underline;
-  color: #9ca0a1;
+  color: #848484;
 }
 p a:hover {
-  color: #a5aaac;
+  color: #787878;
 }
 .hidden {
   display: none;
@@ -37,17 +42,30 @@ p a:hover {
   box-sizing: border-box;
   word-wrap: break-word;
   position: relative;
+  -webkit-touch-callout: text;
+  -webkit-user-select: text;
+  -khtml-user-select: text;
+  -moz-user-select: text;
+  -ms-user-select: text;
+  user-select: text;
 }
 .pane > .pane {
   width: calc(100% + 16px);
   height: initial;
   margin: -8px;
 }
+.pane > .pane.subpane-fill {
+  height: calc(100% + 16px);
+}
 #panes {
   height: calc(98% - 15px);
   width: 100%;
   box-sizing: border-box;
 }
+html {
+  padding-top: 2px;
+  box-shadow: inset 0px 0px 2px 2px #bebebe;
+}
 .horizontal > .pane {
   height: 100%;
   float: left;
@@ -62,7 +80,7 @@ p a:hover {
 #plot-mouseover {
   position: absolute;
   background-color: rgba(0,0,0,0.5);
-  color: #eee;
+  color: #333;
   pointer-events: none;
   font-family: Monospace;
 }
@@ -72,6 +90,3 @@ p a:hover {
   pointer-events: none;
   border: 1px solid #012;
 }
-.hljs {
-  background-color: #383e40;
-}

data/lib/html/build/stylesheets/scrollbar.css

@@ -7,15 +7,15 @@
   height: 1.5em;
 }
 ::-webkit-scrollbar-thumb {
-  background: #919393;
-  background-color: #b2b3b3;
-  background-image: -webkit-linear-gradient(left, #b2b3b3 40%, #828585 50%);
-  background-image: -moz-linear-gradient(left, #b2b3b3 40%, #828585 50%);
-  background-image: -ms-linear-gradient(left, #b2b3b3 40%, #828585 50%);
-  background-image: -o-linear-gradient(left, #b2b3b3 40%, #828585 50%);
-  background-image: linear-gradient(left, #b2b3b3 40%, #828585 50%);
+  background: #858585;
+  background-color: #aaa;
+  background-image: -webkit-linear-gradient(left, #aaa 40%, #787878 50%);
+  background-image: -moz-linear-gradient(left, #aaa 40%, #787878 50%);
+  background-image: -ms-linear-gradient(left, #aaa 40%, #787878 50%);
+  background-image: -o-linear-gradient(left, #aaa 40%, #787878 50%);
+  background-image: linear-gradient(left, #aaa 40%, #787878 50%);
 }
 ::-webkit-scrollbar-track {
-  background: #626464;
-  box-shadow: inset 0px 0px 1px 1px #32383a;
+  background: #bebebe;
+  box-shadow: inset 0px 0px 1px 1px #d6d6d6;
 }

data/lib/html/build/stylesheets/status.css

@@ -1,23 +1,25 @@
 #status {
-  background-color: #000;
+  background-color: #aaa;
   margin: 0px;
   padding: 5px;
   padding-bottom: 10px;
   font-family: Monospace;
   height: 2%;
-  overflow: none;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
   -khtml-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-  background-color: #1a1a1a;
-  background-image: -webkit-linear-gradient(top, #1a1a1a 10%, #000 100%);
-  background-image: -moz-linear-gradient(top, #1a1a1a 10%, #000 100%);
-  background-image: -ms-linear-gradient(top, #1a1a1a 10%, #000 100%);
-  background-image: -o-linear-gradient(top, #1a1a1a 10%, #000 100%);
-  background-image: linear-gradient(top, #1a1a1a 10%, #000 100%);
+  background-color: #b2b2b2;
+  background-image: -webkit-linear-gradient(top, #b2b2b2 10%, #999 100%);
+  background-image: -moz-linear-gradient(top, #b2b2b2 10%, #999 100%);
+  background-image: -ms-linear-gradient(top, #b2b2b2 10%, #999 100%);
+  background-image: -o-linear-gradient(top, #b2b2b2 10%, #999 100%);
+  background-image: linear-gradient(top, #b2b2b2 10%, #999 100%);
 }
 #status:before {
   color: #781111;
@@ -25,12 +27,10 @@
 }
 #status > .left {
   float: left;
-  width: 33%;
   cursor: pointer;
 }
 #status > .right {
   float: right;
-  width: 33%;
   cursor: pointer;
   text-align: right;
 }

data/lib/html/build/stylesheets/table.css

@@ -7,15 +7,16 @@ td {
   box-sizing: padding-box;
 }
 td.hover {
-  background: #41484a;
+  background: #e2e2e2;
 }
 tr {
   padding: 0;
 }
 tr:hover {
-  background: #41484a;
+  background: #e2e2e2;
 }
 tr:hover td.hover {
   outline: 1px solid #333;
-  background: #383e40;
+  background: #eee;
+  box-shadow: inset 0px 0px 2px 2px #bebebe;
 }

data/lib/html/source/index.html.slim

@@ -22,8 +22,9 @@ html
     #panes
       pre#console-default.pane[style="height:100%"]
     #dialog.hidden
-      pre#message Hi World
-      a#ok.full-button[href="#"] Ok
+      #content
+        pre#message Hi World
+        a#ok.full-button[href="#"] Ok
     #status
       .left
       .center

data/lib/html/source/javascripts/actions.coffee

@@ -33,7 +33,7 @@ $.extend WSClient.prototype.actions,
     else
       target = $('#panes')
 
-    target.append("<pre class='pane' id='console-#{data.name}'><pre>") if target.find("#console-#{data.name}").size() is 0
+    target.append("<pre class='pane full-pane' id='console-#{data.name}'><pre>") if target.find("#console-#{data.name}").size() is 0
     @__parent.resize_panes(data)
 
   closepane: (data) ->
@@ -78,6 +78,7 @@ $.extend WSClient.prototype.actions,
     newblock = $("<div class='markdown'></div>")
     newblock.html(data.text)
     @__parent.add(newblock, target, data)
+    hljs.highlightBlock(code) for code in newblock.find('code')
 
   button: (data) ->
     target = @__parent.check_target(data)
@@ -116,7 +117,8 @@ $.extend WSClient.prototype.actions,
     target = @__parent.check_target(data)
     element = target.find("#console-#{data.name}")
     if element.size() is 0
-      target.append("<pre id='console-#{data.name}' class='pane'></pre>")
+      other_classes = "subpane-fill" if data.fill
+      target.append("<pre id='console-#{data.name}' class='subpane pane #{other_classes}'></pre>")
 
   input: (data) ->
     target = @__parent.check_target(data)
@@ -176,6 +178,19 @@ $.extend WSClient.prototype.actions,
         @__lastChecked = element
     target.append(element)
 
+  dropdown: (data) ->
+    target = @__parent.check_target(data)
+    element = $("<select class='inline-dropdown' name='#{data.id}'></select>")
+    element.append($("<option>#{item}</option>")) for item in data.options
+    element.change (e) =>
+      @__parent.send({
+        id:data.id
+        action:'callback'
+        source:'dropdown'
+        text: element.find('option:selected').text()
+        })
+    @__parent.add(element, target, data)
+
   alert: (data) ->
     alert(data.text)
 
@@ -219,3 +234,9 @@ $.extend WSClient.prototype.actions,
 
   close: (data) ->
     window.close()
+
+  search: (data) ->
+    if window.find(data.text, 0, 0, 1)
+      anchor = window.getSelection().anchorNode
+      anchor = anchor.parentNode unless anchor.nodeType == 1
+      anchor.scrollIntoView()

data/lib/html/source/javascripts/status.coffee

@@ -15,9 +15,9 @@ class StatusDisplay
   show_history: ->
     console.log(@status_history)
     message = "<ul>#{("<li>#{@ws.escape(item.text, item)}</li>" for item in @status_history).join("\n")}</ul>"
-    $('#dialog > #message').html(message)
+    $('#dialog > #content > #message').html(message)
     $('#dialog').show()
-    $('#dialog > #ok').click ->
+    $('#dialog > #content > #ok').click ->
       $('#dialog').hide()
 
 window.StatusDisplay = StatusDisplay

data/lib/html/source/stylesheets/all.css

@@ -1,2 +1 @@
-//=require railscasts.css
 //=require_tree

data/lib/html/source/stylesheets/ansi_colors.styl

@@ -1,8 +1,15 @@
+@import 'colors.styl'
+
 set-ansi(val)
   &-fg
-    color val
+    if light($bg-color)
+      color darken(val, 60%)
+    else
+      color val
   &-bg
     background-color val
+  &-bg&-fg
+    color val
 
 .ansi-black
   set-ansi(rgb(41, 41, 41))

data/lib/html/source/stylesheets/buttons.styl

@@ -33,7 +33,7 @@ buttony(raised = false)
 .full-button
   buttony(true)
 
-.inline-text-input
+.inline-text-input, .inline-dropdown
   buttony()
   text-align left
   box-sizing border-box
@@ -94,9 +94,10 @@ input:focus::-webkit-input-placeholder
   position: absolute
   top: 0.5em
   right: 0.5em
-  margin-right: 0.5em
+  margin-right: 1.0em
   background-color: rgba(0, 0, 0, 0.5)
-  padding: 0.5em
+  drop-shadow()
+  padding: 0
   z-index: 3
 
   & .full-button, .inline-text-input, .inline-checkbox
@@ -113,6 +114,8 @@ input:focus::-webkit-input-placeholder
     &:before
       border 1px solid darken($fg-color, 70%)
       height 50%
+  & .label-icon-left, & .label-icon-right
+    margin 0px 5px
 
 .inline-button
   buttony()

data/lib/html/{build/stylesheets/railscasts.css → source/stylesheets/code.styl}

@@ -4,21 +4,27 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
 
 */
 
+@import 'colors.styl'
 
-.hljs {
+$normal-text-color = #e6e1dc
+$comment-color = #bc9458
+$keyword-color = #c26230
+
+.hljs
   display: block;
   overflow-x: auto;
   padding: 0.5em;
-  background: #232323;
-  color: #e6e1dc;
+  background-color $code-bg-color
+  color: $normal-text-color;
   -webkit-text-size-adjust: none;
-}
+  border-radius 5px
+
 
 .hljs-comment,
-.hljs-shebang {
-  color: #bc9458;
+.hljs-shebang
+  color $comment-color
   font-style: italic;
-}
+
 
 .hljs-keyword,
 .ruby .hljs-function .hljs-keyword,
@@ -26,9 +32,9 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
 .hljs-status,
 .nginx .hljs-title,
 .method,
-.hljs-list .hljs-title {
-  color: #c26230;
-}
+.hljs-list .hljs-title
+  color: $keyword-color
+
 
 .hljs-string,
 .hljs-number,
@@ -41,13 +47,13 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
 .hljs-date,
 .tex .hljs-command,
 .asciidoc .hljs-link_label,
-.markdown .hljs-link_label {
+.markdown .hljs-link_label
   color: #a5c261;
-}
 
-.hljs-subst {
+
+.hljs-subst
   color: #519f50;
-}
+
 
 .hljs-tag,
 .hljs-tag .hljs-keyword,
@@ -55,25 +61,25 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
 .hljs-doctype,
 .hljs-sub .hljs-identifier,
 .hljs-pi,
-.input_number {
+.input_number
   color: #e8bf6a;
-}
 
-.hljs-identifier {
+
+.hljs-identifier
   color: #d0d0ff;
-}
+
 
 .hljs-class .hljs-title,
 .hljs-type,
 .smalltalk .hljs-class,
-.hljs-doctag {
+.hljs-doctag
   text-decoration: none;
-}
+
 
 .hljs-constant,
-.hljs-name {
+.hljs-name
   color: #da4939;
-}
+
 
 
 .hljs-symbol,
@@ -82,97 +88,97 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
 .ruby .hljs-symbol .hljs-identifier,
 .asciidoc .hljs-link_url,
 .markdown .hljs-link_url,
-.hljs-attribute {
+.hljs-attribute
   color: #6d9cbe;
-}
+
 
 .asciidoc .hljs-link_url,
-.markdown .hljs-link_url {
+.markdown .hljs-link_url
   text-decoration: underline;
-}
+
 
 
 
 .hljs-params,
 .hljs-variable,
-.clojure .hljs-attribute {
+.clojure .hljs-attribute
   color: #d0d0ff;
-}
+
 
 .css .hljs-tag,
 .hljs-rule .hljs-property,
 .hljs-pseudo,
-.tex .hljs-special {
+.tex .hljs-special
   color: #cda869;
-}
 
-.css .hljs-class {
+
+.css .hljs-class
   color: #9b703f;
-}
 
-.hljs-rule .hljs-keyword {
+
+.hljs-rule .hljs-keyword
   color: #c5af75;
-}
 
-.hljs-rule .hljs-value {
+
+.hljs-rule .hljs-value
   color: #cf6a4c;
-}
 
-.css .hljs-id {
+
+.css .hljs-id
   color: #8b98ab;
-}
+
 
 .hljs-annotation,
 .apache .hljs-sqbracket,
-.nginx .hljs-built_in {
+.nginx .hljs-built_in
   color: #9b859d;
-}
+
 
 .hljs-preprocessor,
 .hljs-preprocessor *,
-.hljs-pragma {
+.hljs-pragma
   color: #8996a8 !important;
-}
+
 
 .hljs-hexcolor,
-.css .hljs-value .hljs-number {
+.css .hljs-value .hljs-number
   color: #a5c261;
-}
+
 
 .hljs-title,
 .hljs-decorator,
-.css .hljs-function {
+.css .hljs-function
   color: #ffc66d;
-}
+
 
 .diff .hljs-header,
-.hljs-chunk {
+.hljs-chunk
   background-color: #2f33ab;
-  color: #e6e1dc;
+  color: $normal-text-color;
   display: inline-block;
   width: 100%;
-}
 
-.diff .hljs-change {
+
+.diff .hljs-change
   background-color: #4a410d;
   color: #f8f8f8;
   display: inline-block;
   width: 100%;
-}
 
-.hljs-addition {
+
+.hljs-addition
   background-color: #144212;
-  color: #e6e1dc;
+  color: $normal-text-color;
   display: inline-block;
   width: 100%;
-}
 
-.hljs-deletion {
+
+.hljs-deletion
   background-color: #600;
-  color: #e6e1dc;
+  color: $normal-text-color;
   display: inline-block;
   width: 100%;
-}
+
 
 .coffeescript .javascript,
 .javascript .xml,
@@ -180,6 +186,5 @@ Railscasts-like style (c) Visoft, Inc. (Damien White)
 .xml .javascript,
 .xml .vbscript,
 .xml .css,
-.xml .hljs-cdata {
+.xml .hljs-cdata
   opacity: 0.7;
-}