flammarion 0.1.4pre → 0.1.4

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

@@ -11,10 +11,6 @@ html
     meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"
     meta[name="viewport" content="width=device-width, initial-scale=1.0"]
     title Flammarion
-    link href='https://fonts.googleapis.com/css?family=Roboto+Condensed' rel='stylesheet' type='text/css'
-    link href='https://fonts.googleapis.com/css?family=Lora' rel='stylesheet' type='text/css'
-    link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,700,600,300' rel='stylesheet' type='text/css'
-    link href='https://fonts.googleapis.com/css?family=Merriweather:400,400italic,700,700italic' rel='stylesheet' type='text/css'
     = stylesheet_link_tag("all")
     = javascript_include_tag("all")
     javascript:

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

@@ -37,26 +37,29 @@ $.extend WSClient.prototype.actions,
     if data.value
       element[0].value = data.value
 
+    accept = (data) =>
+      @__parent.send({
+        id:data.id
+        action:'callback'
+        source:'input'
+        text: element[0].value
+        original_msg:data
+        })
+      if data.once
+        replaceText = @__parent.escape("#{element[0].value}\n")
+        replaceText = "#{data.label}#{replaceText}" if data.keep_label
+        element.replaceWith(replaceText)
+      if data.history
+        history = element.data('history') || []
+        history.push element[0].value
+        element.data('history', history)
+        element.data('history-index', history.length)
+      if data.autoclear
+        element[0].value = ""
+
     element.change =>
-      unless element.hasClass("unclicked")
-        @__parent.send({
-          id:data.id
-          action:'callback'
-          source:'input'
-          text: element[0].value
-          original_msg:data
-          })
-        if data.once
-          replaceText = @__parent.escape("#{element[0].value}\n")
-          replaceText = "#{data.label}#{replaceText}" if data.keep_label
-          element.replaceWith(replaceText)
-        if data.history
-          history = element.data('history') || []
-          history.push element[0].value
-          element.data('history', history)
-          element.data('history-index', history.length)
-        if data.autoclear
-          element[0].value = ""
+      unless element.hasClass("unclicked") or data.enter_only
+        accept(data)
 
     offset_history = (e, amt) =>
       history = element.data('history') || []
@@ -69,6 +72,8 @@ $.extend WSClient.prototype.actions,
     element.keydown (e) =>
       offset_history(e, -1) if e.which is 38 and data.history
       offset_history(e, +1) if e.which is 40 and data.history
+      if e.which is 13 and data.enter_only
+        accept(data)
 
     target.append(element)
 

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

@@ -14,16 +14,17 @@ buttony(raised = false)
   margin-bottom 0.5em
   user-select none
   if raised and $enable-gradients
-    background-linear-gradient top, lighten($bg-color, 10%), 40%, darken($bg-color, 10%), 100%
+    button-gradient $bg-color
 
   &:hover
+    color darken($fg-color, 0%)
     background-color $highlight
     if raised and $enable-gradients
-      background-linear-gradient top, lighten($highlight, 10%), 40%, darken($highlight, 10%), 100%
+      button-gradient $highlight
   &:active
     background-color $active-highlight
     if raised and $enable-gradients
-      background-linear-gradient top, darken($highlight, 10%), 40%, lighten($highlight, 10%), 100%
+      button-gradient $highlight, true
 
   & > .label-icon-left
     float left
@@ -68,15 +69,13 @@ input:focus::-webkit-input-placeholder
     height 1em
     border $normal-border
     margin-right 0.5em
-    if $enable-gradients
-      background-linear-gradient top, lighten($bg-color, 10%), 40%, darken($bg-color, 10%), 100%
+    button-gradient $bg-color
   &.checked:before
     content "X"
     font-weight 900
     color activate($bg-color, 40%)
     text-align center
-    if $enable-gradients
-      background-linear-gradient top, darken($highlight, 10%), 40%, lighten($highlight, 10%), 100%
+    button-gradient $highlight, true
   &:hover
     background-color $highlight
 

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

@@ -6,7 +6,8 @@ activate(color, ammount)
 
 // $bg-color = #120018
 // $bg-color = #383e40
-$bg-color = #eee
+// $bg-color = #eee
+$bg-color = rgb(29, 31, 33)
 
 if dark($bg-color)
   $fg-color = #eee

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

