Skip to content

K
kityminder-core
Commit 4797a3b0 authored by techird's avatar techird
Browse files
Options

兼容性调整

parent 80f39798
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 33 deletions
src/module/hyperlink.js
View file @ 4797a3b0
......@@ -102,12 +102,12 @@ KityMinder.registerModule("hyperlink", function() {
var spaceRight = node.getStyle('space-right');
link.setTranslate(box.right + spaceRight + 2, -5);
return {
return new kity.Box({
x: box.right + spaceRight,
y: -11,
width: 24,
height: 22
};
});
}
})
}
......
ui/ribbon/idea/resource.js
View file @ 4797a3b0
......@@ -68,7 +68,7 @@ KityMinder.registerUI('ribbon/idea/resource', function(minder) {
var resource = minder.queryCommandValue('resource');
var used = minder.getUsedResource();
if (changed(resource, used)) return;
if (!changed(resource, used)) return;
var delta = used.length - $ul.children().length;
while (delta--) $ul.append('<li><label><input type="checkbox" /><span></span></label></li>');
......
ui/theme/default/css/_localfile.less
View file @ 4797a3b0
......@@ -31,7 +31,7 @@
font-size: 16px;
color: #CCC;
margin: 150px auto;
transition: all .1s ease;
.transition(all .1s ease);
span {
display: block;
......@@ -41,7 +41,7 @@
&.accept {
border-color: lighten(@tab-active, 40%);
transform: scale(1.2);
.transform(scale(1.2));
}
&.deny {
border-color: #eee;
......
ui/theme/default/css/_mainmenu.less
View file @ 4797a3b0
......@@ -42,23 +42,26 @@
.dock;
overflow: hidden;
transform: translate3d(0, -100%, 0);
.transform(translate3d(0, -100%, 0));
transform-origin: 0 0;
opacity: 0;
-webkit-transition: opacity .2s ease, -webkit-transform .2s ease;
transition: opacity .2s ease, transform .2s ease;
z-index: 100;
&.show {
opacity: 1;
transform: translate3d(0, 0, 0);
.transform(translate3d(0, 0, 0));
}
.slide-in() {
transform: translateX(-(@left-width)) translateZ(0);
.transform(translateX(-(@left-width)) translateZ(0));
-webkit-transition: -webkit-transform .7s ease, opacity .5s ease;
transition: transform .7s ease, opacity .5s ease;
.show& {
transform: translateX(0) translateZ(0);
.transform(translateX(0) translateZ(0));
-webkit-transition: -webkit-transform .7s ease, opacity .5s ease;
transition: transform .7s ease, opacity .5s ease;
}
}
......
ui/theme/default/css/_public.less
View file @ 4797a3b0
......@@ -127,22 +127,18 @@ input[type=url] {
@-webkit-keyframes rotate {
from {
-webkit-transform: rotate(0);
transform: rotate(0);
.transform(rotate(0));
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
.transform(rotate(360deg));
}
}
@keyframes rotate {
from {
-webkit-transform: rotate(0);
transform: rotate(0);
.transform(rotate(0));
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
.transform(rotate(360deg));
}
}
......
ui/theme/default/css/_search.less
View file @ 4797a3b0
......@@ -26,6 +26,7 @@
margin-top: 5px;
margin-right: 3px;
width: 30px;
-webkit-appearance: none;
.transition(width .5s ease);
.transform(translateZ(0));
......
ui/theme/default/css/_widgets.less
View file @ 4797a3b0
......@@ -389,7 +389,7 @@
font-size: 12px;
overflow: hidden;
transition: none;
.transition(none);
&:hover, :focus {
background: #0099f2; /* Old browsers */
......
ui/theme/default/css/default.all.css
View file @ 4797a3b0
......@@ -661,21 +661,33 @@ input[type=url]:focus {
@-webkit-keyframes rotate {
from {
-webkit-transform: rotate(0);
transform: rotate(0);
-moz-transform: rotate(0);
-ms-transform: rotate(0);
-o-transform: rotate(0);
tranform: rotate(0);
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
-moz-transform: rotate(360deg);
-ms-transform: rotate(360deg);
-o-transform: rotate(360deg);
tranform: rotate(360deg);
}
}
@keyframes rotate {
from {
-webkit-transform: rotate(0);
transform: rotate(0);
-moz-transform: rotate(0);
-ms-transform: rotate(0);
-o-transform: rotate(0);
tranform: rotate(0);
}
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
-moz-transform: rotate(360deg);
-ms-transform: rotate(360deg);
-o-transform: rotate(360deg);
tranform: rotate(360deg);
}
}
@-webkit-keyframes fadeIn {
......@@ -1191,6 +1203,10 @@ li {
text-decoration: none;
font-size: 12px;
overflow: hidden;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
-o-transition: none;
transition: none;
}
.fui-popup-menu .fui-item .fui-label,
......@@ -1388,15 +1404,24 @@ body {
bottom: 0;
left: 0;
overflow: hidden;
transform: translate3d(0, -100%, 0);
-webkit-transform: translate3d(0, -100%, 0);
-moz-transform: translate3d(0, -100%, 0);
-ms-transform: translate3d(0, -100%, 0);
-o-transform: translate3d(0, -100%, 0);
tranform: translate3d(0, -100%, 0);
transform-origin: 0 0;
opacity: 0;
-webkit-transition: opacity 0.2s ease, -webkit-transform 0.2s ease;
transition: opacity .2s ease, transform .2s ease;
z-index: 100;
}
#main-menu.show {
opacity: 1;
transform: translate3d(0, 0, 0);
-webkit-transform: translate3d(0, 0, 0);
-moz-transform: translate3d(0, 0, 0);
-ms-transform: translate3d(0, 0, 0);
-o-transform: translate3d(0, 0, 0);
tranform: translate3d(0, 0, 0);
}
#main-menu:before {
content: ' ';
......@@ -1408,11 +1433,21 @@ body {
bottom: 10px;
box-shadow: 0 -3px 8px rgba(0, 0, 0, 0.15);
z-index: 1;
transform: translateX(-200px) translateZ(0);
-webkit-transform: translateX(-200px) translateZ(0);
-moz-transform: translateX(-200px) translateZ(0);
-ms-transform: translateX(-200px) translateZ(0);
-o-transform: translateX(-200px) translateZ(0);
tranform: translateX(-200px) translateZ(0);
-webkit-transition: -webkit-transform 0.7s ease, opacity 0.5s ease;
transition: transform .7s ease, opacity .5s ease;
}
.show#main-menu:before {
transform: translateX(0) translateZ(0);
-webkit-transform: translateX(0) translateZ(0);
-moz-transform: translateX(0) translateZ(0);
-ms-transform: translateX(0) translateZ(0);
-o-transform: translateX(0) translateZ(0);
tranform: translateX(0) translateZ(0);
-webkit-transition: -webkit-transform 0.7s ease, opacity 0.5s ease;
transition: transform .7s ease, opacity .5s ease;
}
#main-menu .main-menu-header {
......@@ -1477,11 +1512,21 @@ body {
font-weight: normal;
line-height: 40px;
color: #999;
transform: translateX(-200px) translateZ(0);
-webkit-transform: translateX(-200px) translateZ(0);
-moz-transform: translateX(-200px) translateZ(0);
-ms-transform: translateX(-200px) translateZ(0);
-o-transform: translateX(-200px) translateZ(0);
tranform: translateX(-200px) translateZ(0);
-webkit-transition: -webkit-transform 0.7s ease, opacity 0.5s ease;
transition: transform .7s ease, opacity .5s ease;
}
.show#main-menu .main-menu-title {
transform: translateX(0) translateZ(0);
-webkit-transform: translateX(0) translateZ(0);
-moz-transform: translateX(0) translateZ(0);
-ms-transform: translateX(0) translateZ(0);
-o-transform: translateX(0) translateZ(0);
tranform: translateX(0) translateZ(0);
-webkit-transition: -webkit-transform 0.7s ease, opacity 0.5s ease;
transition: transform .7s ease, opacity .5s ease;
}
#main-menu .main-menu-level1 {
......@@ -1532,12 +1577,22 @@ body {
left: 200px;
background-color: white;
z-index: 2;
transform: translateX(-200px) translateZ(0);
-webkit-transform: translateX(-200px) translateZ(0);
-moz-transform: translateX(-200px) translateZ(0);
-ms-transform: translateX(-200px) translateZ(0);
-o-transform: translateX(-200px) translateZ(0);
tranform: translateX(-200px) translateZ(0);
-webkit-transition: -webkit-transform 0.7s ease, opacity 0.5s ease;
transition: transform .7s ease, opacity .5s ease;
/* 每个二级菜单的面板 */
}
.show#main-menu .main-menu-level1 > .fui-tabs-panel-wrap {
transform: translateX(0) translateZ(0);
-webkit-transform: translateX(0) translateZ(0);
-moz-transform: translateX(0) translateZ(0);
-ms-transform: translateX(0) translateZ(0);
-o-transform: translateX(0) translateZ(0);
tranform: translateX(0) translateZ(0);
-webkit-transition: -webkit-transform 0.7s ease, opacity 0.5s ease;
transition: transform .7s ease, opacity .5s ease;
}
#main-menu .main-menu-level1 > .fui-tabs-panel-wrap > .fui-panel {
......@@ -1918,6 +1973,7 @@ body {
margin-top: 5px;
margin-right: 3px;
width: 30px;
-webkit-appearance: none;
-webkit-transition: width 0.5s ease;
-moz-transition: width 0.5s ease;
-ms-transition: width 0.5s ease;
......@@ -2307,7 +2363,11 @@ body {
font-size: 16px;
color: #CCC;
margin: 150px auto;
transition: all .1s ease;
-webkit-transition: all 0.1s ease;
-moz-transition: all 0.1s ease;
-ms-transition: all 0.1s ease;
-o-transition: all 0.1s ease;
transition: all 0.1s ease;
}
.local-file-open-panel .drop-file span {
display: block;
......@@ -2316,7 +2376,11 @@ body {
}
.local-file-open-panel .drop-file.accept {
border-color: #abb1c0;
transform: scale(1.2);
-webkit-transform: scale(1.2);
-moz-transform: scale(1.2);
-ms-transform: scale(1.2);
-o-transform: scale(1.2);
tranform: scale(1.2);
}
.local-file-open-panel .drop-file.deny {
border-color: #eee;
......
ui/theme/default/css/default.all.css.map
View file @ 4797a3b0
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment