diff --git a/troupon/accounts/templates/account/register_merchant.html b/troupon/accounts/templates/account/register_merchant.html index 02a059b..a7e026e 100644 --- a/troupon/accounts/templates/account/register_merchant.html +++ b/troupon/accounts/templates/account/register_merchant.html @@ -88,13 +88,15 @@ -
-
- {% csrf_token %} +
+
+

Merchant Logo

+

+ {% csrf_token %}
-
+
- -
-
+ +

Forgot your password?

+ + diff --git a/troupon/static/css/base_styles.css b/troupon/static/css/base_styles.css index 149e214..d64048c 100755 --- a/troupon/static/css/base_styles.css +++ b/troupon/static/css/base_styles.css @@ -1838,11 +1838,28 @@ footer.checkout-footer .divider-1 { } .preview-upload-img #preview-upload-img-title { + margin: 20px auto; +} + +.images { margin-bottom: 20px; - margin-left: 86px; } -.preview-upload-img .file-upload-label { - width: 222px; - margin-left: 40px; +.images img { + max-width: 200px; +} + +.file-upload-container { + width: 200px; + margin: 0 auto; +} + +.file-upload-label { + float: none; + clear: both; + width: 100%; +} + +.clear-float * { + float: none; } diff --git a/troupon/static/css/style.css b/troupon/static/css/style.css index 4e1bd5d..97fd49f 100644 --- a/troupon/static/css/style.css +++ b/troupon/static/css/style.css @@ -26,27 +26,14 @@ intl tel input styles: cursor: inherit; display: block; } -.images{ - display:inline-block; - width:300px; - height:250px; - overflow:hidden; - position: relative; - margin: 0 auto; -} -#merchant-logo{ - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} + label.file-upload-label input[type="file"] { position: fixed; top: -1000px; } .file-upload-label { - width: 50%; height: 30px; + float: none; border-radius: 4px; background: #660066; display: inline-block; diff --git a/troupon/static/scss/partials/_pages.scss b/troupon/static/scss/partials/_pages.scss index b3ba592..e6c8956 100755 --- a/troupon/static/scss/partials/_pages.scss +++ b/troupon/static/scss/partials/_pages.scss @@ -179,11 +179,29 @@ footer.checkout-footer { // merchant register page .preview-upload-img { #preview-upload-img-title { - margin-bottom: 20px; - margin-left: 86px; + margin: 20px auto; } - .file-upload-label { - width: 222px; - margin-left: 40px; +} + +.images { + margin-bottom: 20px; + img { + max-width: 200px; } } + +.file-upload-container { + width: 200px; + margin: 0 auto; +} + +.file-upload-label { + float: none; + clear: both; + width: 100%; +} + +// login page +.clear-float * { + float: none; +}