Browse Source

一元捐前后台添加分页按样式,前端项目机构介绍相关项目我要捐款按钮样式调整,以及搜索按钮位置的调整

hangb 8 years ago
parent
commit
258e7acf8a

+ 43 - 64
donate-console/src/main/webapp/resources/css/base.css

@@ -82,89 +82,68 @@ input,button,select,textarea{outline:none}
 	left: 0;
 	left: 0;
 	width: 100%;
 	width: 100%;
 }
 }
-.ng-table-pager .ng-table-counts{
-	display: none;
+/*分页样式统一调整*/
+.ng-table-pager{
+	margin-left: 50px;
+	padding: 25px 0;
+	height: auto;
+	background: #fff;
+	text-align: left;
 }
 }
 .ng-table-pager .pagination{
 .ng-table-pager .pagination{
-	padding-left: 50px;
-	width: 100%;
-}
-.ng-table-pager .pagination li{
-	height: 35px;
-	line-height: 35px;
-}
-.ng-table-pager .pagination li a{
-	display: inline-block;
-	padding: 0 5px;
-	height: 35px;
-	line-height: 35px;
-	text-align: center;
-	font-size: 14px;
-	color: #333;
-	border-radius: 3px;
-}
-.ng-table-pager .pagination li a span{
-	display: inline-block;
-	width: 35px;
-	height: 35px;
-	line-height: 35px;
-	text-align: center;
-	font-size: 14px;
-	color: #333;
-	border-radius: 3px;
+	margin-top: 10px;
+	height: 40px;
 }
 }
-.ng-table-pager .pagination li.active a,.ng-table-pager .pagination li:hover a{
-	font-size: 14px;
-	color: #333;
-}
-.ng-table-pager .btn-default.active, .ng-table-pager .btn-default:hover, .ng-table-pager .pagination>.disabled>a, .ng-table-pager .pagination>li>a:hover {
+.ng-table-pager .btn-default.active,.ng-table-pager .btn-default:hover,.ng-table-pager .pagination>.disabled>a,.ng-table-pager .pagination>li>a:hover{
 	color: #fff;
 	color: #fff;
 	background-color: #ef613b;
 	background-color: #ef613b;
 	border-color: #ef613b;
 	border-color: #ef613b;
 }
 }
-.ng-table-pager .pagination>.disabled>a span, .ng-table-pager .pagination>li>a:hover span{
-	color: #fff;
+.ng-table-pager .pagination>.disabled>a{
+	box-shadow: none;
 }
 }
-.page-record{
-	height: 35px;
-	line-height: 35px;
+.ng-table-pager .pagination>li {
+	float: left;
 }
 }
-.page-record span:first-child {
-	margin: 0 10px;
+.ng-table-pager .pagination>li>a, .ng-table-pager .pagination>li>span{
+	padding: 8px 15px;
+	font-size: 12px;
+	color: #333;
 }
 }
-.page-record span input{
+.ng-table-pager .pagination>li .page-record span{
+	margin: 0 12px;
+	font-size: 12px;
+}
+.ng-table-pager .pagination>li .page-record span input {
 	margin: 0 5px;
 	margin: 0 5px;
-	width: 40px;
-	height: 35px;
-	line-height: 35px;
+	width: 25px;
+	height: 25px;
 	text-align: center;
 	text-align: center;
-	font-size: 14px;
+	border: #b8b8b8 1px solid;
+}
+.ng-table-pager .pagination>li .page-record span button {
+	margin: 0 5px;
+	width: 48px;
+	height: 26px;
+	text-align: center;
+	color: #fff;
+	background: #ef613b;
+	border: none;
+	border-radius: 5px;
+}
+.ng-table-pager .pagination>li:first-child.disabled>a,.ng-table-pager .pagination>li:nth-last-child(2).disabled>a{
 	color: #333;
 	color: #333;
-	border-radius: 3px;
+	background-color: #fff;
 	border: 1px solid #ddd;
 	border: 1px solid #ddd;
 }
 }
-.page-record span input:focus{
-	border-color: #4574e8;
+.ng-table-pager .pagination>li .page-record{
+	margin-top: 5px;
 }
 }
-.page-record span button {
-	margin-left: 5px;
-	width: 40px;
-	height: 35px;
-	line-height: 35px;
-	text-align: center;
-	font-size: 14px;
+.ng-table-pager .pagination>li.disabled>a[ng-switch-when="more"]{
 	color: #333;
 	color: #333;
-	background: none;
+	background-color: #fff;
 	border: 1px solid #ddd;
 	border: 1px solid #ddd;
-	border-radius: 3px;
-	cursor: pointer ;
 }
 }
-.page-record span button:hover{
-	background: #ef613b;
-	border: 1px solid transparent ;
-	color: #fff;
-}
-
 /* 预览 */
 /* 预览 */
 #image-box .x-floating-wrap {
 #image-box .x-floating-wrap {
 	position: fixed;
 	position: fixed;

