The hotkey for full screen mode is now Cmd+Shift+F or Ctrl+Shift+F in Windows.
Fixes #393
This commit is contained in:
parent
189d56a6c5
commit
3e13d22b45
|
|
@ -1,3 +1,6 @@
|
||||||
|
* **Build 25x** (2015-05-xx)
|
||||||
|
- The hotkey for full screen mode is now Cmd+Shift+F or Ctrl+Shift+F in Windows.
|
||||||
|
|
||||||
* **Build 252** (2015-04-29)
|
* **Build 252** (2015-04-29)
|
||||||
- Optimized many JavaScript libraries used in the back-end to reduce memory leaks.
|
- Optimized many JavaScript libraries used in the back-end to reduce memory leaks.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,14 @@
|
||||||
.field-codeeditor.size-giant{min-height:350px}
|
.field-codeeditor.size-giant{min-height:350px}
|
||||||
.field-codeeditor .ace_search{font-family:'Open Sans',Arial,sans-serif;font-size:14px;color:#333333;z-index:603}
|
.field-codeeditor .ace_search{font-family:'Open Sans',Arial,sans-serif;font-size:14px;color:#333333;z-index:603}
|
||||||
.field-codeeditor .editor-code{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
|
.field-codeeditor .editor-code{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}
|
||||||
.field-codeeditor .editor-toolbar{position:absolute;top:3px;right:3px;z-index:600}
|
.field-codeeditor .editor-toolbar{position:absolute;top:10px;right:10px;z-index:600}
|
||||||
.field-codeeditor .editor-toolbar > ul,.field-codeeditor .editor-toolbar ul > li{list-style-type:none;padding:0;margin:0}
|
.field-codeeditor .editor-toolbar > ul,.field-codeeditor .editor-toolbar ul > li{list-style-type:none;padding:0;margin:0}
|
||||||
.field-codeeditor .editor-toolbar > ul > li{float:left}
|
.field-codeeditor .editor-toolbar > ul > li{float:left}
|
||||||
|
.field-codeeditor .editor-toolbar > ul > li .tooltip.left{margin-right:25px}
|
||||||
.field-codeeditor .editor-toolbar > ul > li > a{display:block;height:25px;width:25px;color:#666;font-size:20px;text-align:center;text-decoration:none}
|
.field-codeeditor .editor-toolbar > ul > li > a{display:block;height:25px;width:25px;color:#666;font-size:20px;text-align:center;text-decoration:none}
|
||||||
.field-codeeditor .editor-toolbar > ul > li > a > abbr{position:absolute;font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
|
.field-codeeditor .editor-toolbar > ul > li > a > abbr{position:absolute;font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
|
||||||
.field-codeeditor .editor-toolbar > ul > li > a > i{opacity:0.4;filter:alpha(opacity=40);display:block}
|
.field-codeeditor .editor-toolbar > ul > li > a > i{opacity:0.7;filter:alpha(opacity=70);display:block}
|
||||||
.field-codeeditor .editor-toolbar > ul > li > a > i:before{font-size:14px}
|
.field-codeeditor .editor-toolbar > ul > li > a > i:before{font-size:15px}
|
||||||
.field-codeeditor .editor-toolbar > ul > li > a:hover > i,.field-codeeditor .editor-toolbar > ul > li > a:focus > i{opacity:1;filter:alpha(opacity=100)}
|
.field-codeeditor .editor-toolbar > ul > li > a:hover > i,.field-codeeditor .editor-toolbar > ul > li > a:focus > i{opacity:1;filter:alpha(opacity=100)}
|
||||||
.field-codeeditor.editor-fullscreen{z-index:601;position:fixed !important;top:0;left:0;height:100%;border-width:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
|
.field-codeeditor.editor-fullscreen{z-index:601;position:fixed !important;top:0;left:0;height:100%;border-width:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
|
||||||
.field-codeeditor.editor-fullscreen .editor-code{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
|
.field-codeeditor.editor-fullscreen .editor-code{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
|
||||||
|
|
|
||||||
|
|
@ -164,8 +164,8 @@
|
||||||
})
|
})
|
||||||
.tooltip({
|
.tooltip({
|
||||||
delay: 500,
|
delay: 500,
|
||||||
placement: 'auto',
|
placement: 'left',
|
||||||
html: true
|
html: true
|
||||||
})
|
})
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
@ -184,7 +184,7 @@
|
||||||
|
|
||||||
editor.commands.addCommand({
|
editor.commands.addCommand({
|
||||||
name: 'toggleFullscreen',
|
name: 'toggleFullscreen',
|
||||||
bindKey: { win: 'Ctrl+Alt+F', mac: 'Ctrl+Alt+F' },
|
bindKey: { win: 'Ctrl+Shift+F', mac: 'Ctrl+Shift+F' },
|
||||||
exec: $.proxy(this.toggleFullscreen, this),
|
exec: $.proxy(this.toggleFullscreen, this),
|
||||||
readOnly: true
|
readOnly: true
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -30,12 +30,16 @@
|
||||||
|
|
||||||
.editor-toolbar {
|
.editor-toolbar {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 3px;
|
top: 10px;
|
||||||
right: 3px;
|
right: 10px;
|
||||||
z-index: @codeeditor-zindex;
|
z-index: @codeeditor-zindex;
|
||||||
> ul, ul > li { list-style-type: none; padding: 0; margin: 0; }
|
> ul, ul > li { list-style-type: none; padding: 0; margin: 0; }
|
||||||
> ul > li {
|
> ul > li {
|
||||||
float: left;
|
float: left;
|
||||||
|
|
||||||
|
.tooltip.left {
|
||||||
|
margin-right: 25px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
> ul > li > a {
|
> ul > li > a {
|
||||||
display: block;
|
display: block;
|
||||||
|
|
@ -50,12 +54,14 @@
|
||||||
.text-hide();
|
.text-hide();
|
||||||
}
|
}
|
||||||
> i {
|
> i {
|
||||||
.opacity(.4);
|
.opacity(.7);
|
||||||
display: block;
|
display: block;
|
||||||
&:before {font-size: 14px;}
|
&:before {
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
&:hover, &:focus {
|
&:hover, &:focus {
|
||||||
> i{ .opacity(1); }
|
> i { .opacity(1); }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,13 +23,13 @@
|
||||||
<li class="fullscreen-enable">
|
<li class="fullscreen-enable">
|
||||||
<a href="javascript:;">
|
<a href="javascript:;">
|
||||||
<i class="icon-desktop"></i>
|
<i class="icon-desktop"></i>
|
||||||
<abbr title="ctrl+alt+f"><?= e(trans('cms::lang.editor.enter_fullscreen')) ?></abbr>
|
<abbr title="ctrl+shift+f"><?= e(trans('cms::lang.editor.enter_fullscreen')) ?></abbr>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="fullscreen-disable">
|
<li class="fullscreen-disable">
|
||||||
<a href="javascript:;">
|
<a href="javascript:;">
|
||||||
<i class="icon-desktop"></i>
|
<i class="icon-desktop"></i>
|
||||||
<abbr title="ctrl+alt+f or esc"><?= e(trans('cms::lang.editor.exit_fullscreen')) ?></abbr>
|
<abbr title="ctrl+shift+f or esc"><?= e(trans('cms::lang.editor.exit_fullscreen')) ?></abbr>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue