From fac03aa97013f819bbc6c201d107ebfc4fab4e18 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Wed, 04 Jun 2014 12:47:35 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

---
 interface/web/themes/default/css/styles.css |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index be6317a..afe36fd 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;
@@ -384,6 +386,8 @@
 }
 .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 +453,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 +582,7 @@
     width:60px;
     height: 60px;
     border:1px dotted #888888;
+    border-radius:5px;
     background-color: #cccccc;
     margin:10px;
     background-position: center 5px;
@@ -782,7 +787,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 +832,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 +1506,7 @@
 /* content_ispc
 -------------------------------------------------------------- */
 .tipsy {
-    font-size: 10px;
+    font-size: 12px !important;
     position: absolute;
     padding: 5px;
     z-index: 100000;
@@ -1835,4 +1840,27 @@
 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;
 }
\ No newline at end of file

--
Gitblit v1.9.1