From 5d381480704205f1f9cf1aac23167ff582de0a36 Mon Sep 17 00:00:00 2001 From: hunterlester Date: Tue, 6 Dec 2016 22:47:16 -0800 Subject: [PATCH] implements tabs as step progression --- css/master.css | 54 ++++++- index.html | 327 ++++++++++++++++++++------------------ js/transactionListener.js | 4 +- 3 files changed, 230 insertions(+), 155 deletions(-) diff --git a/css/master.css b/css/master.css index 16ad0f3..d5d869d 100644 --- a/css/master.css +++ b/css/master.css @@ -27,8 +27,60 @@ i.fa { font-weight: 600; } +.nav-tabs { + display: inline-block; + border: none; + + /*& > li { + & > a { + outline: none; + border: none !important; + background-color: transparent; + + &:not(.active):hover { + border-bottom: 2px solid $dropdown-link-hover-bg !important; + } + } + + &.active > a, + &.active > a:hover { + border-bottom: 2px solid $btn-default-border !important; + } + }*/ +} + +.nav-tabs>li>a { + font-size: 1.2em; + color: rgb(30, 115, 190); + border: none; +} + +.nav-tabs>li.active>a { + border: none; + color: #ffffff; + background-color: rgb(30, 115, 190); + border-radius: 999px; +} + +.nav-tabs>li.active>a:link { + border: none; +} + +.nav-tabs>li.active>a:hover { + background-color: #eee; +} + +.nav-tabs>li>a:hover { + background-color: #eee; + border-radius: 999px; +} + +.nav-tabs>li>a:active { + background-color: rgb(30, 115, 190); +} + .proposalBlock { - margin-top: 6%; + /*margin-top: 6%;*/ padding: 7%; background-color: #ffffff; box-shadow: 0px 17px 24px 0px rgba(0, 0, 0, 0.16); diff --git a/index.html b/index.html index bb84245..9ddbc0c 100755 --- a/index.html +++ b/index.html @@ -72,6 +72,7 @@ var validProposal = proposal.validate(); if (validProposal) { + document.getElementById('step_two').click(); proposal.walletCommands(); @@ -112,6 +113,17 @@ --> +
+
+ +
+
+
@@ -126,173 +138,182 @@
-
-
-
-
-
-

Create a Proposal

-
Enter details for your proposal and click 'Create Proposal'. This will generate a command you can run in your local wallet to prepare the proposal at a cost of 0.33 Dash
-
-
-
-
-
-
- - -
-
- - -
+
+
+
+
+
+
+
+

Create a Proposal

+
Enter details for your proposal and click 'Create Proposal'. This will generate a command you can run in your local wallet to prepare the proposal at a cost of 0.33 Dash
+
-
-
-
-
- - +
+
+
+
+ + +
+
+ + +
+
-
-
+ +
+
+
+ + +
+
+
+ + + + + + +
+ + +
+ + + +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ + + +
+
+ + + + + + + + + + - - - -
- - -
- - - -
-
-
- - -
+ + +
- -
-
-
- - -
-
-
- - - -
-
- - - - - - - - - - - - - - - -
+
+ + + + + + +
+
+ + +
+
+ +
- - - - - - - - - - -
diff --git a/js/transactionListener.js b/js/transactionListener.js index 0e91019..405b2c1 100755 --- a/js/transactionListener.js +++ b/js/transactionListener.js @@ -28,6 +28,7 @@ function transactionListener(proposal) { $.getJSON(provider + 'insight-api-dash/tx/' + txidfield.val(), function(data) { txidfield.attr("disabled", true); $('.walletCommands#walletCommandsProgress').removeClass('hidden'); + document.getElementById('step_three').click(); var txid = data.tx; var confirmations = data.confirmations; var conftxt; @@ -126,6 +127,7 @@ function transactionListener(proposal) { progbarval = 100; $("#progresstxt").text("Your transaction has " + confirmations + " confirmations. You can now submit the proposal."); $('.walletCommands#walletCommandsSubmit').removeClass('hidden'); + document.getElementById('step_four').click(); } $("#progressbar").progressbar({value: progbarval}) .children('.ui-progressbar-value') @@ -235,4 +237,4 @@ function isAlphaNumeric(str) { } } return true; -} \ No newline at end of file +}