From 78f6ae420668c211f5012f18100811417607acdb Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 30 Apr 2014 09:09:01 +0800 Subject: [PATCH 1/2] * fixed style of featurebar for ie8-11. * changed side header icon of 'doc/browse'. * changed icon of datepicker for 'task/start'. --- module/doc/view/browse.html.php | 2 +- module/task/view/start.html.php | 2 +- www/theme/default/style.css | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 8662d46a3e..a4b120ca19 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -31,7 +31,7 @@ var browseType = '';
-
+
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index 0b936bf6f4..3aa9edd175 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -25,7 +25,7 @@ - + diff --git a/www/theme/default/style.css b/www/theme/default/style.css index f3bdcadd34..b4f9909127 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -366,7 +366,9 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} #qrcodePopover.popover.top .arrow {left: inherit; right: 10px} /* Feature bar. */ -#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px; min-height: 30px\0} +#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 46px; min-height: 30px\0;} +#featurebar:after, #featurebar:before {content: ' '; display: table;} +#featurebar:after {clear:both;} #featurebar .heading {float: left; padding: 0 5px; color: #666} #featurebar .heading:after {content: "\e6e1"; font-family: ZenIcon; font-size: 14px; color: #999; display: inline-block; margin-left: 5px;} #featurebar .heading > i {color: #808080} From 2c98a3bed82387da6f6eafda2c5149acd27f034c Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 30 Apr 2014 10:22:31 +0800 Subject: [PATCH 2/2] * ajusted style of sub featurebar. * ajusted width of some form. --- module/doc/view/edit.html.php | 2 +- module/product/css/index.css | 1 + module/product/view/close.html.php | 2 +- module/product/view/create.html.php | 4 ++-- module/product/view/edit.html.php | 4 ++-- module/product/view/index.html.php | 2 +- module/product/view/roadmap.html.php | 2 +- module/productplan/view/edit.html.php | 4 ++-- module/project/view/activate.html.php | 2 +- www/theme/default/style.css | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php index aa4f9b1997..7cdf5a8db8 100644 --- a/module/doc/view/edit.html.php +++ b/module/doc/view/edit.html.php @@ -19,7 +19,7 @@ $(document).ready(function() setType(type); }); -
+
icons['doc']);?> id;?> diff --git a/module/product/css/index.css b/module/product/css/index.css index 0cf8b873ef..85301c3456 100644 --- a/module/product/css/index.css +++ b/module/product/css/index.css @@ -1 +1,2 @@ .alert>[class*="icon-"]+.content {padding-left: 20px;} +#featurebar {display: none} diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php index 21661fb832..30f1ff7efe 100644 --- a/module/product/view/close.html.php +++ b/module/product/view/close.html.php @@ -12,7 +12,7 @@ ?> -
+
icons['product']);?> id;?> diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index e40cff06a4..6c9f69b8c8 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -12,7 +12,7 @@ ?> -
+
icons['product']);?> @@ -23,7 +23,7 @@
task->realStarted;?>
task->consumed;?>
- + diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index dd75587f59..2d5db7b176 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -12,7 +12,7 @@ ?> -
+
icons['product']);?> id;?> @@ -24,7 +24,7 @@
product->name;?>
product->code;?>
- + diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php index 3915ed8ae8..aec39053ad 100644 --- a/module/product/view/index.html.php +++ b/module/product/view/index.html.php @@ -32,7 +32,7 @@ '> -
product->name;?>name, "class='form-control'");?>name, "class='form-control'");?>
product->code;?>
+
diff --git a/module/product/view/roadmap.html.php b/module/product/view/roadmap.html.php index af0b1f30c1..e2aad46b80 100644 --- a/module/product/view/roadmap.html.php +++ b/module/product/view/roadmap.html.php @@ -11,7 +11,7 @@ */ ?> -
+
product->roadmap;?>
idAB;?>
-
+
icons['plan']);?> @@ -33,7 +33,7 @@
- + diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php index 1682471605..9fcc9721df 100644 --- a/module/project/view/activate.html.php +++ b/module/project/view/activate.html.php @@ -13,7 +13,7 @@ -
+
icons['project']);?> id;?> diff --git a/www/theme/default/style.css b/www/theme/default/style.css index b4f9909127..b69b836073 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -393,7 +393,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} .outer > .alert + #featurebar {border-top: 1px solid #ddd;} /* sub featurebar */ -.sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px} +.sub-featurebar {border-bottom: 1px solid #ddd; padding: 5px 10px; margin: -20px -20px 20px;} .sub-featurebar > .nav > li {float: left;} .sub-featurebar > .nav > li > a {padding: 5px 10px} .sub-featurebar > .nav > li.active > a {color: #333; font-weight: bold;}
productplan->begin;?>begin, 'class="form-control date"');?>begin, 'class="form-control form-date"');?>
productplan->end;?>