Merge branch 'dev'

3 vuotta sitten · bc10f18664
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -86,16 +86,16 @@
    {/if}
    <!--@formatter:on-->
 </head>
 <body>
 <body style="background-image: url('/assets/img/login-back.jpg')">
 <div class="container">
    <div class="login-wrapper">
        <div class="login-screen">
            <div class="well">
                <div class="login-head">
                    <img src="__CDN__/assets/img/login-head.png" style="width:100%;"/>
                    <img src="__CDN__/assets/img/login-head1.jpg" style="width:100%;"/>
                </div>
                <div class="login-form">
                    <img id="profile-img" class="profile-img-card" src="__CDN__/assets/img/avatar.png"/>
                    
                    <p id="profile-name" class="profile-name-card"></p>

                    <form action="" method="post" id="login-form">
--- a/public/assets/img/login-back.jpg
+++ b/public/assets/img/login-back.jpg
--- a/public/assets/img/login-head1.jpg
+++ b/public/assets/img/login-head1.jpg