Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/web/staticres/css/dev-qfw.css

@@ -48,9 +48,6 @@ a{
 	margin-left: 20px;
 	margin-right: 20px;
 }
-.text-primary {
-	color: #dd4814 !important;
-}
 .text-bold{
 	font-weight:700;
 }

core/src/web/staticres/css/qfw.css

@@ -462,11 +462,53 @@ a.new_red:hover, a.new_red:active {
 	display: table-cell;
 }
 
-/*==========覆盖bootstrap样式===========*/
+/*==========覆盖bootstrap样式 start===========*/
 [class*="col-"] {
 	padding-left: 0px !important;
 }
-
+.btn{
+	padding-top: 6px;
+	padding-bottom: 6px;
+}
+.btn-primary,.btn-primary:hover,.btn-primary:focus,.btn-primary:active{
+	background-color: #FF5A5F;
+	border-color: #FF5A5F;
+}
+.btn-sm, .btn-group-sm > .btn{
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+.btn-xs, .btn-group-xs > .btn{
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+.text-primary {
+	color: #FF5A5F !important;
+}
+.modal-content{
+	border-radius: 4px;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+}
+.modal-header{
+	background-color: #FF5A5F;
+	color: #FFFFFF;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	padding-left: 20px;
+	padding-right: 10px;
+	font-size: 16px;
+}
+.modal-header .close{
+	opacity: 1;
+	text-shadow: none;
+	font-weight: normal;
+	color: #FFFFFF;
+}
+.modal-header .close:focus, .modal-header .close:hover{
+	opacity: 1;
+}
+/*==========覆盖bootstrap样式 end===========*/
 .lineb {
 	display: inline-block;
 }
@@ -504,7 +546,6 @@ span.highlight {
 	color: #dd4814;
 	font-weight: bold;
 }
-
 /*字体图标*/
 @font-face {
 	font-family: 'qimingxing';

core/src/web/templates/service/appointment.html

@@ -4,8 +4,8 @@
   	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 		  	<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"  onClick="qxdx()">&times;</span></button>
-				<h4 class="modal-title text-muted" id="appointmentModalLabel"><b class="m-demandtable">免费预约</b></h4>
+				<span data-dismiss="modal" aria-label="Close" onClick="qxdx()" class="close bootstrap-glyphicon glyphicon-remove-circle"></span>
+				<span class="modal-title" id="appointmentModalLabel">免费预约</span>
 			</div>
 			<div id="reg_b">
 		  	<div class="text-muted d_tck_n">{{.T.sinfo.s_enterprisename}}</div>