Fix style install page

5 years ago · 1c5718941d
parent f93a4252b6
commit 1c5718941d
7 changed files with 61 additions and 69 deletions
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@ -21,7 +21,7 @@
 //
@import "~select2/dist/css/select2.css";
 //@import "~bootstrap-daterangepicker/daterangepicker.css";
-//@import "~bootstrap-select/dist/css/bootstrap-select.css";
+@import "~bootstrap-select/sass/bootstrap-select";
 //
 //@import '~pretty-checkbox/src/pretty-checkbox.scss';
 //@import '~jquery-ui/themes/base/all.css';
--- a/assets/css/bootstrap.scss
+++ b/assets/css/bootstrap.scss
@ -1,2 +0,0 @@
-@import "~bootstrap/scss/bootstrap";
-@import "~@fortawesome/fontawesome-free/css/all.css";
--- a/assets/css/scss/_install.scss
+++ b/assets/css/scss/_install.scss
@ -1,17 +1,13 @@
 .bg-install{
-  background: #0068d8 !important;
+
  @include portrait($breakpoint-sm, $breakpoint-md){
    padding-top: 10px;
    padding-bottom: 10px;
  }
  .install-box{
-    width: 100%;
-    max-width: 65%;
    padding: 50px 40px;
-    margin: auto;
    background-color: $default-white;
    border-radius: 10px;
-    overflow: hidden;
    box-shadow: 0 5px 10px 0 rgba(0, 0, 0, 0.1);

    .install-icon{
--- a/assets/css/scss/_login.scss
+++ b/assets/css/scss/_login.scss
@ -2,10 +2,6 @@ html,
 body {
  height: 100%;
  .bg-chamilo {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
    padding-top: 40px;
    padding-bottom: 40px;
    background: #0068d8;
--- a/assets/js/vendor.js
+++ b/assets/js/vendor.js
@ -7,9 +7,9 @@ require('webpack-jquery-ui/css');

 // JS is equivalent to the normal 'bootstrap' package
 // no need to set this to a variable, just require it
-require('bootstrap');
+import 'bootstrap';
 require('@coreui/coreui/dist/js/coreui.min.js');
-require('chosen-js');
+// require('chosen-js');
 require('mediaelement');
 // require('pace-js-amd-fix');
 require('multiselect-two-sides');
@ -24,7 +24,8 @@ require('blueimp-file-upload');
 require('select2');
 require('timeago');
 require('sweetalert2');
-require('bootstrap-select/dist/js/bootstrap-select.js');
+
+import 'bootstrap-select';
 require('bootstrap-daterangepicker');
 require('fullcalendar/dist/fullcalendar.js');
 require('fullcalendar/dist/gcal.js');
--- a/public/main/install/index.php
+++ b/public/main/install/index.php
@ -719,10 +719,7 @@ $poweredBy = 'Powered by <a href="http://www.chamilo.org" target="_blank"> Chami
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

-    <style type="text/css" media="screen, projection">
-        @import "../../build/css/app.css";
-        @import "../../build/css/themes/chamilo/default.css";
-    </style>
+    <link rel="stylesheet" href="../../build/css/app.css">
    <script type="text/javascript" src="../../../build/runtime.js"></script>
    <script type="text/javascript" src="../../../build/app.js"></script>
    <script>
@ -806,8 +803,10 @@ $poweredBy = 'Powered by <a href="http://www.chamilo.org" target="_blank"> Chami
        }
    </script>
 </head>
-<body class="bg-chamilo bg-install">
-<div class="install-box">
+<body class="bg-chamilo bg-install container">
+<div class="row justify-content-md-center">
+    <div class="col col-md-12">
+        <div class="install-box">
            <div class="row">
                <div class="col-md-4">
                    <div class="logo-install">
@ -857,6 +856,8 @@ $poweredBy = 'Powered by <a href="http://www.chamilo.org" target="_blank"> Chami
                        <?php echo $form; ?>
                    </form>
                </div>
+            </div>
+        </div>
        <footer class="install-footer">
            <?php echo $poweredBy; ?>
        </footer>
--- a/public/main/install/install.lib.php
+++ b/public/main/install/install.lib.php
@ -671,7 +671,7 @@ function display_language_selection_box(
        'language_list',
        $language_list,
        $default_language,
-        ['class' => 'form-control selectpicker show-tick form-control'],
+        ['class' => 'selectpicker'],
        false
    );