+ 62 - 0
donate-service/src/main/webapp/resources/css/base.css

@@ -216,4 +216,66 @@ div.active-time ul.dropdown-menu span.btn-group.pull-left>button.btn:first-child
 div.active-time ul.dropdown-menu span.btn-group.pull-left>button.btn:nth-child(2){
 div.active-time ul.dropdown-menu span.btn-group.pull-left>button.btn:nth-child(2){
 	border-bottom-left-radius: 3px;
 	border-bottom-left-radius: 3px;
 	border-top-left-radius: 3px;
 	border-top-left-radius: 3px;
+}
+
+/*分页样式统一调整*/
+.ng-table-pager{
+	padding: 25px 0;
+	height: auto;
+	background: #fff;
+	text-align: left;
+}
+.ng-table-pager .pagination{
+	margin-top: 10px;
+	height: 40px;
+}
+.ng-table-pager .btn-default.active,.ng-table-pager .btn-default:hover,.ng-table-pager .pagination>.disabled>a,.ng-table-pager .pagination>li>a:hover{
+	color: #fff;
+	background-color: #ef613b;
+	border-color: #ef613b;
+}
+.ng-table-pager .pagination>.disabled>a{
+	box-shadow: none;
+}
+.ng-table-pager .pagination>li {
+	float: left;
+}
+.ng-table-pager .pagination>li>a, .ng-table-pager .pagination>li>span{
+	padding: 8px 15px;
+	font-size: 12px;
+	color: #333;
+}
+.ng-table-pager .pagination>li .page-record span{
+	margin: 0 12px;
+	font-size: 12px;
+}
+.ng-table-pager .pagination>li .page-record span input {
+	margin: 0 5px;
+	width: 25px;
+	height: 25px;
+	text-align: center;
+	border: #b8b8b8 1px solid;
+}
+.ng-table-pager .pagination>li .page-record span button {
+	margin: 0 5px;
+	width: 48px;
+	height: 26px;
+	text-align: center;
+	color: #fff;
+	background: #ef613b;
+	border: none;
+	border-radius: 5px;
+}
+.ng-table-pager .pagination>li:first-child.disabled>a,.ng-table-pager .pagination>li:nth-last-child(2).disabled>a{
+	color: #333;
+	background-color: #fff;
+	border: 1px solid #ddd;
+}
+.ng-table-pager .pagination>li .page-record{
+	margin-top: 5px;
+}
+.ng-table-pager .pagination>li.disabled>a[ng-switch-when="more"]{
+	color: #333;
+	background-color: #fff;
+	border: 1px solid #ddd;
 }
 }

+ 9 - 5
donate-service/src/main/webapp/resources/view/project/organization_detail.html

@@ -239,7 +239,10 @@
         width: 100%;
         width: 100%;
         text-align: left;
         text-align: left;
         padding-top: 25px;
         padding-top: 25px;
-        border-top: 1px solid #dcdcdc;
+        border-bottom: 1px solid #dcdcdc;
+    }
+    .section2 .list-item:last-child {
+        border-bottom: none;
     }
     }
     .section2 .list-item .project-img {
     .section2 .list-item .project-img {
         margin-right: 24px;
         margin-right: 24px;
@@ -300,18 +303,19 @@
         color: #323232;
         color: #323232;
         font-style: normal;
         font-style: normal;
     }
     }
-    .section2 .list-item a.donation {
+    .section2 .list-item button.donation {
         display: inline-block;
         display: inline-block;
         width: 190px;
         width: 190px;
         height: 30px;
         height: 30px;
         line-height: 30px;
         line-height: 30px;
         font-size: 14px;
         font-size: 14px;
         text-align: center;
         text-align: center;
+        border: none;
         background: #ef613b;
         background: #ef613b;
         color: #fff;
         color: #fff;
         cursor: pointer;
         cursor: pointer;
     }
     }
-    .section2 .list-item a.donation:hover {
+    .section2 .list-item button.donation:hover {
         background: #be3b1b;
         background: #be3b1b;
     }
     }
     /*机构信息*/
     /*机构信息*/
@@ -438,7 +442,7 @@
     }
     }
 
 
     .status .form-group input {
     .status .form-group input {
-        margin-left: 210px;
+        margin: -70px 0 0 210px;
         padding-left: 10px;
         padding-left: 10px;
         width: 260px;
         width: 260px;
         height: 34px;
         height: 34px;
@@ -455,7 +459,7 @@
 
 
     .status .form-group img {
     .status .form-group img {
         position: absolute;
         position: absolute;
-        top: 10px;
+        top: -60px;
         right: 10px;
         right: 10px;
         cursor: pointer;
         cursor: pointer;
     }
     }