* [DEV] UI tweaks

This commit is contained in:
nuxsmin
2016-11-22 02:23:01 +01:00
committed by Rubén Domínguez
parent bb24a71f3c
commit de2ee212ab
7 changed files with 72 additions and 72 deletions

BIN
imgs/logo_full_new.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

View File

@@ -89,7 +89,7 @@ class MainController extends ControllerBase implements ActionsInterface
$this->view->assign('icons', DiFactory::getTheme()->getIcons());
$this->view->assign('logoIcon', Init::$WEBURI . '/imgs/logo.png');
$this->view->assign('logoNoText', Init::$WEBURI . '/imgs/logo.svg');
$this->view->assign('logo', Init::$WEBURI . '/imgs/logo_full.svg');
$this->view->assign('logo', Init::$WEBURI . '/imgs/logo_full_new.png');
$this->view->assign('httpsEnabled', Checks::httpsEnabled());
// Cargar la clave pública en la sesión

View File

@@ -1410,50 +1410,41 @@ footer img {
}
#boxLogin {
width: 45em;
min-height: 150px;
position: relative;
width: 40em;
min-height: 22em;
margin: 0 auto;
padding: 1em;
background: url("../imgs/logo_full.svg") no-repeat #fff;
background: #fff url("../imgs/logo_full_new.png") no-repeat bottom left;
background-size: 300px auto;
background-position: .5em .5em;
}
#boxLogin .error {
float: left;
width: 315px;
margin-top: 15px;
color: orange;
border: 1px orange solid;
margin-left: auto;
margin-right: auto
}
#boxLogin #boxData, #boxLogin #boxButton {
margin-top: 7em;
}
#boxLogin #boxData {
display: inline-block;
width: 250px;
height: 100%;
min-height: 100px;
min-height: 15em;
text-align: left;
margin-left: 13em;
background-color: transparent
background-color: transparent;
margin-bottom: 10em;
}
#boxLogin #boxData i {
margin-right: .5em;
opacity: .5;
}
#boxLogin #boxButton {
display: inline-block;
text-align: right;
margin-left: 2em;
position: absolute;
top: 2em;
right: 2em;
}
#boxLogin #boxActions {
position: absolute;
bottom: 1em;
right: 1em;
width: 100%;
height: 1em;
margin-top: 1em;
text-align: right
padding: .5em;
text-align: right;
}
#boxLogin #boxActions a {
@@ -1514,7 +1505,7 @@ fieldset.warning a {
-webkit-box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);
-moz-box-shadow: 0 8px 6px -6px rgba(83, 109, 254, .3);
align-items: center;
background: url("../imgs/logo_full.svg") left no-repeat;
background: url("../imgs/logo_full_new.png") left no-repeat;
background-size: auto 150px;
height: 150px
}

File diff suppressed because one or more lines are too long

View File

