From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/themes/default/assets/stylesheets/ispconfig.css | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index 6d29d5e..866e721 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -119,6 +119,18 @@
#content {
width: 78%; }
+#passBar, #passText {
+ display: inline-block;
+ vertical-align: middle; }
+
+#passBar {
+ height: 11px;
+ padding: 0; }
+
+#passBar > div {
+ height: 100%;
+ padding: 0; }
+
#sidebar {
margin-top: 27px;
width: 18%;
@@ -658,3 +670,25 @@
#logo {
background-image: url("../images/logo@2x.png");
background-size: 200px 65px; } }
+
+.input-group-field {
+ display: table-cell;
+ vertical-align: middle;
+ border-radius:4px;
+ min-width:1%;
+ white-space: nowrap;
+}
+.input-group-field .form-control {
+ border-radius: inherit !important;
+}
+.input-group-field:not(:first-child):not(:last-child) {
+ border-radius:0;
+}
+.input-group-field:not(:first-child):not(:last-child) .form-control {
+ border-left-width: 0;
+ border-right-width: 0;
+}
+.input-group-field:last-child {
+ border-top-left-radius:0;
+ border-bottom-left-radius:0;
+}
\ No newline at end of file
--
Gitblit v1.9.1