From 2d5fcd53c19a65b9c968a1db2e9af643537379c3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 24 Oct 2014 09:29:47 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/themes/default/css/styles.css | 148 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 120 insertions(+), 28 deletions(-)
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index 95b5d94..000846a 100644
--- a/interface/web/themes/default/css/styles.css
+++ b/interface/web/themes/default/css/styles.css
@@ -153,6 +153,8 @@
#topNav a {
background: url("../icons/x32_sprite.png") no-repeat #D3D3D3;
+ border-top-left-radius:5px;
+ border-top-right-radius:5px;
color:black;
display:inline-block;
height:20px;
@@ -371,13 +373,21 @@
table.list th[class$="_active"],
table.list td[class$="_active"],
table.list th.tbl_col_autoresponder,
-table.list td.tbl_col_autoresponder {
+table.list td.tbl_col_autoresponder,
+table.list th.tbl_col_postfix,
+table.list td.tbl_col_postfix,
+table.list th.tbl_col_disablesmtp,
+table.list td.tbl_col_disablesmtp,
+table.list th.tbl_col_disableimap,
+table.list td.tbl_col_disableimap,
+table.list th.tbl_col_disablepop3,
+table.list td.tbl_col_disablepop3 {
width: 70px;
text-align: center;
}
table.list .tbl_col_buttons,
table.list .tbl_col_limit {
- width: 150px;
+ width: 50px;
}
.tbl_col_client_pid input {
width: 50px;
@@ -438,9 +448,6 @@
font-family: Consolas, "Lucida Console", "Courier New", monospace;
font-size: 0.9em;
}
-.codeview .logerror { background: rgb(255,0,0); }
-.codeview .logwarn { background: rgb(255,204,0); }
-.codeview .loginfo { background: rgb(153,204,255); }
/* Lists */
table.list {
width: 100%;
@@ -522,9 +529,9 @@
margin: 5px;
background: url("../icons/device_sprite.png") no-repeat transparent;
}
-.systemmonitor-server div.icoDevice { background-position: 0 -128px; }
-.systemmonitor-ve div.icoDevice { background-position: 0 -64px; }
-.systemmonitor-network div.icoDevice { background-position: 0 0px; }
+.systemmonitor-server div.icoDevice { background-position: 0 0; }
+.systemmonitor-ve div.icoDevice { background-position: -64px 0; }
+.systemmonitor-network div.icoDevice { background-position: -128px 0; }
div.statusDevice,
div.statusMsg { float: left; }
div.statusMsg p {
@@ -583,6 +590,7 @@
width:60px;
height: 60px;
border:1px dotted #888888;
+ border-radius:5px;
background-color: #cccccc;
margin:10px;
background-position: center 5px;
@@ -600,17 +608,17 @@
width:60px;
text-decoration: none;
}
-.dashboard-modules.tools a { background-position: 14px -8px; }
-.dashboard-modules.admin a { background-position: 14px -72px; }
-.dashboard-modules.sites a { background-position: 14px -520px; }
-.dashboard-modules.monitor a { background-position: 14px -584px; }
-.dashboard-modules.help a { background-position: 14px -712px; }
-.dashboard-modules.mail a { background-position: 14px -776px; }
-.dashboard-modules.vm a { background-position: 14px -840px; }
-.dashboard-modules.domain a { background-position: 14px -904px; }
-.dashboard-modules.dns a { background-position: 14px -968px; }
-.dashboard-modules.client a { background-position: 14px -1096px; }
-.dashboard-modules.billing a { background-position: 14px -116px; }
+.dashboard-modules.tools a { background-position: 12px -9px; }
+.dashboard-modules.admin a { background-position: 12px -73px; }
+.dashboard-modules.sites a { background-position: 12px -520px; }
+.dashboard-modules.monitor a { background-position: 13px -585px; }
+.dashboard-modules.help a { background-position: 13px -716px; }
+.dashboard-modules.mail a { background-position: 12px -776px; }
+.dashboard-modules.vm a { background-position: 14px -842px; }
+.dashboard-modules.domain a { background-position: 12px -905px; }
+.dashboard-modules.dns a { background-position: 12px -970px; }
+.dashboard-modules.client a { background-position: 13px -1096px; }
+.dashboard-modules.billing a { background-position: 14px -1162px; }
.panel_dashboard h2 { font-size:20px; }
@@ -737,13 +745,13 @@
/* Button with icon and text */
.iconstxt { background: url("../icons/button_sprite.png") no-repeat transparent; }
.iconstxt span { padding-left: 20px; font-weight: bold; }
-.iconstxt.icoPositive { background-position: 0px -136px; }
-.iconstxt.icoNegative { background-position: 0px -104px; }
-.iconstxt.icoAdd { background-position: 0px -72px; }
-.iconstxt.icoKey { background-position: 0px -8px; }
-.iconstxt.icoDelete { background-position: 0px -40px; }
-.iconstxt.icoDownload { background-position: 0px -8px; }
-.iconstxt.icoRestore { background-position: 0px -8px; }
+.iconstxt.icoPositive { background-position: 6px -130px; }
+.iconstxt.icoNegative { background-position: 6px -98px; }
+.iconstxt.icoAdd { background-position: 6px -66px; }
+.iconstxt.icoKey { background-position: 6px -1px; }
+.iconstxt.icoDelete { background-position: 6px -34px; }
+.iconstxt.icoDownload { background-position: 6px -1px; }
+.iconstxt.icoRestore { background-position: 6px -1px; }
/* Button with icon and without text */
.icons16 { position: relative; }
@@ -832,7 +840,7 @@
.selectInput.formLengthLimit { width: 85px !important; }
.formLengthDate { width: 75px !important; }
.formLengthIPv4 { width: 125px !important; }
-.formLengthIPv6 { width: 100% !important; }
+.formLengthIPv6 { }
.formLengthEmailUser { width: 30% !important; }
.formLengthEmailDomain { width: 30% !important; }
.formLengthHalf { width: 15% !important; }
@@ -1506,7 +1514,7 @@
/* content_ispc
-------------------------------------------------------------- */
.tipsy {
- font-size: 10px;
+ font-size: 12px !important;
position: absolute;
padding: 5px;
z-index: 100000;
@@ -1840,4 +1848,88 @@
a.link-page.current-page {
background-color: #DFDFDF;
font-weight: bold;
+}
+
+.command {
+ padding: 1em;
+ border: 1px dashed #2f6fab;
+ color: black;
+ background-color: #f9f9f9;
+ line-height: 1.1em;
+ font-family: Courier New, Courier, mono;
+ font-size: 12px;
+ font-style: italic;
+}
+.system {
+ color: black;
+ font-family: Courier New, Courier, mono;
+ font-size: 12px;
+ font-style: italic;
+}
+.highlight {
+ color: #FF0000;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 12px;
+ text-decoration: underline;
+}
+
+.custom-combobox {
+ position: relative !important;
+ display: inline-block !important;
+ overflow: hidden;
+ padding-right: 10px;
+ max-width: 356px;
+}
+.custom-combobox-toggle {
+ background: none repeat scroll 0 0 #ffffff !important;
+ border: 1px solid #dfdfdf !important;
+ position: absolute !important;
+ top: 0 !important;
+ right: -1px;
+ z-index: 5000;
+ bottom: 0 !important;
+ margin-left: -1px !important;
+ padding: 1px !important;
+ /* support: IE7 */
+ *height: 1.7em !important;
+ *top: 0.1em !important;
+ width: 17px !important;
+}
+.custom-combobox-input {
+ background: none repeat scroll 0 0 #ffffff !important;
+ border: 1px solid #dfdfdf !important;
+ font-weight: normal !important;
+ margin: 0 !important;
+ padding: 0.3em !important;
+ display: inline-block !important;
+ width: 100%;
+}
+
+.tbl_col_limit .custom-combobox-toggle {
+ right: 0px;
+}
+
+.tbl_col_limit .custom-combobox-input {
+ width: 80% !important;
+}
+
+.tbl_col_limit input {
+ padding: 0.3em !important;
+}
+
+.ui-autocomplete {
+ overflow-x: hidden !important;
+ padding-bottom: 3px !important;
+}
+
+li.ui-menu-item {
+ display: block !important;
+ width: auto !important;
+ margin-right: -1px !important;
+ margin-bottom: -1px !important;
+ margin-top: -1px !important;
+ font-weight: normal !important;
+ border: 1px solid #fff !important;
+ padding-left: 4px !important;
+ margin-left: 0px !important
}
\ No newline at end of file
--
Gitblit v1.9.1