Permalink
Browse files

fix: pro-IUAPDESIGN-104:友云采:grid左侧的复选框和编辑控件的显示不一致

  • Loading branch information...
whizbz11 committed Oct 27, 2016
1 parent dc45ba1 commit ef520ed8c45e95e2af6b32af196b6e3642757a45
Showing with 4,942 additions and 501 deletions.
  1. +18 −10 dist/css/grid.css
  2. +1 −1 dist/css/grid.min.css
  3. +1 −1 dist/css/tree.css
  4. +1 −1 dist/css/tree.min.css
  5. +4 −2 dist/css/u.css
  6. +2 −2 dist/css/u.min.css
  7. +252 −140 dist/js/kero-adapter.js
  8. +64 −38 dist/js/kero.js
  9. +111 −112 dist/js/u-grid.js
  10. +5 −5 dist/js/u-grid.min.js
  11. +1 −1 dist/js/u-tree.js
  12. +1 −1 dist/js/u-tree.min.js
  13. +4,440 −163 dist/js/u.js
  14. +13 −12 dist/js/u.min.js
  15. +28 −12 js/component/keroa-grid.js
View
@@ -257,9 +257,9 @@ header区域css end
content区域css begin
*/
.u-grid td {
- border-style: solid !important;
- border-color: #cecece !important;
- border-width: 0 0 1px 0 !important;
+ border-style: solid ;
+ border-color: #cecece ;
+ border-width: 0 0 1px 0 ;
box-sizing: border-box;
padding:0px !important;
-moz-box-sizing: border-box;
@@ -274,6 +274,14 @@ content区域css begin
font-size: 16px !important;
}
+.u-grid tbody tr:last-child td{
+ border-bottom-width: 0px;
+}
+
+.u-grid-content-left>div:last-child{
+ border-bottom-width: 0px;
+}
+
.u-grid-content tr{
border-top:0px !important;
}
@@ -307,6 +315,13 @@ content区域css begin
text-align: center;
}
.u-grid-content {
+ border-style: solid;
+ border-color: #cecece;
+ border-width: 0px;
+ border-bottom-width: 1px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
position: relative;
zoom: 1;
background-color: #fff ;
@@ -327,13 +342,6 @@ content区域css begin
height: 2.125em;
z-index: 11;
background-color: #FFF;
- border-style: solid;
- border-color: #cecece;
- border-width: 0px;
- border-bottom-width: 1px;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
}
.u-grid-content-left-bottom {
position: absolute;
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,5 +1,5 @@
/**
- * tinper-neoui-tree v0.1.1
+ * tinper-neoui-tree v3.1.2
* tree
* author : yonyou FED
* homepage : https://github.com/iuap-design/tinper-neoui-tree#readme
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1,5 +1,5 @@
/**
- * tinper-neoui v0.1.1
+ * tinper-neoui v3.1.2
* UI Framework Used For Enterprise.
* author : yonyou FED
* homepage : https://github.com/iuap-design/tinper-neoui#readme
@@ -1335,8 +1335,8 @@ input.u-button[type="submit"] {
right: 0;
background-color: #FFFFFF;
padding: 0;
- max-height: 70%;
width: 55%;
+ max-height: 70%;
margin: auto;
border-radius: 2px;
will-change: top, opacity;
@@ -1376,6 +1376,8 @@ input.u-button[type="submit"] {
.u-msg-dialog .u-msg-content h4 {
margin: 0; }
.u-msg-dialog .u-msg-footer {
+ position: absolute;
+ bottom: 0px;
border-radius: 0 0 2px 2px;
padding: 4px 20px;
height: 56px;
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit ef520ed

Please sign in to comment.