diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js
index 49fe5d5746..be4deefa46 100644
--- a/apps/common/main/lib/controller/Plugins.js
+++ b/apps/common/main/lib/controller/Plugins.js
@@ -490,8 +490,8 @@ define([
this.parsePlugins(pluginsdata)
},
- onPluginShowButton: function(id) {
- this.pluginDlg && this.pluginDlg.showButton(id);
+ onPluginShowButton: function(id, toRight) {
+ this.pluginDlg && this.pluginDlg.showButton(id, toRight);
},
onPluginHideButton: function(id) {
diff --git a/apps/common/main/lib/view/PluginDlg.js b/apps/common/main/lib/view/PluginDlg.js
index 8be6dc8568..7340b06781 100644
--- a/apps/common/main/lib/view/PluginDlg.js
+++ b/apps/common/main/lib/view/PluginDlg.js
@@ -200,29 +200,25 @@ define([
}
},
- showButton: function(id) {
- var header = this.$window.find('.header .tools.left');
- if (id=='back') {
- var btn = header.find('#id-plugindlg-' + id);
- if (btn.length<1) {
- btn = $('←
');
- btn.on('click', _.bind(function() {
- this.fireEvent('header:click',id);
- }, this));
- header.prepend(btn);
- }
- btn.show();
- header.removeClass('hidden');
+ showButton: function(id, toRight) {
+ var header = this.$window.find(toRight ? '.header .tools:not(.left)' : '.header .tools.left'),
+ btn = header.find('#id-plugindlg-' + id);
+ if (btn.length<1) {
+ var iconCls = (id ==='back') ? 'btn-promote' : 'btn-' + Common.Utils.String.htmlEncode(id);
+ btn = $('');
+ btn.on('click', _.bind(function() {
+ this.fireEvent('header:click',id);
+ }, this));
+ header.append(btn);
}
+ btn.show();
+ header.removeClass('hidden');
},
hideButton: function(id) {
- var header = this.$window.find('.header .tools.left');
- if (id=='back') {
- var btn = header.find('#id-plugindlg-' + id);
- if (btn.length>0) {
- btn.hide();
- }
+ var btn = this.$window.find('.header #id-plugindlg-' + id);
+ if (btn.length>0) {
+ btn.hide();
}
},
diff --git a/apps/common/main/resources/img/toolbar/1.25x/btn-developer.png b/apps/common/main/resources/img/toolbar/1.25x/btn-developer.png
new file mode 100644
index 0000000000..4d92722c64
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.25x/btn-developer.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.5x/btn-developer.png b/apps/common/main/resources/img/toolbar/1.5x/btn-developer.png
new file mode 100644
index 0000000000..0ef5e4a6b0
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.5x/btn-developer.png differ
diff --git a/apps/common/main/resources/img/toolbar/1.75x/btn-developer.png b/apps/common/main/resources/img/toolbar/1.75x/btn-developer.png
new file mode 100644
index 0000000000..64f06a7d06
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1.75x/btn-developer.png differ
diff --git a/apps/common/main/resources/img/toolbar/1x/btn-developer.png b/apps/common/main/resources/img/toolbar/1x/btn-developer.png
new file mode 100644
index 0000000000..3bccf09563
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/1x/btn-developer.png differ
diff --git a/apps/common/main/resources/img/toolbar/2.5x/btn-developer.svg b/apps/common/main/resources/img/toolbar/2.5x/btn-developer.svg
new file mode 100644
index 0000000000..9241754bbc
--- /dev/null
+++ b/apps/common/main/resources/img/toolbar/2.5x/btn-developer.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/apps/common/main/resources/img/toolbar/2x/btn-developer.png b/apps/common/main/resources/img/toolbar/2x/btn-developer.png
new file mode 100644
index 0000000000..bd6acba496
Binary files /dev/null and b/apps/common/main/resources/img/toolbar/2x/btn-developer.png differ
diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less
index 4fb09e324b..f2b82fa11a 100644
--- a/apps/common/main/resources/less/window.less
+++ b/apps/common/main/resources/less/window.less
@@ -24,16 +24,12 @@
}
.tool {
.float-right();
- width: 16px;
- height: 16px;
+ width: 20px;
+ height: 20px;
cursor: pointer;
overflow: hidden;
padding: 0px;
- margin: 4px 3px 0px 0px;
-
- .rtl & {
- margin: 4px 0 0px 3px;
- }
+ margin: 0;
&.close {
position: relative;
@@ -50,8 +46,7 @@
&:before, &:after {
content: ' ';
position: absolute;
- left: 8px;
- //left: calc(8px / @pixel-ratio-factor);
+ left: 9px;
top: @scaled-one-px-value-ie;
top: @scaled-one-px-value;
height: 14px;
@@ -59,6 +54,7 @@
width: @scaled-one-px-value;
background-color: @icon-normal-ie;
background-color: @icon-normal;
+ margin-top: 4px;
}
&:before {
@@ -135,30 +131,46 @@
right: 0;
}
}
- }
- .tool.help {
- width: 20px;
- margin-right:0;
- line-height: 14px;
- font-size: 14px;
- .font-weight-bold();
- color: @text-normal-ie;
- color: @text-normal;
- opacity: 0.7;
+ .tool {
+ &.help {
+ line-height: 14px;
+ font-size: 14px;
+ .font-weight-bold();
+ color: @text-normal-ie;
+ color: @text-normal;
+ opacity: 0.7;
+ margin-top: 4px;
- &:hover {
- opacity: 1;
- }
+ &:hover {
+ opacity: 1;
+ }
- &.disabled {
- opacity: @component-disabled-opacity-ie;
- opacity: @component-disabled-opacity;
- cursor: default;
+ &.disabled {
+ opacity: @component-disabled-opacity-ie;
+ opacity: @component-disabled-opacity;
+ cursor: default;
+ }
+ }
+
+ &.custom {
+ opacity: 0.6;
+ margin-top: 2px;
+ .margin-right-2();
+
+ &:hover {
+ opacity: 0.8;
+ }
+
+ &.disabled {
+ opacity: @component-disabled-opacity-ie;
+ opacity: @component-disabled-opacity;
+ cursor: default;
+ }
+ }
}
}
-
&.resizing {
cursor: inherit !important;
}