diff --git a/demo/kitchen-sink/docs/css.css b/demo/kitchen-sink/docs/css.css index 0ebe5f2d..6d2d71f5 100644 --- a/demo/kitchen-sink/docs/css.css +++ b/demo/kitchen-sink/docs/css.css @@ -1,28 +1,18 @@ .text-layer { - font-family: Monaco, "Courier New", monospace; - font-size: 12pX; + font: 12px Monaco, "Courier New", monospace; cursor: text; } .blinker { - animation-duration: 1s; - animation-name: blink; - animation-iteration-count: infinite; - animation-direction: alternate; - animation-timing-function: linear; + animation: blink 1s linear infinite alternate; } @keyframes blink { - 0% { + 0%, 40% { opacity: 0; } - 40% { - opacity: 0; - } - 40.5% { - opacity: 1 - } - 100% { + + 40.5%, 100% { opacity: 1 } } \ No newline at end of file diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css index 35cdf57f..9e2db39a 100644 --- a/lib/ace/css/editor.css +++ b/lib/ace/css/editor.css @@ -1,9 +1,7 @@ .ace_editor { position: relative; overflow: hidden; - font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; - font-size: 12px; - line-height: normal; + font: 12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; direction: ltr; } @@ -211,7 +209,7 @@ } .ace_overwrite-cursors .ace_cursor { - border-left-width: 0px; + border-left-width: 0; border-bottom: 1px solid; } @@ -220,10 +218,7 @@ } .ace_smooth-blinking .ace_cursor { - -moz-transition: opacity 0.18s; -webkit-transition: opacity 0.18s; - -o-transition: opacity 0.18s; - -ms-transition: opacity 0.18s; transition: opacity 0.18s; } @@ -277,8 +272,6 @@ color: transparent; border: 1px solid black; - -moz-border-radius: 2px; - -webkit-border-radius: 2px; border-radius: 2px; cursor: pointer; @@ -302,7 +295,6 @@ border-radius: 1px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); color: black; - display: block; max-width: 100%; padding: 3px 4px; position: fixed; @@ -359,16 +351,12 @@ .ace_fold-widget:hover { border: 1px solid rgba(0, 0, 0, 0.3); background-color: rgba(255, 255, 255, 0.2); - -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); - -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7); } .ace_fold-widget:active { border: 1px solid rgba(0, 0, 0, 0.4); background-color: rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8); - -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8); box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8); } /** @@ -388,8 +376,6 @@ background-color: rgba(255, 255, 255, 0.1); } .ace_dark .ace_fold-widget:active { - -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2); - -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2); box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2); } @@ -399,19 +385,13 @@ } .ace_fade-fold-widgets .ace_fold-widget { - -moz-transition: opacity 0.4s ease 0.05s; -webkit-transition: opacity 0.4s ease 0.05s; - -o-transition: opacity 0.4s ease 0.05s; - -ms-transition: opacity 0.4s ease 0.05s; transition: opacity 0.4s ease 0.05s; opacity: 0; } .ace_fade-fold-widgets:hover .ace_fold-widget { - -moz-transition: opacity 0.05s ease 0.05s; -webkit-transition: opacity 0.05s ease 0.05s; - -o-transition: opacity 0.05s ease 0.05s; - -ms-transition: opacity 0.05s ease 0.05s; transition: opacity 0.05s ease 0.05s; opacity:1; } diff --git a/lib/ace/ext/searchbox.css b/lib/ace/ext/searchbox.css index 98b54257..ca58e74d 100644 --- a/lib/ace/ext/searchbox.css +++ b/lib/ace/ext/searchbox.css @@ -47,7 +47,6 @@ -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - display: block; float: left; height: 22px; outline: 0; @@ -61,7 +60,6 @@ border: 0 none; border-left: 1px solid #dcdcdc; cursor: pointer; - display: block; float: left; height: 22px; margin: 0; @@ -94,12 +92,9 @@ border: 0 none; color: #656565; cursor: pointer; - display: block; float: right; - font-family: Arial; - font-size: 16px; + font: 16px/16px Arial; height: 14px; - line-height: 16px; margin: 5px 1px 9px 5px; padding: 0; text-align: center; diff --git a/lib/ace/ext/static.css b/lib/ace/ext/static.css index f82359da..cc7da8a6 100644 --- a/lib/ace/ext/static.css +++ b/lib/ace/ext/static.css @@ -5,7 +5,6 @@ .ace_static_highlight .ace_gutter { width: 25px !important; - display: block; float: left; text-align: right; padding: 0 3px 0 0;