@@ -21,23 +21,21 @@
<div class="field-name"><?php echo _('Cliente'); ?></div>
<?php if (!empty($AccountSearchItem->getCustomerLink())): ?>
<a href="<?php echo $AccountSearchItem->getCustomerLink(); ?>" target="blank"
title="<?php echo _('Buscar en Wiki'); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?>
title="<?php echo _('Buscar en Wiki'); ?>">
<span class="mdl-chip mdl-chip--contact">
<span style="background-color: <?php echo $AccountSearchItem->getColor(); ?>;"
class="mdl-chip__contact mdl-color-text--white">
<?php echo strtoupper($AccountSearchData->getCustomerName()[0]); ?></span>
<span class="mdl-chip__text"
title="<?php echo $AccountSearchData->getCustomerName(); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?></span>
</span>
<span style="background-color: <?php echo $AccountSearchItem->getColor(); ?>;"
class="mdl-chip__contact mdl-color-text--white"><?php echo strtoupper($AccountSearchData->getCustomerName()[0]); ?></span>
<span class="mdl-chip__text"
title="<?php echo $AccountSearchData->getCustomerName(); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?></span>
</span>
</a>
<?php else: ?>
<span class="mdl-chip mdl-chip--contact">
<span style="background-color: <?php echo $AccountSearchItem->getColor(); ?>;"
class="mdl-chip__contact mdl-color-text--white">
<?php echo strtoupper($AccountSearchData->getCustomerName()[0]); ?></span>
<span class="mdl-chip__text"
title="<?php echo $AccountSearchData->getCustomerName(); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?></span>
</span>
<span style="background-color: <?php echo $AccountSearchItem->getColor(); ?>;"
class="mdl-chip__contact mdl-color-text--white"><?php echo strtoupper($AccountSearchData->getCustomerName()[0]); ?></span>
<span class="mdl-chip__text"
title="<?php echo $AccountSearchData->getCustomerName(); ?>"><?php echo $AccountSearchItem->getShortCustomerName(); ?></span>
</span>
<?php endif; ?>
</div>
@@ -137,7 +135,8 @@
<?php if ($AccountSearchData->getAccountNotes() !== ''): ?>
<i id="notes-<?php echo $AccountSearchData->getAccountId(); ?>" class="material-icons">speaker_notes</i>
<div class="mdl-tooltip mdl-tooltip--top" for="notes-<?php echo $AccountSearchData->getAccountId(); ?>">
<div class="mdl-tooltip mdl-tooltip--top"
for="notes-<?php echo $AccountSearchData->getAccountId(); ?>">
<?php echo _('Notas'), '<br>', $AccountSearchItem->getShortNotes(); ?>
</div>
<?php endif; ?>

View File

@@ -4,7 +4,8 @@
<div id="boxData">
<?php if ($demoEnabled): ?>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="user" name="user" type="text" class="mdl-textfield__input mdl-color-text--indigo-400"
<input id="user" name="user" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
title="> demo <">
<label class="mdl-textfield__label"
@@ -29,31 +30,40 @@
</div>
</span>
<?php else: ?>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="user" name="user" type="text" class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="user"><?php echo _('Usuario'); ?></label>
</div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="pass" name="pass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="pass"><?php echo _('Clave'); ?></label>
<div>
<i class="material-icons">perm_identity</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="user" name="user" type="text"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="user"><?php echo _('Usuario'); ?></label>
</div>
</div>
<span id="smpass" style="display: none">
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mpass" name="mpass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80" autocomplete="off">
<label class="mdl-textfield__label"
for="mpass"><?php echo _('Clave Maestra'); ?></label>
<div>
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="pass" name="pass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80"
autocomplete="off">
<label class="mdl-textfield__label"
for="pass"><?php echo _('Clave'); ?></label>
</div>
</div>
<div id="smpass" style="display: none">
<i class="material-icons">vpn_key</i>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
<input id="mpass" name="mpass" type="password"
class="mdl-textfield__input mdl-color-text--indigo-400"
maxlength="80" autocomplete="off">
<label class="mdl-textfield__label"
for="mpass"><?php echo _('Clave Maestra'); ?></label>
</div>
</div>
</span>
<?php endif; ?>
<input type="hidden" name="login" value="1"/>
<input type="hidden" name="isAjax" value="1"/>
@@ -66,7 +76,7 @@
</div>
<div id="boxButton">
<button id="btnLogin" type="submit" form="frmLogin"
class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored mdl-color--indigo-500"
class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored mdl-color--indigo-400"
title="<?php echo _('Acceder'); ?>">
<i class="material-icons">play_arrow</i>
</button>

View File

@@ -1,8 +1,8 @@
<header class="mdl-layout__header">
<div class="mdl-layout__header-row">
<!-- Title -->
<span class="mdl-layout-icon"><img class="logo" src="imgs/logo_bg_dark.png" alt="logo"/></span>
<span class="mdl-layout-title"><?php echo $appInfo['appname']; ?></span>
<span class="mdl-layout-icon"><img class="logo" src="<?php echo $logo; ?>" alt="logo"/></span>
<!-- <span class="mdl-layout-title">--><?php //echo $appInfo['appname']; ?><!--</span>-->
<!-- Add spacer, to align navigation to the right -->
<div class="mdl-layout-spacer"></div>
<!-- Navigation -->