diff --git a/assets/css/app.css.sass b/assets/css/app.css.sass index d1780c3..6a3f6dd 100644 --- a/assets/css/app.css.sass +++ b/assets/css/app.css.sass @@ -15,19 +15,19 @@ body .classes @include span(12%) - .source_view - @include span(23%) + @include span(24%) .instruction_view - @include span(33%) + @include span(30%) .status_view - @include span(13%) + @include span(15%) line-height : 1.25em - + .header_state + color: #53a5ff .labels_view @include span(1) diff --git a/assets/css/menu.css.sass b/assets/css/menu.css.sass index 561ae1a..79e2a2e 100644 --- a/assets/css/menu.css.sass +++ b/assets/css/menu.css.sass @@ -10,7 +10,7 @@ body width: 190px border-radius: 8px background: black - border: 3px solid #C3D46A + border: 2px solid #C3D46A #nav li /* all list items */ diff --git a/config.ru b/config.ru index 8bd1b9d..224b737 100644 --- a/config.ru +++ b/config.ru @@ -12,5 +12,5 @@ run Opal::Sprockets::Server.new { |s| s.append_path 'assets' s.debug = !ENV["DEBUG"].nil? s.index_path = "index.html.erb" - s.sprockets.cache = Sprockets::Cache::MemoryStore.new(10000) + s.sprockets.cache = Sprockets::Cache::MemoryStore.new(50000) } diff --git a/lib/base/element_view.rb b/lib/base/element_view.rb index dc57b51..9669695 100644 --- a/lib/base/element_view.rb +++ b/lib/base/element_view.rb @@ -27,7 +27,7 @@ class ElementView # second argument is optional, but if given will be added as text (content) to the newly # created Element # return the new Element, which is not linked into the dom at that point (see << and add*) - def div name_class = "div" , text = nil + def div(name_class = "div" , text = nil) name , clazz = name_class.split(".") name = "div" if name.empty? element = $document.create_element(name) diff --git a/lib/views/status_view.rb b/lib/views/status_view.rb index 20aeaad..d3af565 100644 --- a/lib/views/status_view.rb +++ b/lib/views/status_view.rb @@ -8,16 +8,16 @@ class StatusView < ElementView end def draw + header = div("h4" , "Interpreter" ) + header << div("span.header_state" , state_text) @element = div(".status_view") << - div("h4" , "Interpreter" ) << + header << div("button.next" , "Next") << div("button.run" , "Run") << div("button.wizz" , "Wizz") << div( "br") << div("span.clock" , clock_text) << div( "br") << - div("span.state" , state_text) << - div( "br") << div("span.flags" , flags_text) << div( "br" , "Stdout") << div("span.stdout") @@ -55,7 +55,7 @@ class StatusView < ElementView end def state_text - "State #{@interpreter.state}" + " (#{@interpreter.state})" end def flags_text