diff options
| author | Adam Soltys <[email protected]> | 2016-02-06 23:03:34 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2016-02-06 23:30:26 -0800 |
| commit | 28365158a300bd1d9d7cc6882ce3b350dd1320ed (patch) | |
| tree | d6338e6f5ae25903be7ea326e1e5777638d79562 | |
| parent | dc762c8715cfc6f75a6deac87fef89a09b954dfa (diff) | |
| download | coinos-server-28365158a300bd1d9d7cc6882ce3b350dd1320ed.tar.gz coinos-server-28365158a300bd1d9d7cc6882ce3b350dd1320ed.zip | |
Adjustments
| -rw-r--r-- | public/css/coinos.css | 28 | ||||
| -rw-r--r-- | public/css/coinos.less | 15 | ||||
| -rw-r--r-- | views/users/show.html | 20 |
3 files changed, 46 insertions, 17 deletions
diff --git a/public/css/coinos.css b/public/css/coinos.css index abf4e3d6..9ddd44bd 100644 --- a/public/css/coinos.css +++ b/public/css/coinos.css @@ -48,7 +48,7 @@ div.container-fluid { .tippad .btn { margin-bottom: 5px; padding: 10px; - width: 4.5em; + width: 6em; } .numpad h2, .tippad h2 { @@ -56,13 +56,35 @@ div.container-fluid { margin-top: 1px; } .numpad { - width: 18em; + width: 24em; } .rates { - width: 14em; margin-top: -15px; text-align: right; } +#slide { + height: 1.8em; + width: 100%; + margin-bottom: 2px; +} +@media (max-width: 360px) { + .tippad .btn { + width: 4.8em; + } + .numpad, + .tippad, + .rates, + #payment { + padding-left: 5px; + } + .rates { + width: 100%; + text-align: left; + } + #address { + font-size: 16px; + } +} #payment h2 { margin-bottom: 2px; } diff --git a/public/css/coinos.less b/public/css/coinos.less index 8eead10e..42cdc3bc 100644 --- a/public/css/coinos.less +++ b/public/css/coinos.less @@ -18,11 +18,20 @@ div.container-fluid { .navbar-collapse.in { overflow-y: visible; } #connection { display: none; } -.numpad .btn, .tippad .btn { margin-bottom: 5px; padding: 10px; width: 4.5em; } +.numpad .btn, .tippad .btn { margin-bottom: 5px; padding: 10px; width: 6em; } .numpad h2, .tippad h2 { margin-bottom: 2px; margin-top: 1px; } -.numpad { width: 18em; } +.numpad { width: 24em; } +.rates { margin-top: -15px; text-align: right; } + +#slide { height: 1.8em; width: 100%; margin-bottom: 2px; } + +@media (max-width: 360px) { + .tippad .btn { width: 4.8em; } + .numpad, .tippad, .rates, #payment { padding-left: 5px; } + .rates { width: 100%; text-align: left; } + #address{ font-size: 16px; } +} -.rates { width: 14em; margin-top: -15px; text-align: right; } #payment h2 { margin-bottom: 2px; } diff --git a/views/users/show.html b/views/users/show.html index e0cc4d04..c65b4efd 100644 --- a/views/users/show.html +++ b/views/users/show.html @@ -18,12 +18,10 @@ Your email has been verified. Thank you! <img id="logo" src="/img/bitcoin.png" alt="Logo" /> <div id="controls"> - <div class="rates pull-right tablet"> - <h2><small>@</small> <span class="exchange"></span></h2> - <h3 style="margin-top: -5px"> - <span class="label label-default symbol"></span> - <span class="label label-success commission"></span> - </h3> + <div class="rates tablet pull-right" style="margin-top: -20px; width: 9em"> + <h2><small>@</small><span class="exchange"></span></h2> + <h3 style="margin-top: 0"><span class="label label-default symbol"></span></h3> + <h3><span class="label label-success commission"></span></h3> </div> <div class="numpad pull-left"> @@ -46,7 +44,7 @@ Your email has been verified. Thank you! </div> <div class="tippad tablet"> - <h2><small>+</small> <span class="tip"></span></h2> + <h2><small>+</small><span class="tip"></span></h2> <button type="button" class="active btn btn-lg btn-default">0%</button><br /> <button type="button" class="btn btn-lg btn-default">10%</button><br /> <button type="button" class="btn btn-lg btn-default">15%</button><br /> @@ -55,7 +53,7 @@ Your email has been verified. Thank you! <div class="clearfix mobile"></div> <div class="tippad mobile" style="margin-top: 10px"> - <h2><small>+</small> <span class="tip"></span> <small>TIP</small></h2> + <h2><small>+</small><span class="tip"></span> <small>TIP</small></h2> <div class="btn-group"> <button type="button" class="active btn btn-lg btn-default">0%</button> <button type="button" class="btn btn-lg btn-default">10%</button> @@ -64,16 +62,16 @@ Your email has been verified. Thank you! </div> </div> - <div class="mobile"> + <div class="rates mobile"> <h3 class="pull-right" style="margin-top: -2px"> <span class="label label-default symbol"></span> <span class="label label-success commission"></span> </h3> - <h2><small>@</small> <span class="exchange"></span></h2> + <h2><small>@</small><span class="exchange"></span></h2> </div> </div> - <button id="slide" class="btn btn-primary" style="height: 1.8em; width: 100%; margin-bottom: 2px;"><i class="fa fa-lg fa-sort-up"></i></button> + <button id="slide" class="btn btn-primary"><i class="fa fa-lg fa-sort-up"></i></button> <div id="payment" style="margin-top: -10px"> <h2><small>Please send</small> <span id="total">0.0</span> <small class="unit"></small></h2> |
