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 | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 103 insertions(+), 6 deletions(-)
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index be6317a..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,19 +373,29 @@
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;
}
.pnl_listarea th[class^="tbl_col"] { cursor:pointer; }
.pnl_listarea th[class^="tbl_col"]:hover { background-position:0 -15px!important; }
+.pnl_listarea th.tbl_col_nosort { cursor:default; }
+.pnl_listarea th.tbl_col_nosort:hover { background-position:0 0!important; }
.pageForm_description { font-size: 12px; }
@@ -449,7 +461,7 @@
table.list .tbl_row_uneven { background: #f0f8ff; }
table.list tr:hover { background: #fffacd; }
table.list td { word-wrap:break-word;white-space:pre-wrap; }
-table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
+table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal;overflow:visible; }
/* Password Strength */
#passBar {
@@ -578,6 +590,7 @@
width:60px;
height: 60px;
border:1px dotted #888888;
+ border-radius:5px;
background-color: #cccccc;
margin:10px;
background-position: center 5px;
@@ -782,7 +795,7 @@
.icons16.icoFilter { background-position: -1px -161px; }
.icons16.icoDbAdmin { background-position: -1px -221px; }
.icons16.icoAction { background-position: -1px -241px; }
-.icons16.icoLink { background-position: -1px -442px; float: right; }
+.icons16.icoLink { background-position: -1px -422px; float: right; }
div.group-icon {
float: left;
@@ -827,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; }
@@ -1501,7 +1514,7 @@
/* content_ispc
-------------------------------------------------------------- */
.tipsy {
- font-size: 10px;
+ font-size: 12px !important;
position: absolute;
padding: 5px;
z-index: 100000;
@@ -1835,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