From 464a8c61bbb3062eea1f42b4e59adb57e45ef277 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 02 Jun 2015 09:11:52 -0400
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
---
interface/web/themes/default/assets/stylesheets/ispconfig.css | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index 25b4679..6d29d5e 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -65,7 +65,8 @@
float: left;
width: 200px;
height: 65px;
- background: url("../images/logo.png") no-repeat; }
+ margin-top:10px;
+ /*background: url("../images/logo.png") no-repeat;*/ }
#logo a {
display: block;
width: 100%;
@@ -234,6 +235,9 @@
width: 150px;
height: 10px; }
+p.fieldset-legend {
+ display: none; }
+
.content-tab-wrapper {
border-style: solid;
border-width: 1px;
@@ -267,6 +271,37 @@
width: 8%;
overflow: hidden;
text-overflow: ellipsis; }
+
+thead.dark th[data-column] {
+ cursor: pointer;
+}
+
+thead.dark th[data-column][data-ordered] {
+ font-weight: bold;
+ position: relative;
+}
+
+thead.dark th[data-column][data-ordered]:before {
+ content: "";
+ display: block;
+ position: absolute;
+ right: 5px;
+ top: 16px;
+ width: 0;
+ height: 0;
+ vertical-align: middle;
+ border-bottom: 5px solid #fff;
+ border-top: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-left: 6px solid transparent;
+ line-height: inherit;
+}
+
+thead.dark th[data-column][data-ordered="desc"]:before {
+ top: 21px;
+ border-bottom: 5px solid transparent;
+ border-top: 5px solid #fff;
+}
thead.dark td input,
thead.dark td select {
@@ -440,6 +475,7 @@
span.flag-ee {background-position:0 -1387px}
span.flag-eg {background-position:0 -1409px}
span.flag-eh {background-position:0 -1431px}
+/*span.flag-en {background-position:0 -1453px}*/
span.flag-er {background-position:0 -1475px}
span.flag-es {background-position:0 -1497px}
span.flag-et {background-position:0 -1519px}
@@ -450,7 +486,7 @@
span.flag-fo {background-position:0 -1673px}
span.flag-fr {background-position:0 -1695px}
span.flag-ga {background-position:0 -1717px}
-span.flag-gb {background-position:0 -1739px}
+span.flag-gb, span.flag-en {background-position:0 -1739px}
span.flag-gd {background-position:0 -1761px}
span.flag-ge {background-position:0 -1783px}
span.flag-gf {background-position:0 -1805px}
--
Gitblit v1.9.1