Permalink
Browse files

fix: i18n & add json files & test example

  • Loading branch information...
onvno committed Dec 13, 2016
1 parent 986f72f commit 8f7a9e3d995da97042188d9ac7ed10b4ae862a02
View
@@ -157,10 +157,6 @@ header区域css begin
height: 3.14285714em;
line-height: 3.14285714em;
}
-
-.u-grid-hide-title-icon .uf-fontselectioneditor {
- display: none
-}
.u-gird-parent {
position: absolute;
top: 0px;
@@ -180,8 +176,6 @@ header区域css begin
.u-grid-header-link:visited {
//color: #a8a8a8;
}
-
-
.u-grid-header-columnmenu {
position: absolute;
padding: 0 .4em 0 .6em;
@@ -241,7 +235,7 @@ header区域css begin
.u-grid-header-sort-span {
width: 1.3em;
text-align: center;
- font-size: 12px;
+ font-size: 1.3em;
position: absolute;
height: inherit;
line-height: inherit;
@@ -263,9 +257,9 @@ header区域css end
content区域css begin
*/
.u-grid td {
- border-style: solid ;
- border-color: #cecece ;
- border-width: 0 0 1px 0 ;
+ border-style: solid !important;
+ border-color: #cecece !important;
+ border-width: 0 0 1px 0 !important;
box-sizing: border-box;
padding:0px !important;
-moz-box-sizing: border-box;
@@ -278,23 +272,6 @@ content区域css begin
height: 2.68em \9;
line-height: 2.68em \9;
font-size: 16px !important;
- overflow: hidden;
-}
-
-.u-grid .grid_edit_form_td{
- overflow: visible;
-}
-
-.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-left.u-grid-content-left-sum>div:last-child{
- border-bottom-width: 1px;
}
.u-grid-content tr{
@@ -314,20 +291,11 @@ content区域css begin
margin: 0 1em 0 1em;
line-height: 3.5em;
font-size: 12px;
- overflow: visible;
+ overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
height: 100%;
}
-.u-grid-content-td-div-over::after{
- content:"...";
- font-weight:bold;
- position:absolute;
- bottom:15px;
- right: -5px;
-}
-
-
.u-grid-content-td-div > input{
height:100%;
}
@@ -338,21 +306,7 @@ content区域css begin
width: 2rem;
text-align: center;
}
-
-/*checkbox样式*/
-
-.u-grid-content-td-div .u-checkbox-outline,.u-grid-content-td-div .u-checkbox-focus-helper {
- top: -10px;
-}
-
.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 ;
@@ -373,6 +327,13 @@ 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;
@@ -440,7 +401,7 @@ content区域css begin
}
.u-grid-content-focus-row {
- background-color: #e9f7fc !important;
+ background-color: #03cc71 !important;
//color: #FFF !important;
}
.u-grid-content-tree-span {
@@ -449,16 +410,6 @@ content区域css begin
color: #007ae3;
font-size: 14px !important;
}
-
-
-/*行拖拽*/
-td.u-grid-drag-icon:before {
- content: "\e6d1";
- font-family: "uf" !important;
- font-size: 12px;
- position: absolute;
- z-index: 100;
-}
/*
content区域css end
*/
@@ -770,7 +721,7 @@ form展示区域css begin
width: 2rem;
text-align: center;
}
-
+
.u-grid-content-td-div .checkbox label {
top: -2px;
}
@@ -802,11 +753,11 @@ form展示区域css end
/*鼠标滑过begin*/
.u-grid-move-bg{
- background: #f4f8fb !important;;
+ background: #e9f7fc !important;;
color:#333;
}
-.u-grid .u-grid-move-bg a{
- color: #0377c1;
+.u-grid-move-bg a{
+ color: #0377c1 !important;
}
.u-grid-move-bg a:hover{
text-decoration: underline;
@@ -865,4 +816,4 @@ form展示区域css end
mask: none;
background: #1baede url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K);
}
-/*复选框end*/
+/*复选框end*/
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,5 +1,5 @@
/**
- * tinper-neoui-tree v3.1.16
+ * tinper-neoui-tree v0.1.0
* tree
* author : yonyou FED
* homepage : https://github.com/iuap-design/tinper-neoui-tree#readme
@@ -37,7 +37,6 @@ website: http://code.google.com/p/jquerytree/
vertical-align: middle;
// padding: 6px 10px;
}
-
.ztree li ul {
margin: 0;
padding: 0 0 0 18px;
@@ -55,18 +54,17 @@ website: http://code.google.com/p/jquerytree/
vertical-align: top;
display: inline-block;
position: relative;
- /*padding: 6px 10px;*/
- padding: 4px 10px;
+ padding: 6px 10px;
box-sizing: border-box;
}
.ztree li a:hover {
- color:#3949AB ;
- background-color: #eee ;
+ color:#3949AB !important;
+ background-color: #eee !important;
}
+/*.ztree li:hover >span{
+ color:#3949AB;
-.ztree li.hoverNode .switch {
- color: #3949AB;
-}
+}*/
.ztree li a.focusNode {
/*background-color: #eee;*/
// background-color: #C0EBF4;
@@ -441,17 +439,13 @@ ul.ztree.zTreeDragUL {
border-color: #bcbcbc;
}
-.ztree li.focusNode span.button.switch {
- color: #FFFFFF;
-}
-
.ztree li span.button.switch {
position: relative;
z-index: 1000;
line-height: 21px;
}
-.ztree li span.button.switch.noline_close:after {
+ .ztree li span.button.switch.noline_close:after {
/* -webkit-transform: scale(.5) rotate(0deg); */
/* transform: scale(.5) rotate(0deg); */
/* zoom: 1; */
@@ -469,8 +463,7 @@ ul.ztree.zTreeDragUL {
font-family: 'uf';
/*color: #3881D8;*/
position: absolute;
- /*top: 10px;*/
- top: 8px;
+ top: 10px;
font-size: 12px;
}
@@ -491,8 +484,7 @@ ul.ztree.zTreeDragUL {
font-family: 'uf';
/*color: #3881D8;*/
position: absolute;
- /*top: 10px;*/
- top: 8px;
+ top: 10px;
font-size: 12px;
left:5px;
}
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -3882,6 +3882,7 @@ main {
.u-ripple-container {
display: block;
+ display: none \9;
height: 100%;
left: 0rem;
position: absolute;
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -2836,6 +2836,7 @@ img {
-webkit-flex-direction: column;
flex-direction: column;
-webkit-align-items: stretch;
+ -ms-grid-row-align: stretch;
align-items: stretch;
padding-top: 16px;
padding-left: 0; }
@@ -3055,6 +3056,7 @@ img {
-webkit-flex-direction: row;
flex-direction: row;
-webkit-align-items: center;
+ -ms-grid-row-align: center;
align-items: center;
float: right \9; }
@media screen and (max-width: 1024px) {
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

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

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

0 comments on commit 8f7a9e3

Please sign in to comment.