Commit 71c05aca4d036e5c2f50f22a5fbdb4b32aa1de7c

Authored by Administrator
2 parents 1014957d b4bcdf92

Merge branch 'remote_work' into 'master'

Remote work

See merge request !3
src/app/frontend/views/please_return.php
... ... @@ -438,4 +438,4 @@ $('#VideoModal_1').on('hidden.bs.modal', function() {
438 438  
439 439  
440 440 </body>
441   -</html>
442 441 \ No newline at end of file
  442 +</html>
... ...
www/css/main.css
... ... @@ -4103,7 +4103,7 @@ input[type=number] {
4103 4103 }
4104 4104 #content_nav .content_nav_first_floor.clearfix {
4105 4105 padding: 0;
4106   - width: 25% !important;
  4106 + width: 25%;
4107 4107 box-sizing: border-box;
4108 4108 text-align: center;
4109 4109 margin: 15px 0;
... ... @@ -4118,7 +4118,7 @@ input[type=number] {
4118 4118 }
4119 4119 #content_nav .content_nav_second_floor .float {
4120 4120 padding: 0 !important;
4121   - width: 25% !important;
  4121 + width: 25%;
4122 4122 box-sizing: border-box;
4123 4123 text-align: center;
4124 4124 margin: 25px 0;
... ...