From ac90acb2a32bd2c0f51cb232f99dd3d8a85df19b Mon Sep 17 00:00:00 2001 From: David Smith Date: Fri, 23 Oct 2020 11:43:29 +0100 Subject: [PATCH] more small changes --- marlowe-playground-client/src/Halogen/Monaco.purs | 2 +- marlowe-playground-client/src/Help.purs | 9 +++++++-- marlowe-playground-client/src/NewProject/State.purs | 6 +++--- marlowe-playground-client/static/css/panels.scss | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/marlowe-playground-client/src/Halogen/Monaco.purs b/marlowe-playground-client/src/Halogen/Monaco.purs index 766bddc121f..3e9b7058dee 100644 --- a/marlowe-playground-client/src/Halogen/Monaco.purs +++ b/marlowe-playground-client/src/Halogen/Monaco.purs @@ -30,7 +30,7 @@ data KeyBindings derive instance genericKeyBindings :: Generic KeyBindings _ instance showKeyBindings :: Show KeyBindings where - show DefaultBindings = "Default" + show DefaultBindings = "Default Key Bindings" show Vim = "Vim" show Emacs = "Emacs" diff --git a/marlowe-playground-client/src/Help.purs b/marlowe-playground-client/src/Help.purs index 5239532c83e..5add0ae6ab9 100644 --- a/marlowe-playground-client/src/Help.purs +++ b/marlowe-playground-client/src/Help.purs @@ -37,7 +37,7 @@ toHTML helpType = , p [ class_ (ClassName "help-body") ] [ bodyText helpType ] ] where - headerText MarloweHelp = text "Modelling contracts in Marlowe" + headerText MarloweHelp = text "Simulation and analysis" headerText InputComposerHelp = text "Input Composer" @@ -49,7 +49,12 @@ toHTML helpType = headerText EditorHelp = text "Marlowe Code Editor" - bodyText MarloweHelp = text "Marlowe is designed to support the execution of financial contracts on blockchain, and specifically to work on Cardano. Contracts are built by putting together a small number of constructs that in combination can be used to describe many different kinds of financial contract" + bodyText MarloweHelp = + div [] + [ p_ [ text "In this pane you can simulate and analyse Marlowe contracts." ] + , p_ [ text "The main display area shows the contract that is still to be executed, so that this changes as the simulation moves forwards or backwards. Underneath this is shown the current state, including the currency in each of the contract’s accounts and the current slot. Other tabs in that section show logs, errors and warnings, as well as giving access to static analysis results." ] + , p_ [ text "Above this information are shown the actions available at this point in the simulation. An action is preformed by pressing the “+” button next to it; a single action is undone by pressing “Undo”; “Reset” will reset the simulation to the start." ] + ] bodyText InputComposerHelp = text "The Input Composer allows you to choose any of the possible inputs to add to a transaction" diff --git a/marlowe-playground-client/src/NewProject/State.purs b/marlowe-playground-client/src/NewProject/State.purs index 98e74040acf..f9bbd9d74fa 100644 --- a/marlowe-playground-client/src/NewProject/State.purs +++ b/marlowe-playground-client/src/NewProject/State.purs @@ -5,7 +5,7 @@ import Data.Maybe (Maybe(..)) import Effect.Aff.Class (class MonadAff) import Halogen (ClassName(..), ComponentHTML, HalogenM) import Halogen.Classes (flex) -import Halogen.HTML (a, div, h2_, hr_, input, text) +import Halogen.HTML (button, div, h2_, hr_, input, text) import Halogen.HTML.Events (onClick, onValueChange) import Halogen.HTML.Properties (class_, classes, value) import Marlowe (SPParams_) @@ -34,7 +34,7 @@ render state = [ input [ value (state ^. _projectName), onValueChange (Just <<< ChangeProjectName) ] , hr_ , h2_ [ text "Choose your initial coding environment" ] - , div [ classes [ flex, ClassName "language-links" ] ] (map link [ Haskell, Javascript, Marlowe, Blockly ]) + , div [ classes [ flex, ClassName "group", ClassName "open-buttons" ] ] (map link [ Haskell, Javascript, Marlowe, Blockly ]) , renderError (state ^. _error) ] where @@ -42,4 +42,4 @@ render state = renderError (Just err) = div [ class_ (ClassName "error") ] [ text err ] - link lang = a [ onClick (const <<< Just $ CreateProject lang) ] [ text $ show lang ] + link lang = button [ onClick (const <<< Just $ CreateProject lang) ] [ text $ show lang ] diff --git a/marlowe-playground-client/static/css/panels.scss b/marlowe-playground-client/static/css/panels.scss index 82a98252b2f..a2d418892c1 100644 --- a/marlowe-playground-client/static/css/panels.scss +++ b/marlowe-playground-client/static/css/panels.scss @@ -447,7 +447,8 @@ button.minus-btn:hover { } .editor-options select { - width: 6rem; + width: fit-content; + padding-right: 2rem; } .analysis-result-title {