diff --git a/= b/= new file mode 100644 index 00000000..845f7c5a --- /dev/null +++ b/= @@ -0,0 +1,7 @@ +Merge branch 'stage' of https://github.com/whitef0x0/tellform into stage + +# Please enter a commit message to explain why this merge is necessary, +# especially if it merges an updated upstream into a topic branch. +# +# Lines starting with '#' will be ignored, and an empty message aborts +# the commit. diff --git a/public/modules/users/css/users.css b/public/modules/users/css/users.css index 2bf345ed..3b96a65f 100755 --- a/public/modules/users/css/users.css +++ b/public/modules/users/css/users.css @@ -6,7 +6,7 @@ section.auth { left: 0; width: 100%; color: white; - background-color: #1e5799; /* Old browsers */ + background-color: #50B5C1; /* Old browsers */ background: -moz-linear-gradient(137deg, #50B5C1 0%, #6450A0 85%); /* FF3.6-15 */ background: -webkit-linear-gradient(137deg, #50B5C1 0%, #6450A0 85%); /* Chrome10-25,Safari5.1-6 */ background: linear-gradient(137deg, #50B5C1 0%, #6450A0 85%); @@ -58,9 +58,11 @@ section.auth { section.auth .btn { border-radius: 100px; font-size: 14px; - padding: 12px 28px; + padding: 10px 28px; + margin: 0 2px; margin-top: 1em; text-transform: uppercase; + text-decoration: none!important; } section.auth .btn-signup { @@ -75,6 +77,18 @@ section.auth { border: 2px #896D0B solid; } + section.auth .btn-default { + background-color: transparent; + color: white; + border: 2px white solid; + } + + section.auth .btn-default:focus, section.auth .btn-default:hover { + color: #6450A0; + background-color: white; + border-color: white; + } + @media (min-width: 992px) { .nav-users { position: fixed; diff --git a/public/modules/users/views/verify/verify-account.client.view.html b/public/modules/users/views/verify/verify-account.client.view.html index 5c336a00..b2a685ab 100644 --- a/public/modules/users/views/verify/verify-account.client.view.html +++ b/public/modules/users/views/verify/verify-account.client.view.html @@ -1,14 +1,35 @@
-

- {{ 'CONTINUE_TO_LOGIN' | translate }} +
-

{{ 'VERIFY_ERROR' | translate }}

- {{ 'REVERIFY_ACCOUNT_LINK' | translate }} - {{ 'SIGNIN_BTN' | translate }} +
+
+ +
+

+ {{ 'VERIFY_ERROR' | translate }} +

+ + +