Commit e9c6ad5ab1482620ebc19d103666e346e00f8d9b
Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/views/layouts/main.php # frontend/web/css/custom.css
Showing
2 changed files
with
11 additions
and
13 deletions
Show diff stats
frontend/views/layouts/main.php
| ... | ... | @@ -439,9 +439,8 @@ |
| 439 | 439 | <!-- /#copyright --> |
| 440 | 440 | |
| 441 | 441 | <!-- *** COPYRIGHT END *** --> |
| 442 | - | |
| 443 | - <div id="content">Scroll ↓</div> | |
| 444 | - <a href="#" id="back-to-top" title="Back to top">↑</a> | |
| 442 | + | |
| 443 | + <span id="back-to-top" title="Back to top"><i class="fa fa-arrow-up"></i></span> | |
| 445 | 444 | |
| 446 | 445 | </div> |
| 447 | 446 | <!-- /#all --> | ... | ... |
frontend/web/css/custom.css
| ... | ... | @@ -87,26 +87,25 @@ |
| 87 | 87 | |
| 88 | 88 | #back-to-top { |
| 89 | 89 | position: fixed; |
| 90 | - bottom: 90px; | |
| 91 | - right: 120px; | |
| 90 | + top: 100px; | |
| 91 | + left: 0px; | |
| 92 | 92 | z-index: 9999; |
| 93 | - width: 50px; | |
| 94 | - height: 50px; | |
| 93 | + width: 40px; | |
| 94 | + height: 40px; | |
| 95 | 95 | text-align: center; |
| 96 | 96 | line-height: 30px; |
| 97 | - background: #f5f5f5; | |
| 98 | - color: #444; | |
| 97 | + background: #38a7bb; | |
| 98 | + color: #fff; | |
| 99 | 99 | cursor: pointer; |
| 100 | - border-radius: 50%; | |
| 101 | 100 | text-decoration: none; |
| 102 | 101 | transition: opacity 0.2s ease-out; |
| 103 | 102 | opacity: 0; |
| 104 | - border-color: #38a7bb; | |
| 105 | - border-width: 2px; | |
| 103 | + padding: 4px; | |
| 106 | 104 | } |
| 107 | 105 | |
| 108 | 106 | #back-to-top:hover { |
| 109 | - background: #e9ebec; | |
| 107 | + background: #20616d; | |
| 108 | + color: #fff; | |
| 110 | 109 | } |
| 111 | 110 | |
| 112 | 111 | #back-to-top.show { | ... | ... |