From 3e13d22b45cd7279995678e4d94d4c8632c071a6 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 9 May 2015 12:39:37 +1000
Subject: [PATCH] The hotkey for full screen mode is now Cmd+Shift+F or
 Ctrl+Shift+F in Windows. Fixes #393

---
 CHANGELOG.md                                     |  3 +++
 .../codeeditor/assets/css/codeeditor.css         |  7 ++++---
 .../codeeditor/assets/js/codeeditor.js           |  6 +++---
 .../codeeditor/assets/less/codeeditor.less       | 16 +++++++++++-----
 .../codeeditor/partials/_codeeditor.htm          |  4 ++--
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52e3e63d6..b0ebab849 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
   - Optimized many JavaScript libraries used in the back-end to reduce memory leaks.
 
diff --git a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
index 48973735a..6db32c2f9 100644
--- a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
+++ b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
@@ -8,13 +8,14 @@
 .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 .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 > 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 > 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:before{font-size:14px}
+.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: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-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}
diff --git a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
index 6f1e997f6..953bd534d 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
@@ -164,8 +164,8 @@
             })
             .tooltip({
                 delay: 500,
-                placement: 'auto',
-                html: true 
+                placement: 'left',
+                html: true
             })
         ;
 
@@ -184,7 +184,7 @@
 
         editor.commands.addCommand({
             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),
             readOnly: true
         })
diff --git a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
index 83528c6cf..d13d3cb70 100644
--- a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
+++ b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
@@ -30,12 +30,16 @@
 
     .editor-toolbar {
         position: absolute;
-        top: 3px;
-        right: 3px;
+        top: 10px;
+        right: 10px;
         z-index: @codeeditor-zindex;
         > ul, ul > li { list-style-type: none; padding: 0; margin: 0; }
         > ul > li {
             float: left;
+
+            .tooltip.left {
+                margin-right: 25px;
+            }
         }
         > ul > li > a {
             display: block;
@@ -50,12 +54,14 @@
                 .text-hide();
             }
             > i {
-                .opacity(.4);
+                .opacity(.7);
                 display: block;
-                &:before {font-size: 14px;}
+                &:before {
+                    font-size: 15px;
+                }
             }
             &:hover, &:focus {
-                > i{ .opacity(1); }
+                > i { .opacity(1); }
             }
 
         }
diff --git a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
index 155f08e40..e8137c347 100644
--- a/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
+++ b/modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
@@ -23,13 +23,13 @@
                 <li class="fullscreen-enable">
                     <a href="javascript:;">
                         <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>
                 </li>
                 <li class="fullscreen-disable">
                     <a href="javascript:;">
                         <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>
                 </li>
             </ul>