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

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

@@ -474,6 +474,11 @@ a.new_red:hover, a.new_red:active {
 	background-color: #FF5A5F;
 	border-color: #FF5A5F;
 }
+.btn-default,.btn-default:hover,.btn-default:focus,.btn-default:active{
+	background-color: transparent;
+	border: 1px solid #FF5A5F;
+	color: #FF5A5F;
+}
 .btn-sm, .btn-group-sm > .btn{
 	padding-top: 3px;
 	padding-bottom: 3px;

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

@@ -1,6 +1,6 @@
 
 <!-- Modal -->
-<div class="modal fade" id="appointmentModal" tabindex="-1" role="dialog" aria-labelledby="appointmentModalLabel">
+<div class="modal fade b-modal" id="appointmentModal" tabindex="-1" role="dialog" aria-labelledby="appointmentModalLabel">
   	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 		  	<div class="modal-header">