diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-01-13 21:18:47 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-01-13 21:18:47 +0900 |
commit | 5de15ba8d3d780fdb7a9c53281bd3faac4f08e0e (patch) | |
tree | 0372ee7061e53096a8da966229bf4e711edb83d7 | |
parent | db97e58fdbe9821ff2d17343114e1d8d293af8f7 (diff) | |
download | poe-5de15ba8d3d780fdb7a9c53281bd3faac4f08e0e.tar.gz |
improve web ui
-rw-r--r-- | app/assets/javascripts/snippets.es6 | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/application.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/snippets.scss | 11 | ||||
-rw-r--r-- | app/views/layouts/application.html.haml | 2 |
4 files changed, 23 insertions, 16 deletions
diff --git a/app/assets/javascripts/snippets.es6 b/app/assets/javascripts/snippets.es6 index d3c3be1..e273fad 100644 --- a/app/assets/javascripts/snippets.es6 +++ b/app/assets/javascripts/snippets.es6 @@ -7,6 +7,12 @@ if (codeField !== null) { const codeMirror = CodeMirror.fromTextArea(origTextarea, { mode: "ruby", lineNumbers: true, + extraKeys: { + "Ctrl-Enter": cm => { + cm.save(); + origTextarea.form.submit(); + } + } }); codeMirror.on("change", cm => cm.save()); } @@ -20,7 +26,6 @@ const agg = (elm, n) => { url: "/results/" + elm.getAttribute("data-id"), dataType: "text", success: (text, st) => { - console.log(text); elm.outerHTML = text; if (n < 3) agg(elm, n); } @@ -46,7 +51,6 @@ for (var i = 0, len = notrans.length; i < len; i++) { dataType: "text", data: { compiler_id: elm.getAttribute("data-compiler-id"), snippet_id: snippet_id }, success: (text, st) => { - console.log(text); elm.outerHTML = text; } }); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 0004078..c7fd515 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -3,10 +3,19 @@ @import "codemirror"; @import "./*"; +.navbar > .container-fluid { + padding: 0 30px; +} + /* disable responsive design in navbar partially */ @media (max-width: 768px) { .navbar-nav { margin: 0 -15px; + + li > a { + padding-top: 15px; + padding-bottom: 15px; + } } .navbar-left { @@ -20,13 +29,4 @@ .navbar-nav > li { float: left; } - - .navbar-nav .dropdown-menu { - left: auto; - right: 0 - } - - .navbar-nav .open .dropdown-menu { - position: absolute; - } } diff --git a/app/assets/stylesheets/snippets.scss b/app/assets/stylesheets/snippets.scss index afad32d..5bc0acf 100644 --- a/app/assets/stylesheets/snippets.scss +++ b/app/assets/stylesheets/snippets.scss @@ -1,4 +1,7 @@ -/* - Place all the styles related to the matching controller here. - They will automatically be included in application.css. -*/ +@media (max-width: 768px) { + .form-inline .form-control { + display: inline-block; + width: auto; + vertical-align: middle; + } +} diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index bb6838b..6cfaf68 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -9,7 +9,7 @@ %body %nav.navbar.navbar-default.navbar-static-top .container-fluid - .nav.navbar-header + .nav.navbar-header.navbar-left %a.navbar-brand{href: "/"}= application_name %ul.nav.navbar-nav.navbar-right %li |