@@ -27,11 +27,11 @@ html
 
 a
   text-decoration none
-  p &
+  color $fg-highlight
+  &:hover
+    color $fg-active-highlight
+  p &, .markdown &
     text-decoration underline
-    color $fg-highlight
-    &:hover
-      color $fg-active-highlight
 
 .hidden
   display none

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

@@ -0,0 +1,144 @@
+/* cyrillic */
+@font-face {
+  font-family: 'Lora';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Lora'), local('Lora-Regular'), url('../fonts/Lora-Regular.ttf') format('truetype');
+  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Lora';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Lora'), local('Lora-Regular'), url('../fonts/Lora-Regular.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Lora';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Lora'), local('Lora-Regular'), url('../fonts/Lora-Regular.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Lora';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Lora Bold'), local('Lora-Bold'), url('../fonts/Lora-Bold.ttf') format('truetype');
+  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Lora';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Lora Bold'), local('Lora-Bold'), url('../fonts/Lora-Bold.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Lora';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Lora Bold'), local('Lora-Bold'), url('../fonts/Lora-Bold.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url('../fonts/SourceSansPro-Regular.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url('../fonts/SourceSansPro-Bold.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url('../fonts/SourceSansPro-Bold.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url('../fonts/SourceSansPro-Bold.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: italic;
+  font-weight: 400;
+  src: local('Source Sans Pro Italic'), local('SourceSansPro-It'), url('../fonts/SourceSansPro-Italic.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Source Sans Pro Bold Italic'), local('SourceSansPro-BoldIt'), url('../fonts/SourceSansPro-BoldItalic.ttf') format('truetype');
+  unicode-range: U+0102-0103, U+1EA0-1EF1, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Source Sans Pro Bold Italic'), local('SourceSansPro-BoldIt'), url('../fonts/SourceSansPro-BoldItalic.ttf') format('truetype');
+  unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: italic;
+  font-weight: 700;
+  src: local('Source Sans Pro Bold Italic'), local('SourceSansPro-BoldIt'), url('../fonts/SourceSansPro-BoldItalic.ttf') format('truetype');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+}

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

@@ -1,7 +1,6 @@
 .markdown
   white-space normal
   font-family 'Source Sans Pro'
-  // font-family serif
   max-width 45em
   margin auto
 

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

@@ -22,3 +22,21 @@ box-shadow-inset(ammount = 2)
 drop-shadow(ammount = 2)
   if $enable-gradients
     box-shadow 2px 2px 4px 2px darken($bg-color, 20%)
+
+button-gradient(bcolor, reverse = false)
+  if $enable-gradients
+    start = lighten(bcolor, 10%)
+    end = darken(bcolor, 10%)
+    if reverse
+      tmp = end
+      end = start
+      start = tmp
+
+    if dark($bg-color)
+      gstart = 0%
+      gend = 20%
+    else
+      gstart = 40%
+      gend = 100%
+
+    background-linear-gradient top, start, gstart, end, gend

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

@@ -13,6 +13,7 @@
   text-overflow ellipsis
   user-select none
   if $enable-gradients
+
     background-linear-gradient top, lighten($status-bg-color, 10%), 10%, darken($status-bg-color, 10%), 100%
   &:before
     color #781111

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flammarion
 version: !ruby/object:Gem::Version
-  version: 0.1.4pre
-  prerelease: 5
+  version: 0.1.4
+  prerelease: 
 platform: ruby
 authors:
 - Zach Capalbo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubame
@@ -139,6 +139,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: websocket
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +227,7 @@ files:
 - lib/html/source/stylesheets/mixins.styl
 - lib/html/source/stylesheets/colors.styl
 - lib/html/source/stylesheets/code.styl
+- lib/html/source/stylesheets/google_fonts.css
 - lib/html/source/stylesheets/font-awesome/HELP-US-OUT.txt
 - lib/html/source/stylesheets/font-awesome/css/font-awesome.min.css
 - lib/html/source/stylesheets/font-awesome/css/font-awesome.css
@@ -242,10 +259,28 @@ files:
 - lib/html/source/javascripts/status.coffee
 - lib/html/source/javascripts/map.coffee
 - lib/html/source/javascripts/querystring.coffee
+- lib/html/source/fonts/SourceSansPro-ExtraLight.ttf
+- lib/html/source/fonts/Lora-Regular.ttf
+- lib/html/source/fonts/Lora-Italic.ttf
+- lib/html/source/fonts/SourceSansPro-ExtraLightItalic.ttf
 - lib/html/source/fonts/fontawesome-webfont.eot
+- lib/html/source/fonts/Lora-BoldItalic.ttf
+- lib/html/source/fonts/SourceSansPro-Light.ttf
+- lib/html/source/fonts/SourceSansPro-BlackItalic.ttf
+- lib/html/source/fonts/SourceSansPro-LightItalic.ttf
 - lib/html/source/fonts/fontawesome-webfont.woff2
+- lib/html/source/fonts/Lora-Bold.ttf
+- lib/html/source/fonts/SourceSansPro/OFL.txt
 - lib/html/source/fonts/fontawesome-webfont.ttf
+- lib/html/source/fonts/SourceSansPro-BoldItalic.ttf
+- lib/html/source/fonts/Lora/OFL.txt
+- lib/html/source/fonts/SourceSansPro-Black.ttf
+- lib/html/source/fonts/SourceSansPro-Bold.ttf
+- lib/html/source/fonts/SourceSansPro-Italic.ttf
+- lib/html/source/fonts/SourceSansPro-SemiboldItalic.ttf
+- lib/html/source/fonts/SourceSansPro-Regular.ttf
 - lib/html/source/fonts/fontawesome-webfont.woff
+- lib/html/source/fonts/SourceSansPro-Semibold.ttf
 - lib/html/source/fonts/FontAwesome.otf
 - lib/html/source/fonts/fontawesome-webfont.svg
 - lib/html/config.rb
@@ -263,6 +298,7 @@ files:
 - lib/html/build/stylesheets/plot.css
 - lib/html/build/stylesheets/status.css
 - lib/html/build/stylesheets/ansi_colors.css
+- lib/html/build/stylesheets/google_fonts.css
 - lib/html/build/stylesheets/font-awesome/HELP-US-OUT.txt
 - lib/html/build/stylesheets/font-awesome/css/font-awesome.min.css
 - lib/html/build/stylesheets/font-awesome/css/font-awesome.css
@@ -294,10 +330,28 @@ files:
 - lib/html/build/javascripts/actions.js
 - lib/html/build/javascripts/input.js
 - lib/html/build/javascripts/querystring.js
+- lib/html/build/fonts/SourceSansPro-ExtraLight.ttf
+- lib/html/build/fonts/Lora-Regular.ttf
+- lib/html/build/fonts/Lora-Italic.ttf
+- lib/html/build/fonts/SourceSansPro-ExtraLightItalic.ttf
 - lib/html/build/fonts/fontawesome-webfont.eot
+- lib/html/build/fonts/Lora-BoldItalic.ttf
+- lib/html/build/fonts/SourceSansPro-Light.ttf
+- lib/html/build/fonts/SourceSansPro-BlackItalic.ttf
+- lib/html/build/fonts/SourceSansPro-LightItalic.ttf
 - lib/html/build/fonts/fontawesome-webfont.woff2
+- lib/html/build/fonts/Lora-Bold.ttf
+- lib/html/build/fonts/SourceSansPro/OFL.txt
 - lib/html/build/fonts/fontawesome-webfont.ttf
+- lib/html/build/fonts/SourceSansPro-BoldItalic.ttf
+- lib/html/build/fonts/Lora/OFL.txt
+- lib/html/build/fonts/SourceSansPro-Black.ttf
+- lib/html/build/fonts/SourceSansPro-Bold.ttf
+- lib/html/build/fonts/SourceSansPro-Italic.ttf
+- lib/html/build/fonts/SourceSansPro-SemiboldItalic.ttf
+- lib/html/build/fonts/SourceSansPro-Regular.ttf
 - lib/html/build/fonts/fontawesome-webfont.woff
+- lib/html/build/fonts/SourceSansPro-Semibold.ttf
 - lib/html/build/fonts/FontAwesome.otf
 - lib/html/build/fonts/fontawesome-webfont.svg
 - lib/html/Gemfile
@@ -333,9 +387,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23