Commit a9bb4843df423ae4f6102569d5847330d3bd4e21
Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/views/layouts/main.php
Showing
6 changed files
with
24 additions
and
19 deletions
Show diff stats
frontend/views/layouts/main.php
| ... | ... | @@ -475,8 +475,8 @@ _________________________________________________________ --> |
| 475 | 475 | <!-- /#footer --> |
| 476 | 476 | |
| 477 | 477 | <!-- *** FOOTER END *** --> |
| 478 | - | |
| 479 | - <span id="back-to-top" title="Back to top"><i class="fa fa-arrow-up"></i></span> | |
| 478 | + | |
| 479 | + <span id="back-to-top" title="Back to top"></span> | |
| 480 | 480 | |
| 481 | 481 | </div> |
| 482 | 482 | <div id="overlay" style="display:none;"></div> | ... | ... |
frontend/views/site/about.php
| ... | ... | @@ -76,14 +76,14 @@ |
| 76 | 76 | </section> |
| 77 | 77 | </div> |
| 78 | 78 | |
| 79 | - <div class="col-md-4"> | |
| 80 | - <div class="video"> | |
| 81 | - <div class="embed-responsive embed-responsive-4by3"> | |
| 82 | - <iframe class="embed-responsive-item" src="//www.youtube.com/embed/i9AHJkHqkpw?autoplay=0&showinfo=0&controls=0"></iframe> | |
| 83 | - </div> | |
| 84 | - | |
| 85 | - </div> | |
| 86 | - </div> | |
| 79 | +<!-- <div class="col-md-4">--> | |
| 80 | +<!-- <div class="video">--> | |
| 81 | +<!-- <div class="embed-responsive embed-responsive-4by3">--> | |
| 82 | +<!-- <iframe class="embed-responsive-item" src="//www.youtube.com/embed/i9AHJkHqkpw?autoplay=0&showinfo=0&controls=0"></iframe>--> | |
| 83 | +<!-- </div>--> | |
| 84 | +<!----> | |
| 85 | +<!-- </div>--> | |
| 86 | +<!-- </div>--> | |
| 87 | 87 | </div> |
| 88 | 88 | </section> |
| 89 | 89 | </div> | ... | ... |
frontend/views/site/index.php
| ... | ... | @@ -37,7 +37,9 @@ _________________________________________________________ --> |
| 37 | 37 | <a href="<?=$slide->link?>"><?=ImageHelper::set($slide->language->image->getPath()) |
| 38 | 38 | ->cropResize(650, 380) |
| 39 | 39 | ->quality(84) |
| 40 | - ->renderImage()?></a> | |
| 40 | + ->renderImage([ | |
| 41 | + 'class' => 'img-responsive' | |
| 42 | + ])?></a> | |
| 41 | 43 | </div> |
| 42 | 44 | </div> |
| 43 | 45 | </div> | ... | ... |
frontend/web/css/custom.css
| ... | ... | @@ -113,20 +113,20 @@ ul.list-style-none{ |
| 113 | 113 | bottom: 50px; |
| 114 | 114 | right: 50px; |
| 115 | 115 | z-index: 9999; |
| 116 | - width: 60px; | |
| 117 | - height: 60px; | |
| 116 | + width: 48px; | |
| 117 | + height: 48px; | |
| 118 | 118 | text-align: center; |
| 119 | 119 | line-height: 50px; |
| 120 | - font-size: 32px; | |
| 121 | - background: #6aae7a; | |
| 122 | - color: #fff; | |
| 120 | + background-color: #6aae7a; | |
| 123 | 121 | cursor: pointer; |
| 124 | 122 | text-decoration: none; |
| 125 | 123 | transition: opacity 0.2s ease-out; |
| 126 | 124 | opacity: 0; |
| 127 | - padding: 4px 1px 4px 0; | |
| 128 | 125 | border-radius: 50%; |
| 129 | 126 | box-shadow: 1px 4px 3px 0px rgba(0, 0, 0, 0.2); |
| 127 | + background-image: url("/img/arrow-up-big.png") !important; | |
| 128 | + background-position: 50% 50% !important; | |
| 129 | + background-repeat: no-repeat !important; | |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | #back-to-top:hover { |
| ... | ... | @@ -153,4 +153,7 @@ ul.list-style-none{ |
| 153 | 153 | font-weight: bold; |
| 154 | 154 | cursor: default; |
| 155 | 155 | text-decoration: none; |
| 156 | -} | |
| 157 | 156 | \ No newline at end of file |
| 157 | +} | |
| 158 | + | |
| 159 | +.has-error .form-control {border-color: #e80000;} | |
| 160 | +.has-success .form-control {border-color: #009e03;} | |
| 158 | 161 | \ No newline at end of file | ... | ... |
frontend/web/css/style.blue.css
| ... | ... | @@ -3,4 +3,4 @@ |
| 3 | 3 | * http://geedmo.github.com/yamm3 |
| 4 | 4 | * |
| 5 | 5 | * @geedmo - Licensed under the MIT license |
| 6 | - */.yamm .nav,.yamm .collapse,.yamm .dropup.use-yamm,.yamm .dropdown.use-yamm{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:20px 30px}.yamm .dropdown.yamm-fw .dropdown-menu{left:15px;right:15px} | |
| 7 | 6 | \ No newline at end of file |
| 7 | + */.yamm .nav,.yamm .collapse,.yamm .dropup.use-yamm,.yamm .dropdown.use-yamm{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:20px 30px}.yamm .dropdown.yamm-fw .dropdown-menu{left:15px;right:15px}#back-to-top{background-color:#294d76;}#back-to-top:hover{background-color:#2e6a98;} | |
| 8 | 8 | \ No newline at end of file | ... | ... |
188 Bytes