Merge pull request joomla#55 from ciar4n/password-icon

Remove header margin - add password icon
Digital-Peak · May 30, 2017 · e95fb4a · e95fb4a
2 parents e143c1a + 7519981
commit e95fb4a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/installation/model/forms/site.xml b/installation/model/forms/site.xml
@@ -45,8 +45,6 @@
 			class="form-control validate-password-strength"
 			label="INSTL_ADMIN_PASSWORD_LABEL"
 			required="true"
-			strengthmeter="true"
-			forcePassword="true"
 			autocomplete="off"
 		/>
 

diff --git a/installation/template/css/template.css b/installation/template/css/template.css
@@ -8713,21 +8713,19 @@ form {
 .container-header {
   position: relative;
   height: 230px;
-  background-color: #173149;
-  box-shadow: 0 0 80px rgba(0, 0, 0, 0.4); }
+  background-color: #1c3d5c; }
 
 .container-main {
   position: relative;
   z-index: 1060;
   padding-top: 100px;
-  margin-top: -20px;
   margin-bottom: 100px;
   background-color: #fff;
-  box-shadow: 0 40px 80px rgba(0, 0, 0, 0.1), inset 0 7px 0 #e8e6e6; }
+  box-shadow: 0 0 80px rgba(0, 0, 0, 0.1), inset 0 7px 0 #e8e6e6; }
 
 .header {
   color: #fff;
-  background-color: #1b3956;
+  background-color: #1c3d5c;
   background-repeat: no-repeat;
   box-shadow: 0 7px 0 0 #2a5c8b; }
   .header .logo {

diff --git a/installation/template/css/template.css.map b/installation/template/css/template.css.map
diff --git a/installation/template/scss/template.scss b/installation/template/scss/template.scss
@@ -39,22 +39,20 @@ form {
 .container-header {
   position: relative;
   height: 230px;
-  background-color: #173149;
-  box-shadow: 0 0 80px rgba(0,0,0,.4);
+  background-color: #1c3d5c;
 }
 .container-main {
   position: relative;
   z-index: 1060;
   padding-top: 100px;
-  margin-top: -20px;
   margin-bottom: 100px;
   background-color: #fff;
-  box-shadow: 0 40px 80px rgba(0,0,0,.1),  inset 0 7px 0 #e8e6e6;
+  box-shadow: 0 0 80px rgba(0,0,0,.1),  inset 0 7px 0 #e8e6e6;
 }
 
 .header {
   color: #fff;
-  background-color: #1b3956;
+  background-color: #1c3d5c;
   background-repeat: no-repeat;
   box-shadow: 0 7px 0 0 #2a5c8b;
   .logo {

diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php
@@ -39,7 +39,11 @@
 				</div>
 				<div class="col-md-8 offset-md-2">
 					<?php // Disables autocomplete ?> <input type="password" style="display:none">
-					<?php echo $this->form->getInput('admin_password'); ?>
+					<div class="input-group">
+						<?php echo $this->form->getInput('admin_password'); ?>
+						<span class="input-group-addon fa fa-eye"></span>
+					</div>
+
 					<p class="form-text text-muted small"><?php echo JText::_('INSTL_ADMIN_PASSWORD_DESC'); ?></p>
 				</div>
 			</div>