From e462375e170019bded989096a945806d5db867c8 Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 16 Apr 2014 17:44:41 +0800 Subject: [PATCH] * fixed style for ie8. * ajusted style of buttons in featurebar. --- module/admin/css/index.css | 8 +++---- module/common/model.php | 4 ++-- module/misc/css/about.css | 10 ++++---- module/my/css/index.css | 8 ++++--- module/my/view/bug.html.php | 1 - module/my/view/dynamic.html.php | 1 - module/my/view/story.html.php | 1 - module/my/view/task.html.php | 1 - module/my/view/testcase.html.php | 1 - module/my/view/testtask.html.php | 1 - module/my/view/todo.html.php | 1 - module/user/css/login.css | 6 ++--- www/theme/default/style.css | 40 +++++++++++++++++++++----------- www/theme/zui/css/min.css | 4 ++-- 14 files changed, 49 insertions(+), 38 deletions(-) diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 3085cda421..cd1932cbb1 100644 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -12,13 +12,13 @@ .card-about.card:hover > .media {background: #E5F9FF} .card-about.card:hover > .media > .icon {color: #c8eef9} -.card-about.card:hover > .media > h5, .card-about.card:hover a {color: #279bbd} +.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, .card-support.card:hover a {color: #229F24} +.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, .card-cowin.card:hover a {color: #E48600} +.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, .card-service.card:hover a {color: #D2322D} +.card-service.card:hover > .media > h5 {color: #D2322D} diff --git a/module/common/model.php b/module/common/model.php index 95169a7343..85752d6d27 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -392,7 +392,7 @@ class commonModel extends model echo "\n"; } @@ -547,7 +547,7 @@ class commonModel extends model public static function printQRCodeLink($color = '') { global $lang; - echo html::a(helper::createLink('misc', 'qrCode'), " " . $lang->user->mobileLogin, '', "class='qrCode iframe $color' data-width='340'"); + echo html::a(helper::createLink('misc', 'qrCode'), " " . $lang->user->mobileLogin, '', "class='qrCode iframe $color' data-width='340' data-class='modal-qrcode'"); } /** diff --git a/module/misc/css/about.css b/module/misc/css/about.css index 3835132508..aa0577de9a 100644 --- a/module/misc/css/about.css +++ b/module/misc/css/about.css @@ -9,18 +9,20 @@ .card-content > ul {padding-left: 10px;} .card-content > ul > li {margin-bottom: 3px;} +.card:hover a {transition: none;} + .card-about.card:hover > .media {background: #E5F9FF} .card-about.card:hover > .media > .icon {color: #c8eef9} -.card-about.card:hover > .media > h5, .card-about.card:hover a {color: #279bbd} +.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, .card-support.card:hover a {color: #229F24} +.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, .card-cowin.card:hover a {color: #E48600} +.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, .card-service.card:hover a {color: #D2322D} +.card-service.card:hover > .media > h5 {color: #D2322D} body {padding: 20px;} .modal-dialog.hide-header .modal-header .close {top: 5px; right: 20px} diff --git a/module/my/css/index.css b/module/my/css/index.css index 2c21072339..3bdd0aa723 100644 --- a/module/my/css/index.css +++ b/module/my/css/index.css @@ -1,8 +1,8 @@ .panel-block {height: 208px;overflow: auto; padding: 0} .panel-block.dynamic {height: 435px;} .panel-block .panel-heading {padding: 6px 10px; margin: 0;} -.panel-block .panel-actions {line-height: 36px; margin-right: -5px;} -.panel > .table > thead > tr > th, .panel > form > .table > thead > tr > th {background: #f1f1f1} +.panel-block .panel-actions {line-height: 36px; margin-right: -2px;} +.panel > .table > thead > tr > th, .panel > form > .table > thead > tr > th {background: #f1f1f1!important} .panel-block td, .panel-block th {padding: 6px;} .panel-block.dynamic td {padding: 6px 6px 5px} .panel-block tr > td:first-child, .panel-block tr > th:first-child, .outer .table tr > th:first-child, .outer .table tr > td:first-child {padding-left: 10px;} @@ -10,4 +10,6 @@ .panel-block .icon {color: #666; display: inline-block; margin-right: 2px;} #wrap .outer {padding: 20px 20px 0} .outer .panel-block .table tbody > tr:last-child td {border-bottom: none} -.outer .row {padding: 0} + +.outer .row {padding: 0 !important; margin: 0 -10px} +.outer .row > .col-md-8, .outer .row > .col-md-4 {padding: 0 10px} diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 0eb8154f1a..193603caee 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -12,7 +12,6 @@ ?>
-
my->bug;?>