From b16d44f58441056e2e46622fe56eb44e3a69de9c Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 17 Nov 2017 19:19:35 -0800
Subject: [PATCH] k-admin skin fixes.

---
 e107_admin/updateadmin.php                |  2 +-
 e107_themes/bootstrap3/admin_style.css    |  2 ++
 e107_themes/bootstrap3/admin_template.php | 14 ++++++------
 e107_themes/bootstrap3/css/kadmin.css     | 27 ++++++++++++++++++-----
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/e107_admin/updateadmin.php b/e107_admin/updateadmin.php
index 108a5e397..7ffc54051 100644
--- a/e107_admin/updateadmin.php
+++ b/e107_admin/updateadmin.php
@@ -104,7 +104,7 @@ else
 					<tr>
 						<td>".UDALAN_6.":</td>
 						<td>
-							<input class='tbox input-text' type='password' name='a_password2' size='60' value='' maxlength='20' />
+							<input class='tbox form-control input-text' type='password' name='a_password2' size='60' value='' maxlength='20' />
 						</td>
 					</tr>
 				</tbody>
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index af2b54740..dace0999d 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1543,6 +1543,7 @@ footer {
 */
 
 
+/*
 
 @media only screen and (min-width : 768px) {
     .is-table-row {
@@ -1554,6 +1555,7 @@ footer {
         vertical-align: top;
     }
 }
+*/
 
 /* Flex Classes */
 body#admin-menus > .container-fluid > .row,
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index e5f84579e..6999a70a4 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -211,8 +211,8 @@ $ADMIN_HEADER = $ADMIN_MODAL . '
 		</div>
 	</div>
 </div>
-<div class="container-fluid">
-	<div class="row">
+<div class="admin-container container-fluid">
+	<div class="row is-table-row">
 ';
 
 $adminstyle = e107::getConfig()->get('adminstyle', 'infopanel');
@@ -220,7 +220,7 @@ if(defset('e_PAGE') == 'admin.php' && $adminstyle == 'flexpanel' && varset($_GET
 {
 	$ADMIN_HEADER .= '
 		<div class="col-sm-12">
-			<div class="admin-main-content">
+			<div class="admin-main-content is-table-row">
 	';
 }
 else
@@ -254,7 +254,9 @@ else
 			{ADMIN_LOG=request}
 			{ADMIN_MSG=request}
 			{ADMIN_PLUGINS}
-	
+		
+			<!--<div class="admin-copyright"><small>Copyright &copy; 2008-2017 e107.org</small></div>-->
+		
 			{SETSTYLE=default}			
 		</div>
 		<div class="col-md-9 col-lg-10 admin-right-panel">
@@ -272,9 +274,7 @@ $ADMIN_FOOTER = '
 	</div><!--/.row-->
 </div><!--/.fluid-container-->
 
-<footer class="center mute"> 
-	Copyright &copy; 2008-2017 e107 Inc (e107.org)<br />
-</footer>
+
 ';
 
 
diff --git a/e107_themes/bootstrap3/css/kadmin.css b/e107_themes/bootstrap3/css/kadmin.css
index 4e18a5844..62337d7a5 100644
--- a/e107_themes/bootstrap3/css/kadmin.css
+++ b/e107_themes/bootstrap3/css/kadmin.css
@@ -14385,7 +14385,7 @@ ul.chats li.out .message {
 
 /**************** Custom *************************/
 
-body { padding-top: 41px }
+body { padding-top: 51px !important }
 
 .navbar-fixed-top { background-color: #1e1e1e; color: #ffffff; border:0; margin:0!important }
 .navbar-fixed-top a { color: #ffffff }
@@ -14407,9 +14407,7 @@ a.dropdown-toggle i { opacity: 0.9 }
 }
 .admin-left-panel {
 background-color: #303030;
-height: 1500px;
-
-margin-top: -37px;
+/*margin-top: -37px;*/
 padding-right: 0;
 padding-left: 0; }
 
@@ -14417,14 +14415,15 @@ padding-left: 0; }
 .admin-menu.panel  { background: none; border:0}
 .admin-left-panel .panel-heading { padding-top:40px; }
 .admin-left-panel .panel-heading {  background: none; border:0; color: white}
-.admin-left-panel .panel-default .panel-heading { color:white; background:none; border-bottom: 1px solid #484848; }
+.admin-left-panel .panel-default .panel-heading { color:white; background:none; border-bottom: 1px solid #484848; padding-top: 28px; }
 #admin-ui-nav-menu li { border-bottom: 1px solid #484848; }
 
 .admin-right-panel { padding: 0; }
+.admin-main-content { display:block; min-height:1000px; }
 .admin-main-content  .block-text { padding: 0 15px }
 .admin-main-content div.block > .caption { background: white;
 padding: 15px;
-margin-top: -25px;
+margin-top: 0;
 font-size: 25px;
 font-weight: 300;
 border-bottom: 5px solid #e5e5e5 !important;
@@ -14434,6 +14433,9 @@ border-bottom: 5px solid #e5e5e5 !important;
     color: #fff;
 
 }
+
+.admin-copyright { margin-top:100px; padding-left:15px; display:block; padding-bottom:30px; position: relative; bottom: 0; }
+
 .admin-left-panel li.list-group-item { background:none; border:0;}
 
 i.searchquery { margin-top: 10px; }
@@ -14467,8 +14469,21 @@ margin-bottom: 15px;
 .popover .popover-title { background-color: #d9534f; color:white; font-weight:bold }
 
 
+@media only screen and (min-width : 768px) {
+    .is-table-row {
+        display: table;
+        width: 100%;
+       margin:0;
 
+    }
+    .is-table-row > .admin-right-panel, .is-table-row > .admin-left-panel{
+        float: none;
+        display: table-cell;
+       vertical-align: top;
+    }
+}
 
+.admin-container { padding:0 }
 /*
 
 .nav-pills li.active a {