From b26aaa6fad5763fcba7d0f3c7e70ab017c5a1f5e Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 19 Aug 2014 14:10:56 +0800 Subject: [PATCH] * ajusted style of 'about' and 'admin/index'. --- module/admin/css/index.css | 20 +++++--------------- module/admin/view/index.html.php | 16 ++++++---------- module/misc/css/about.css | 14 ++------------ 3 files changed, 13 insertions(+), 37 deletions(-) diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 6b07f9425c..36a9c22eaa 100644 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -1,4 +1,4 @@ -.cards {margin: 5% auto;} +.cards {margin: 2% 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;} @@ -10,19 +10,9 @@ .card-content > ul {padding-left: 20px;} .card-content > ul > li {margin-bottom: 5px;} -.card-about.card:hover > .media {background: #E5F9FF} -.card-about.card:hover > .media > .icon {color: #c8eef9} -.card-about.card:hover > .media > h5 {color: #279bbd} -.card-support.card:hover > .media {background: #E5FFE6} -.card-support.card:hover > .media > .icon {color: #c2eac2} -.card-support.card:hover > .media > h5 {color: #229F24} -.card-cowin.card:hover > .media {background: #FFF4E5} -.card-cowin.card:hover > .media > .icon {color: #f7dfbe} -.card-cowin.card:hover > .media > h5 {color: #E48600} -.card-service.card:hover > .media {background: #FFE6E5} -.card-service.card:hover > .media > .icon {color: #f9d0ce} -.card-service.card:hover > .media > h5 {color: #D2322D} +.card a, .card:hover a {color: #444} +.card a:hover {color: #000;} -#notice {margin: -20px -20px 0} -#titlebar {margin-top: 0; border-top: 1px solid #e5e5e5} +#notice {margin: -20px -20px 0; border-bottom: 1px solid #e5e5e5} +#heading {margin: 4% auto 1%} #proversion, #zentaotrain{color:#D2322D} diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index 36741e5d15..792960633f 100644 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -12,22 +12,18 @@ ?> config->global->showDemoUsers) ? true : false; js::set('showDemoUsers', $showDemoUsers);?> - +
' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?> - -
admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?>
+
admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?>
-
-
- admin->info->version, $config->version); - if($bind) echo sprintf($lang->admin->info->account, '' . $account . ''); - echo $lang->admin->info->links; - ?> +
+ +

misc->zentao->version, $config->version);?>

diff --git a/module/misc/css/about.css b/module/misc/css/about.css index bde52c0a1b..9e440148d9 100644 --- a/module/misc/css/about.css +++ b/module/misc/css/about.css @@ -10,18 +10,8 @@ .card-content > ul {padding-left: 8px;} .card-content > ul > li {margin-bottom: 5px;} -.card-about.card:hover > .media {background: #E5F9FF} -.card-about.card:hover > .media > .icon {color: #c8eef9} -.card-about.card:hover > .media > h5 {color: #279bbd} -.card-support.card:hover > .media {background: #E5FFE6} -.card-support.card:hover > .media > .icon {color: #c2eac2} -.card-support.card:hover > .media > h5 {color: #229F24} -.card-cowin.card:hover > .media {background: #FFF4E5} -.card-cowin.card:hover > .media > .icon {color: #f7dfbe} -.card-cowin.card:hover > .media > h5 {color: #E48600} -.card-service.card:hover > .media {background: #FFE6E5} -.card-service.card:hover > .media > .icon {color: #f9d0ce} -.card-service.card:hover > .media > h5 {color: #D2322D} +.card a, .card:hover a {color: #444} +.card a:hover {color: #000;} body {padding: 20px; font-size: 12px} .modal-dialog.hide-header .modal-header .close {top: 5px; right: 20px}