summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2019-09-10 07:27:42 +0000
committerAleksander Machniak <machniak@kolabsys.com>2019-09-10 07:27:42 +0000
commit7bce222bcb25bd5bc1da02e78d07e4fe71ce883a (patch)
tree76fe7d661194ad0820c884191c021d4fffbe41b3
parent829a757c5d7e9298b9db2360e584e945a925970a (diff)
downloadwebadmin-7bce222bcb25bd5bc1da02e78d07e4fe71ce883a.tar.gz
Fix css issue with the users/groups/etc table (Bifrost#T243304)
-rw-r--r--public_html/skins/default/style.css15
-rw-r--r--public_html/skins/default/templates/domain.html1
-rw-r--r--public_html/skins/default/templates/group.html1
-rw-r--r--public_html/skins/default/templates/main.html14
-rw-r--r--public_html/skins/default/templates/ou.html1
-rw-r--r--public_html/skins/default/templates/resource.html1
-rw-r--r--public_html/skins/default/templates/role.html1
-rw-r--r--public_html/skins/default/templates/sharedfolder.html1
-rw-r--r--public_html/skins/default/templates/type.html1
-rw-r--r--public_html/skins/default/templates/user.html1
10 files changed, 14 insertions, 23 deletions
diff --git a/public_html/skins/default/style.css b/public_html/skins/default/style.css
index 0cb9af5..b64b439 100644
--- a/public_html/skins/default/style.css
+++ b/public_html/skins/default/style.css
@@ -73,6 +73,7 @@ table.list {
border: 1px solid #d0d0d0;
border-spacing: 0;
width: 100%;
+ margin: 0;
}
table.list thead tr {
@@ -338,10 +339,11 @@ input[type=radio] {
#content {
min-height: 400px;
- padding: 10px;
+ padding: 15px 10px;
background-color: #fff;
border: 1px solid #d0d0d0;
border-width: 1px 0 1px 0;
+ display: flex;
}
#footer {
@@ -439,12 +441,13 @@ input[type=radio] {
padding: 0 10px;
display: flex;
flex-direction: column;
+ flex: 1;
}
#toc {
- float: left;
- width: 260px;
+ width: 280px;
min-height: 380px;
+ margin: 0 10px 0 5px;
}
#search {
@@ -475,12 +478,6 @@ input[type=radio] {
border-top: 0;
}
-div.vsplitter {
- float: left;
- width: 10px;
- min-height: 400px;
-}
-
/**** Common classes ****/
.nowrap {
diff --git a/public_html/skins/default/templates/domain.html b/public_html/skins/default/templates/domain.html
index 45941d5..4b2ffca 100644
--- a/public_html/skins/default/templates/domain.html
+++ b/public_html/skins/default/templates/domain.html
@@ -2,5 +2,4 @@
{include file="search.html" list="domain.list"}
<div id="domainlist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="domain"></div>
diff --git a/public_html/skins/default/templates/group.html b/public_html/skins/default/templates/group.html
index c982ef7..239aa06 100644
--- a/public_html/skins/default/templates/group.html
+++ b/public_html/skins/default/templates/group.html
@@ -2,5 +2,4 @@
{include file="search.html" list="group.list"}
<div id="grouplist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="group"></div>
diff --git a/public_html/skins/default/templates/main.html b/public_html/skins/default/templates/main.html
index b9143b1..999f541 100644
--- a/public_html/skins/default/templates/main.html
+++ b/public_html/skins/default/templates/main.html
@@ -28,14 +28,16 @@
<div id="navigation">{$main_menu}</div>
<div id="task_navigation">{$task_menu}</div>
<div id="content">
+ <div id="taskcontent">
<h1>{$engine->translate('welcome')}</h1>
- <div id="main">
- {foreach $tasks as $link => $label}
- <div class="{preg_replace('/\..*$/', '', $link)}" onclick="kadm.command('{$link}', '', this)">
- <span class="image font-icon"></span>
- <span class="label">{$engine->translate($label)}</span>
+ <div id="main">
+ {foreach $tasks as $link => $label}
+ <div class="{preg_replace('/\..*$/', '', $link)}" onclick="kadm.command('{$link}', '', this)">
+ <span class="image font-icon"></span>
+ <span class="label">{$engine->translate($label)}</span>
+ </div>
+ {/foreach}
</div>
- {/foreach}
</div>
</div>
<div id="footer">
diff --git a/public_html/skins/default/templates/ou.html b/public_html/skins/default/templates/ou.html
index 6402986..7b2af69 100644
--- a/public_html/skins/default/templates/ou.html
+++ b/public_html/skins/default/templates/ou.html
@@ -2,5 +2,4 @@
{include file="search.html" list="ou.list"}
<div id="oulist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="ou"></div>
diff --git a/public_html/skins/default/templates/resource.html b/public_html/skins/default/templates/resource.html
index c4b58fc..925fdc0 100644
--- a/public_html/skins/default/templates/resource.html
+++ b/public_html/skins/default/templates/resource.html
@@ -2,5 +2,4 @@
{include file="search.html" list="resource.list"}
<div id="resourcelist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="resource"></div>
diff --git a/public_html/skins/default/templates/role.html b/public_html/skins/default/templates/role.html
index 166520e..975e84b 100644
--- a/public_html/skins/default/templates/role.html
+++ b/public_html/skins/default/templates/role.html
@@ -2,5 +2,4 @@
{include file="search.html" list="role.list"}
<div id="rolelist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="role"></div>
diff --git a/public_html/skins/default/templates/sharedfolder.html b/public_html/skins/default/templates/sharedfolder.html
index ffcedb3..3e19577 100644
--- a/public_html/skins/default/templates/sharedfolder.html
+++ b/public_html/skins/default/templates/sharedfolder.html
@@ -2,5 +2,4 @@
{include file="search.html" list="sharedfolder.list"}
<div id="sharedfolderlist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="sharedfolder"></div>
diff --git a/public_html/skins/default/templates/type.html b/public_html/skins/default/templates/type.html
index 66a20d1..e9486b7 100644
--- a/public_html/skins/default/templates/type.html
+++ b/public_html/skins/default/templates/type.html
@@ -16,5 +16,4 @@
</div>
<div id="typelist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="type"></div>
diff --git a/public_html/skins/default/templates/user.html b/public_html/skins/default/templates/user.html
index 14a7c10..5b826c1 100644
--- a/public_html/skins/default/templates/user.html
+++ b/public_html/skins/default/templates/user.html
@@ -2,5 +2,4 @@
{include file="search.html" list="user.list"}
<div id="userlist"></div>
</div>
-<div class="vsplitter">&nbsp;</div>
<div id="taskcontent" class="user"></div>