From d2c9d41742c67a37ba93feb6912ffd2b8853e412 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 24 Apr 2014 09:12:22 +0800
Subject: [PATCH]  * fixed z-index of 'side-handle'.  * ajusted style of
 'admin/index'.

---
 module/admin/css/index.css       | 18 +++++++++++-------
 module/admin/view/index.html.php |  4 ++--
 module/misc/css/about.css        |  2 +-
 module/misc/view/links.html.php  |  2 +-
 www/theme/default/style.css      |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index cd1932cbb1..6b07f9425c 100644
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -1,12 +1,12 @@
-.cards {margin-top: 2%;}
-
-.card {height: 200px; position: relative; padding-left: 180px; border-radius: 6px}
-.card > .media {position: absolute; left: 0; top: 0; width: 180px; background: #f1f1f1; height: 200px; bottom: 0; overflow: hidden; z-index: 90; transition: all 0.4s;}
-.card > .media > .icon {position: absolute; display: block; font-size: 168px; color: #ddd; z-index: 99; bottom: -20px; left: -20px; transition: all 0.4s;}
-.card > .media > h5 {position: absolute; display: block; color: #666; z-index: 100; font-size: 16px; right: 20px; top: 10px; transition: all 0.4s;}
+.cards {margin: 5% auto;}
+.cards > .col-sm-6 {width: 25%; padding: 0 10px}
+.card {height: 250px; position: relative; padding-top: 50px; border-radius: 6px; margin: 0}
+.card > .media {position: absolute; left: 0; top: 0; width: 100%; background: #f1f1f1; height:50px; bottom: 0; overflow: hidden; z-index: 90; transition: all 0.4s;}
+.card > .media > .icon {position: absolute; display: block; font-size: 56px; color: #ddd; z-index: 99; bottom: -10px; right: -6px; transition: all 0.4s;}
+.card > .media > h5 {position: absolute; display: block; color: #666; z-index: 100; font-size: 14px; left: 15px; top: 10px; transition: all 0.4s;}
 .card:hover > .media {background: #e5e5e5}
 .card:hover > .media > .icon {color: #ccc}
-.card .card-content {padding: 20px 25px}
+.card .card-content {padding: 20px}
 .card-content > ul {padding-left: 20px;}
 .card-content > ul > li {margin-bottom: 5px;}
 
@@ -22,3 +22,7 @@
 .card-service.card:hover > .media {background: #FFE6E5}
 .card-service.card:hover > .media > .icon {color: #f9d0ce}
 .card-service.card:hover > .media > h5 {color: #D2322D}
+
+#notice {margin: -20px -20px 0}
+#titlebar {margin-top: 0; border-top: 1px solid #e5e5e5}
+#proversion, #zentaotrain{color:#D2322D}
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index b5d7f3122d..36741e5d15 100644
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php $showDemoUsers = isset($this->config->global->showDemoUsers) ? true : false; js::set('showDemoUsers', $showDemoUsers);?>
-
 <?php if(!$bind and !$ignore and common::hasPriv('admin', 'register')):?>
 <div id="notice" class='alert alert-success'>
   <?php echo html::a(inlink('ignore'), '<i class="icon-remove"></i> ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
@@ -20,7 +19,8 @@
   <div class="content"><?php echo sprintf($lang->admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?></div>
 </div>
 <?php endif;?>
-<div id='featurebar'>
+
+<div id='titlebar'>
   <div class='heading'>
     <?php 
     echo sprintf($lang->admin->info->version, $config->version);
diff --git a/module/misc/css/about.css b/module/misc/css/about.css
index c713f2b95d..bde52c0a1b 100644
--- a/module/misc/css/about.css
+++ b/module/misc/css/about.css
@@ -27,4 +27,4 @@ body {padding: 20px; font-size: 12px}
 .modal-dialog.hide-header .modal-header .close {top: 5px; right: 20px}
 .copyright {padding: 0 20px 20px}
 
-#proversion, #zentaotrain{color:red}
+#proversion, #zentaotrain{color:#D2322D}
diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php
index 9f744c4a95..329e9334c6 100755
--- a/module/misc/view/links.html.php
+++ b/module/misc/view/links.html.php
@@ -1,4 +1,4 @@
-<div class='container mw-900px bd-0'>
+<div class='container mw-800px bd-0'>
   <div class='cards'>
     <?php
     unset($lang->misc->zentao->version);
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index bbd179a781..c18d525fc4 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -492,7 +492,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
 .outer .side-body {overflow: hidden;}
 .outer .side-body .panel {min-width: 180px;}
 .outer .side-body .panel-body {padding: 10px;}
-.outer .side-handle {position: absolute; text-align: center; cursor: pointer; right: 0; top: 0; width: 15px; padding: 0; line-height: 32px; border: 1px solid #d5d5d5; background: #fff; color: #666; transition: all 0.3s;}
+.outer .side-handle {position: absolute; text-align: center; cursor: pointer; right: 0; top: 0; width: 15px; padding: 0; line-height: 32px; border: 1px solid #d5d5d5; background: #fff; color: #666; transition: all 0.3s; z-index: 99}
 .outer .side-handle:hover {background: #e5e5e5; color: #141414}
 .outer.with-transition .side, .outer .side-handle.with-transition {transition: all 0.3s;}