Commit 76fab21b authored by Pascal Dreissen's avatar Pascal Dreissen

Merge branch 'applemooz_master' into 'master'

# Conflicts:
#   install/tpl/apache_ispconfig.vhost.master
parents 72cd6fbd 5ef22ab2
......@@ -68,7 +68,7 @@ $wb['customer_no_template_error_regex_txt'] = 'The customer No. template contain
$wb['customer_no_start_txt'] = 'Customer No. start value';
$wb['customer_no_counter_txt'] = 'Customer No. counter';
$wb['session_timeout_txt'] = 'Session timeout (minutes)';
$wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
$wb['session_allow_endless_txt'] = 'Enable "stay logged in"';
$wb['No'] = 'No';
$wb['min_password_length_txt'] = 'Minimum password length';
$wb['min_password_strength_txt'] = 'Minimum password strength';
......
......@@ -91,4 +91,7 @@
}
.icon-delete:before {
content: "\e613";
}
\ No newline at end of file
}
.icon-wizard:before {
content: "\e60c";
}
@font-face{font-family:'ispconfig';src:url('../fonts/ispconfig.eot?-drlkxz');src:url('../fonts/ispconfig.eot?#iefix-drlkxz') format('embedded-opentype'),url('../fonts/ispconfig.woff?-drlkxz') format('woff'),url('../fonts/ispconfig.ttf?-drlkxz') format('truetype'),url('../fonts/ispconfig.svg?-drlkxz#ispconfig') format('svg');font-weight:normal;font-style:normal}.icon{font-family:'ispconfig';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{vertical-align:middle}.icon-calendar:before{content:"\e60e"}.icon-billing:before{content:"\e60d"}.icon-lens:before{content:"\e60b"}.icon-bulb:before{content:"\e60c"}.icon-vm2:before{content:"\e600"}.icon-vm:before{content:"\e601"}.icon-tools:before{content:"\e602"}.icon-admin:before{content:"\e603"}.icon-sites:before{content:"\e604"}.icon-monitor:before{content:"\e605"}.icon-dashboard:before{content:"\e606"}.icon-help:before{content:"\e607"}.icon-mail:before,.icon-mailuser:before{content:"\e608"}.icon-dns:before{content:"\e609"}.icon-client:before{content:"\e60a"}.icon-edit:before{content:"\e615"}.icon-filter:before{content:"\e614"}.icon-link:before{content:"\e60f"}.icon-action:before{content:"\e610"}.icon-dbadmin:before{content:"\e612"}.icon-loginas:before{content:"\e611"}.icon-delete:before{content:"\e613"}
\ No newline at end of file
@font-face{font-family:'ispconfig';src:url('../fonts/ispconfig.eot?-drlkxz');src:url('../fonts/ispconfig.eot?#iefix-drlkxz') format('embedded-opentype'), url('../fonts/ispconfig.woff?-drlkxz') format('woff'), url('../fonts/ispconfig.ttf?-drlkxz') format('truetype'), url('../fonts/ispconfig.svg?-drlkxz#ispconfig') format('svg');font-weight:normal;font-style:normal}.icon{font-family:'ispconfig';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon:before{vertical-align:middle}.icon-calendar:before{content:"\e60e"}.icon-billing:before{content:"\e60d"}.icon-lens:before{content:"\e60b"}.icon-bulb:before{content:"\e60c"}.icon-vm2:before{content:"\e600"}.icon-vm:before{content:"\e601"}.icon-tools:before{content:"\e602"}.icon-admin:before{content:"\e603"}.icon-sites:before{content:"\e604"}.icon-monitor:before{content:"\e605"}.icon-dashboard:before{content:"\e606"}.icon-help:before{content:"\e607"}.icon-mail:before,.icon-mailuser:before{content:"\e608"}.icon-dns:before{content:"\e609"}.icon-client:before{content:"\e60a"}.icon-edit:before{content:"\e615"}.icon-filter:before{content:"\e614"}.icon-link:before{content:"\e60f"}.icon-action:before{content:"\e610"}.icon-dbadmin:before{content:"\e612"}.icon-loginas:before{content:"\e611"}.icon-delete:before{content:"\e613"}.icon-wizard:before{content:"\e60c"}
......@@ -66,8 +66,8 @@ body {
#logo {
float: left;
width: 200px;
height: 65px;
width: 75px;
height: 40px;
margin-top:10px;
/*background: url("../images/logo.png") no-repeat;*/ }
#logo a {
......@@ -693,10 +693,19 @@ span.flag-za {background-position:0 -5391px}
span.flag-zm {background-position:0 -5413px}
span.flag-zw {background-position:0 -5435px}
#logo {
background-image: url("../images/logo.png");
background-size: 75px auto;
background-repeat: no-repeat;
}
@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
#logo {
background-image: url("../images/logo@2x.png");
background-size: 200px 65px; } }
background-size: 75px auto;
background-repeat: no-repeat;
}
}
.input-group-field {
display: table-cell;
......@@ -774,7 +783,9 @@ input[type="password"].form-control[readonly] {
.systemmonitor-state.state-info .statusMsg {
display: none;
}
#footer {
display: none;
}
span.notification_text {
display: block;
margin-left: auto;
......@@ -784,11 +795,9 @@ span.notification_text {
font-family: inherit;
color: white;
}
span.company_name {
font-weight: bold;
}
span.tmp_account_name {
font-size: 0.9em;
}
......
......@@ -35,7 +35,7 @@
<!-- off canvas menu button -->
<div class='menu-btn left'>&#9776;</div>
<!-- logo -->
<div id='logo' style="background: url({tmpl_var name="base64_logo_txt"}) no-repeat;width:{tmpl_var name="base64_logo_width"};height:{tmpl_var name="base64_logo_height"}"><a href='#'></a></div>
<div id='logo'><a href='#'></a></div>
</div>
<div id='headerbar' class='clear'>
<!-- logout button -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment