From a44704c4fe5f17d2beb864d5bf2366535343ddd9 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 22 Mar 2017 16:32:37 +0100 Subject: [PATCH 1/3] merging with tablet-ui --- interface/resources/html/tabletHelp.html | 127 +++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 interface/resources/html/tabletHelp.html diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html new file mode 100644 index 0000000000..1c70300297 --- /dev/null +++ b/interface/resources/html/tabletHelp.html @@ -0,0 +1,127 @@ + + + + + + Welcome to Interface + + + + + + +
+ + + + +
+ + + From 3a896541112f6c673b8a37b4740eff5b42cb0116 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 22 Mar 2017 19:14:53 +0100 Subject: [PATCH 2/3] saving work --- interface/resources/html/tabletHelp.html | 13 ++++++------ interface/src/Application.cpp | 8 +++++--- scripts/system/help.js | 26 ++++++++++++++++-------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html index 1c70300297..6bd3b0e7ad 100644 --- a/interface/resources/html/tabletHelp.html +++ b/interface/resources/html/tabletHelp.html @@ -6,10 +6,11 @@ Welcome to Interface @@ -118,10 +148,9 @@
- - - - + + +