Commit af39abc09d8c4a315ff8ae0d6c3b25796ccf9996
Merge remote-tracking branch 'origin/master'
Showing
3 changed files
with
74 additions
and
6 deletions
Show diff stats
frontend/views/layouts/main.php
| @@ -149,7 +149,7 @@ _________________________________________________________ --> | @@ -149,7 +149,7 @@ _________________________________________________________ --> | ||
| 149 | 149 | ||
| 150 | <div class="modal fade" id="feedback-modal" tabindex="-1" role="dialog" aria-labelledby="Login" aria-hidden="true"> | 150 | <div class="modal fade" id="feedback-modal" tabindex="-1" role="dialog" aria-labelledby="Login" aria-hidden="true"> |
| 151 | <div class="modal-dialog"> | 151 | <div class="modal-dialog"> |
| 152 | - | 152 | + |
| 153 | <div class="modal-content"> | 153 | <div class="modal-content"> |
| 154 | <div class="modal-header"> | 154 | <div class="modal-header"> |
| 155 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> | 155 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> |
| @@ -204,14 +204,14 @@ _________________________________________________________ --> | @@ -204,14 +204,14 @@ _________________________________________________________ --> | ||
| 204 | 204 | ||
| 205 | <div class="modal fade" id="success-modal" tabindex="-1" role="dialog" aria-labelledby="Success" aria-hidden="true"> | 205 | <div class="modal fade" id="success-modal" tabindex="-1" role="dialog" aria-labelledby="Success" aria-hidden="true"> |
| 206 | <div class="modal-dialog"> | 206 | <div class="modal-dialog"> |
| 207 | - | 207 | + |
| 208 | <div class="modal-content"> | 208 | <div class="modal-content"> |
| 209 | <div class="modal-header"> | 209 | <div class="modal-header"> |
| 210 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> | 210 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> |
| 211 | <h3 class="modal-title" id="Success">Success</h3> | 211 | <h3 class="modal-title" id="Success">Success</h3> |
| 212 | </div> | 212 | </div> |
| 213 | <div class="modal-body"> | 213 | <div class="modal-body"> |
| 214 | - | 214 | + |
| 215 | <p>Thank for your reply, we will call you, maybe.</p> | 215 | <p>Thank for your reply, we will call you, maybe.</p> |
| 216 | <p class="text-center"> | 216 | <p class="text-center"> |
| 217 | <button type="button" class="btn btn-template-primary" data-dismiss="modal">Close</button> | 217 | <button type="button" class="btn btn-template-primary" data-dismiss="modal">Close</button> |
| @@ -236,7 +236,7 @@ _________________________________________________________ --> | @@ -236,7 +236,7 @@ _________________________________________________________ --> | ||
| 236 | 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], | 236 | 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], |
| 237 | ] | 237 | ] |
| 238 | ) ?> | 238 | ) ?> |
| 239 | - | 239 | + |
| 240 | </div> | 240 | </div> |
| 241 | </div> | 241 | </div> |
| 242 | </div> | 242 | </div> |
| @@ -426,7 +426,9 @@ _________________________________________________________ --> | @@ -426,7 +426,9 @@ _________________________________________________________ --> | ||
| 426 | <!-- /#copyright --> | 426 | <!-- /#copyright --> |
| 427 | 427 | ||
| 428 | <!-- *** COPYRIGHT END *** --> | 428 | <!-- *** COPYRIGHT END *** --> |
| 429 | - | 429 | + |
| 430 | + <div id="content">Scroll ↓</div> | ||
| 431 | + <a href="#" id="back-to-top" title="Back to top">↑</a> | ||
| 430 | 432 | ||
| 431 | </div> | 433 | </div> |
| 432 | <!-- /#all --> | 434 | <!-- /#all --> |
frontend/web/css/custom.css
| @@ -77,11 +77,42 @@ | @@ -77,11 +77,42 @@ | ||
| 77 | border-top-left-radius: 5px; | 77 | border-top-left-radius: 5px; |
| 78 | border-top-right-radius: 5px; | 78 | border-top-right-radius: 5px; |
| 79 | } | 79 | } |
| 80 | - | ||
| 81 | .has-success .form-control { | 80 | .has-success .form-control { |
| 82 | border-color: #d6e9c6; | 81 | border-color: #d6e9c6; |
| 83 | } | 82 | } |
| 84 | 83 | ||
| 85 | .has-error .form-control { | 84 | .has-error .form-control { |
| 86 | border-color: #ebccd1; | 85 | border-color: #ebccd1; |
| 86 | +} | ||
| 87 | + | ||
| 88 | +#back-to-top { | ||
| 89 | + position: fixed; | ||
| 90 | + bottom: 90px; | ||
| 91 | + right: 120px; | ||
| 92 | + z-index: 9999; | ||
| 93 | + width: 50px; | ||
| 94 | + height: 50px; | ||
| 95 | + text-align: center; | ||
| 96 | + line-height: 30px; | ||
| 97 | + background: #f5f5f5; | ||
| 98 | + color: #444; | ||
| 99 | + cursor: pointer; | ||
| 100 | + border-radius: 50%; | ||
| 101 | + text-decoration: none; | ||
| 102 | + transition: opacity 0.2s ease-out; | ||
| 103 | + opacity: 0; | ||
| 104 | + border-color: #38a7bb; | ||
| 105 | + border-width: 2px; | ||
| 106 | +} | ||
| 107 | + | ||
| 108 | +#back-to-top:hover { | ||
| 109 | + background: #e9ebec; | ||
| 110 | +} | ||
| 111 | + | ||
| 112 | +#back-to-top.show { | ||
| 113 | + opacity: 1; | ||
| 114 | +} | ||
| 115 | + | ||
| 116 | +#content { | ||
| 117 | + height: 2000px; | ||
| 87 | } | 118 | } |
| 88 | \ No newline at end of file | 119 | \ No newline at end of file |
frontend/web/js/script.js
| 1 | $( | 1 | $( |
| 2 | function() { | 2 | function() { |
| 3 | + | ||
| 3 | $(document) | 4 | $(document) |
| 4 | .on( | 5 | .on( |
| 5 | 'beforeSubmit', '#feedback-form', function(e) { | 6 | 'beforeSubmit', '#feedback-form', function(e) { |
| @@ -31,5 +32,39 @@ $( | @@ -31,5 +32,39 @@ $( | ||
| 31 | e.preventDefault(); | 32 | e.preventDefault(); |
| 32 | } | 33 | } |
| 33 | ); | 34 | ); |
| 35 | + | ||
| 36 | + if ($('#back-to-top').length) { | ||
| 37 | + var scrollTrigger = 100, // px | ||
| 38 | + backToTop = function() { | ||
| 39 | + var scrollTop = $(window) | ||
| 40 | + .scrollTop(); | ||
| 41 | + if (scrollTop > scrollTrigger) { | ||
| 42 | + $('#back-to-top') | ||
| 43 | + .addClass('show'); | ||
| 44 | + } else { | ||
| 45 | + $('#back-to-top') | ||
| 46 | + .removeClass('show'); | ||
| 47 | + } | ||
| 48 | + }; | ||
| 49 | + backToTop(); | ||
| 50 | + $(window) | ||
| 51 | + .on( | ||
| 52 | + 'scroll', function() { | ||
| 53 | + backToTop(); | ||
| 54 | + } | ||
| 55 | + ); | ||
| 56 | + $('#back-to-top') | ||
| 57 | + .on( | ||
| 58 | + 'click', function(e) { | ||
| 59 | + e.preventDefault(); | ||
| 60 | + $('html,body') | ||
| 61 | + .animate( | ||
| 62 | + { | ||
| 63 | + scrollTop: 0 | ||
| 64 | + }, 700 | ||
| 65 | + ); | ||
| 66 | + } | ||
| 67 | + ); | ||
| 68 | + } | ||
| 34 | } | 69 | } |
| 35 | ); | 70 | ); |
| 36 | \ No newline at end of file | 71 | \ No newline at end of file |