Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'origin/master' into jumptodef

  • Loading branch information...
commit 06103ad8b9fafa8d92725f79e1b27acb79953a0d 2 parents cf72794 + 899d4f9
@lennartcl lennartcl authored
View
17 plugins-client/ext.main/style/skins.xml
@@ -3567,20 +3567,6 @@
.dark .ace_gutter .ace_gutter_active_line {
background-color: rgba(255, 255, 255, 0.07);
}
-
- .ace_corner{
- position : absolute;
- left : 41px;
- top : -5px;
- border-radius : 6px 0 0 0;
- border-color : #e8e8e8;
- border-width : 1px 0 0 1px;
- border-style : solid;
- box-shadow : 4px 4px 0px #e8e8e8 inset;
- width : 10px;
- height : 10px;
- z-index : 10000;
- }
.ace_scroller.horscroll {
box-shadow: 17px 0px 16px -16px rgba(0,0,0,0.4) inset;
@@ -3703,8 +3689,7 @@
]]></a:style>
<a:presentation>
<a:main content="." corner="div[1]">
- <div class="ce">
- <div class="ace_corner"></div>
+ <div class="ce">
</div>
</a:main>
</a:presentation>
View
5 plugins-client/ext.themes/themes.js
@@ -178,10 +178,7 @@ module.exports = ext.register("ext/themes/themes", {
+ "." + cssClass + ".dark .revisions-list .revision, "
+ "." + cssClass + ".dark .cc_complete_option, "
+ "." + cssClass + " .searchresults > div",
- (theme.isDark ? "color:rgba(255, 255, 255, 0.8)" : "color:" + fg + ";")],
- ["." + cssClass + " .ace_corner",
- "border-color:" + bg + " !important; box-shadow: 4px 4px 0px "
- + bg + " inset !important;"]
+ (theme.isDark ? "color:rgba(255, 255, 255, 0.8)" : "color:" + fg + ";")]
], self, _self.stylesheet);
ide.dispatchEvent("theme.init", {theme: theme, path: path});
View
7 plugins-client/lib.apf/www/apf/elements/codeeditor.js
@@ -293,7 +293,6 @@ apf.codeeditor = module.exports = function(struct, tagName) {
this.$propHandlers["gutter"] = function(value, prop, initial) {
this.$editor.renderer.setShowGutter(value);
- this.$corner.style.display = value ? "block" : "none";
};
this.$propHandlers["fontsize"] = function(value, prop, initial) {
@@ -454,7 +453,6 @@ apf.codeeditor = module.exports = function(struct, tagName) {
//Build Main Skin
this.$ext = this.$getExternal();
this.$input = this.$getLayoutNode("main", "content", this.$ext);
- this.$corner = this.$getLayoutNode("main", "corner", this.$ext);
this.addEventListener("resize", function(e) {
this.$editor.resize();
@@ -463,11 +461,6 @@ apf.codeeditor = module.exports = function(struct, tagName) {
this.$editor = new Editor(new VirtualRenderer(this.$input), null);
new MultiSelect(this.$editor);
- this.$editor.renderer.$gutterLayer.addEventListener("changeGutterWidth",
- function(width){
- _self.$corner.style.left = (width - 5) + "px"
- });
-
if (apf.isTrue(this.getAttribute("globalcommands"))){
if(this.$editor.keyBinding.setDefaultHandler)
this.$editor.keyBinding.setDefaultHandler(null);
Please sign in to comment.
Something went wrong with that request. Please try again.