From 661d27dbb3742b8cd1096c36a37e5b87a5573b73 Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@onolan.org>
Date: Wed, 12 Aug 2015 09:17:01 +0200
Subject: [PATCH 1/2] Prevent view titles from being cut off in Safari

See #5652
---
 core/client/app/templates/about.hbs                   | 2 +-
 core/client/app/templates/posts.hbs                   | 2 +-
 core/client/app/templates/settings/code-injection.hbs | 2 +-
 core/client/app/templates/settings/general.hbs        | 2 +-
 core/client/app/templates/settings/labs.hbs           | 2 +-
 core/client/app/templates/settings/navigation.hbs     | 2 +-
 core/client/app/templates/settings/tags.hbs           | 2 +-
 core/client/app/templates/team/index.hbs              | 2 +-
 core/client/app/templates/team/user.hbs               | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/client/app/templates/about.hbs b/core/client/app/templates/about.hbs
index 8d20c93853..1f38531ef4 100644
--- a/core/client/app/templates/about.hbs
+++ b/core/client/app/templates/about.hbs
@@ -2,7 +2,7 @@
     <section class="view-content">
         <header class="gh-about-header">
             <img class="gh-logo" src="{{gh-path 'admin' '/img/ghost-logo.png'}}" alt="Ghost" />
-            <!-- TODO: fix about notifications -->
+            {{!-- TODO: fix about notifications --}}
             {{gh-notifications location="about-upgrade" notify="updateNotificationChange"}}
         </header>
 
diff --git a/core/client/app/templates/posts.hbs b/core/client/app/templates/posts.hbs
index fd3d566587..5f150cf8c7 100644
--- a/core/client/app/templates/posts.hbs
+++ b/core/client/app/templates/posts.hbs
@@ -1,6 +1,6 @@
 <section class="gh-view content-view-container">
 <header class="view-header">
-    {{#gh-view-title openMobileMenu="openMobileMenu"}}Content{{/gh-view-title}}
+    {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Content</span>{{/gh-view-title}}
     <section class="view-actions">
         {{#link-to "editor.new" class="btn btn-green" title="New Post"}}New Post{{/link-to}}
     </section>
diff --git a/core/client/app/templates/settings/code-injection.hbs b/core/client/app/templates/settings/code-injection.hbs
index de71df50d4..8273e13233 100644
--- a/core/client/app/templates/settings/code-injection.hbs
+++ b/core/client/app/templates/settings/code-injection.hbs
@@ -1,6 +1,6 @@
 <section class="gh-view">
     <header class="view-header">
-        {{#gh-view-title openMobileMenu="openMobileMenu"}}Code Injection{{/gh-view-title}}
+        {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Code Injection</span>{{/gh-view-title}}
         <section class="view-actions">
             {{gh-spin-button type="button" class="btn btn-blue" action="save" buttonText="Save" submitting=submitting}}
         </section>
diff --git a/core/client/app/templates/settings/general.hbs b/core/client/app/templates/settings/general.hbs
index a9aa94fcd1..27d7624991 100644
--- a/core/client/app/templates/settings/general.hbs
+++ b/core/client/app/templates/settings/general.hbs
@@ -1,6 +1,6 @@
 <section class="gh-view">
     <header class="view-header">
-        {{#gh-view-title openMobileMenu="openMobileMenu"}}General{{/gh-view-title}}
+        {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>General</span>{{/gh-view-title}}
         <section class="view-actions">
             {{gh-spin-button type="button" class="btn btn-blue" action="save" buttonText="Save" submitting=submitting}}
         </section>
diff --git a/core/client/app/templates/settings/labs.hbs b/core/client/app/templates/settings/labs.hbs
index f5fe3dab79..917aacfde1 100644
--- a/core/client/app/templates/settings/labs.hbs
+++ b/core/client/app/templates/settings/labs.hbs
@@ -1,6 +1,6 @@
 <section class="gh-view">
     <header class="view-header">
-        {{#gh-view-title openMobileMenu="openMobileMenu"}}Labs{{/gh-view-title}}
+        {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Labs</span>{{/gh-view-title}}
     </header>
 
     <section class="view-content settings-debug">
diff --git a/core/client/app/templates/settings/navigation.hbs b/core/client/app/templates/settings/navigation.hbs
index 488973201b..c8dcb6533c 100644
--- a/core/client/app/templates/settings/navigation.hbs
+++ b/core/client/app/templates/settings/navigation.hbs
@@ -1,6 +1,6 @@
 {{#gh-navigation moveItem="moveItem"}}
     <header class="view-header">
-        {{#gh-view-title openMobileMenu="openMobileMenu"}}Navigation{{/gh-view-title}}
+        {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Navigation</span>{{/gh-view-title}}
         <section class="view-actions">
             {{gh-spin-button type="button" class="btn btn-blue" action="save" buttonText="Save" submitting=submitting}}
         </section>
diff --git a/core/client/app/templates/settings/tags.hbs b/core/client/app/templates/settings/tags.hbs
index f6a9cfe16e..ccc320d596 100644
--- a/core/client/app/templates/settings/tags.hbs
+++ b/core/client/app/templates/settings/tags.hbs
@@ -1,6 +1,6 @@
 <section class="gh-view">
     <header class="view-header">
-        {{#gh-view-title openMobileMenu="openMobileMenu"}}Tags{{/gh-view-title}}
+        {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Tags</span>{{/gh-view-title}}
         <section class="view-actions">
             <button type="button" class="btn btn-green" {{action "newTag"}}>New Tag</button>
         </section>
diff --git a/core/client/app/templates/team/index.hbs b/core/client/app/templates/team/index.hbs
index 6beb552a56..99539c371e 100644
--- a/core/client/app/templates/team/index.hbs
+++ b/core/client/app/templates/team/index.hbs
@@ -1,6 +1,6 @@
 <section class="gh-view">
     <header class="view-header">
-        {{#gh-view-title openMobileMenu="openMobileMenu"}}Team{{/gh-view-title}}
+        {{#gh-view-title openMobileMenu="openMobileMenu"}}<span>Team</span>{{/gh-view-title}}
         {{!-- Do not show Invite user button to authors --}}
         {{#unless session.user.isAuthor}}
             <section class="view-actions">
diff --git a/core/client/app/templates/team/user.hbs b/core/client/app/templates/team/user.hbs
index 2f5d4fab3b..a5c6ad35b7 100644
--- a/core/client/app/templates/team/user.hbs
+++ b/core/client/app/templates/team/user.hbs
@@ -2,7 +2,7 @@
     <header class="view-header">
         {{#gh-view-title openMobileMenu="openMobileMenu"}}
             {{link-to "Team" "team"}}
-            <i class="icon-arrow-right"></i> {{user.name}}
+            <i class="icon-arrow-right"></i> <span>{{user.name}}</span>
         {{/gh-view-title}}
         <section class="view-actions">
             {{#if userActionsAreVisible}}

From 97ce6f8a0cd7d4e6617144897871502a88eaf8d4 Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@onolan.org>
Date: Wed, 12 Aug 2015 10:29:40 +0200
Subject: [PATCH 2/2] Multiple minor visual style fixes

- Lighter dropdown shadow
- Removed display:flex from .btn because safari can't handle it on <button> elements, where it will immediately set all text-alignment to "left" with no way to change. I haven't been able to find any regressions for this change so far. Can't remember why buttons were supposed to be flexbox anyway. Maybe for icon alignment within buttons, but I can't find any such examples within the app.
- Safari thinks that user-select: all; means a single click should SELECT ALL THE THINGS. Removed/replaced with user-select: text; which makes it behave like Chrome; click and drag to select.
- Increased hit area for "?" button
- Removed :active style for post-edit button on content management screen, adjusted position
- Increased contrast on tag description, tag count, and view blog links

See #5652
---
 core/client/app/styles/components/dropdowns.css          | 2 +-
 core/client/app/styles/components/notifications.css      | 4 ++--
 core/client/app/styles/layouts/content.css               | 5 +++--
 core/client/app/styles/layouts/editor.css                | 2 +-
 core/client/app/styles/layouts/main.css                  | 5 ++---
 core/client/app/styles/layouts/tags.css                  | 4 ++--
 core/client/app/styles/patterns/buttons.css              | 4 +---
 core/client/app/templates/components/gh-modal-dialog.hbs | 9 ++-------
 8 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/core/client/app/styles/components/dropdowns.css b/core/client/app/styles/components/dropdowns.css
index d297c69fca..951f71e324 100644
--- a/core/client/app/styles/components/dropdowns.css
+++ b/core/client/app/styles/components/dropdowns.css
@@ -22,7 +22,7 @@
     background-color: #fff;
     background-clip: padding-box;
     border-radius: 4px;
-    box-shadow: rgba(0, 0, 0, 0.175) 0 2px 6px;
+    box-shadow: rgba(0, 0, 0, 0.10) 0 2px 6px;
     list-style: none;
     text-align: left;
     text-transform: none;
diff --git a/core/client/app/styles/components/notifications.css b/core/client/app/styles/components/notifications.css
index 8895860afa..2c4f641edf 100644
--- a/core/client/app/styles/components/notifications.css
+++ b/core/client/app/styles/components/notifications.css
@@ -128,13 +128,13 @@
     font-size: 1.4rem;
     line-height: 1.3em;
     font-weight: 200;
-    user-select: all;
+    user-select: text;
 }
 
 .gh-alert a {
     text-decoration: underline;
     font-weight: 400;
-    user-select: all;
+    user-select: text;
 }
 
 .gh-alert-close {
diff --git a/core/client/app/styles/layouts/content.css b/core/client/app/styles/layouts/content.css
index 51878f824e..f598ecc7b9 100644
--- a/core/client/app/styles/layouts/content.css
+++ b/core/client/app/styles/layouts/content.css
@@ -216,11 +216,12 @@
 
 .content-preview .post-controls {
     position: absolute;
-    top: 25px;
+    top: 5px;
     right: 25px;
 }
 
-.content-preview .post-controls .btn {
+.content-preview .post-controls .post-edit {
+    padding-top: 0;
     padding-right: 0;
     border: none;
     font-size: 18px;
diff --git a/core/client/app/styles/layouts/editor.css b/core/client/app/styles/layouts/editor.css
index 4c82eaf189..c45d1029e6 100644
--- a/core/client/app/styles/layouts/editor.css
+++ b/core/client/app/styles/layouts/editor.css
@@ -156,7 +156,7 @@
 
 .entry-preview-content *,
 .content-preview-content * {
-    user-select: all;
+    user-select: text;
 }
 
 .entry-preview-content a,
diff --git a/core/client/app/styles/layouts/main.css b/core/client/app/styles/layouts/main.css
index 800d9cf45d..fd1edd6046 100644
--- a/core/client/app/styles/layouts/main.css
+++ b/core/client/app/styles/layouts/main.css
@@ -192,7 +192,7 @@
 .gh-nav-footer-sitelink {
     flex-grow: 1;
     padding: 12px;
-    color: var(--midgrey);
+    color: color(var(--midgrey) lightness(-10%));
     text-align: center;
     text-transform: uppercase;
     font-size: 1rem;
@@ -327,13 +327,12 @@
 .gh-help-menu {
     display: flex;
     align-items: center;
-    padding: 5px 10px;
     border-left: #dfe1e3 1px solid;
     cursor: pointer;
 }
 
 .gh-help-button {
-    padding: 0 5px;
+    padding: 5px 15px;
     color: var(--midgrey);
     text-align: center;
     font-size: 1.4rem;
diff --git a/core/client/app/styles/layouts/tags.css b/core/client/app/styles/layouts/tags.css
index 9a0ce6274e..562028721f 100644
--- a/core/client/app/styles/layouts/tags.css
+++ b/core/client/app/styles/layouts/tags.css
@@ -109,7 +109,7 @@
 
 .settings-tag .tag-description {
     margin: 0;
-    color: #dfe1e3;
+    color: color(#dfe1e3 lightness(-10%));
     font-size: 13px;
 }
 
@@ -117,6 +117,6 @@
     position: absolute;
     top: 20px;
     right: 12px;
-    color: #dfe1e3;
+    color: color(#dfe1e3 lightness(-10%));
     font-size: 16px;
 }
diff --git a/core/client/app/styles/patterns/buttons.css b/core/client/app/styles/patterns/buttons.css
index 232d902574..07cd1f3e68 100644
--- a/core/client/app/styles/patterns/buttons.css
+++ b/core/client/app/styles/patterns/buttons.css
@@ -3,9 +3,6 @@
 
 /* Base button style */
 .btn {
-    display: flex;
-    justify-content: center;
-    align-items: center;
     margin-bottom: 0;
     padding: 9px 15px;
     border: #dfe1e3 1px solid;
@@ -163,6 +160,7 @@ fieldset[disabled] .btn {
 .btn-minor:focus {
     border-color: #c1c1c1;
     background: #fff;
+    box-shadow: none;
     color: #808284;
 }
 
diff --git a/core/client/app/templates/components/gh-modal-dialog.hbs b/core/client/app/templates/components/gh-modal-dialog.hbs
index 2255cf3bac..f024e0b893 100644
--- a/core/client/app/templates/components/gh-modal-dialog.hbs
+++ b/core/client/app/templates/components/gh-modal-dialog.hbs
@@ -8,13 +8,8 @@
             </section>
             {{#if confirm}}
             <footer class="modal-footer">
-                <button type="button" class="{{rejectButtonClass}} btn-minor js-button-reject" {{action "confirm" "reject"}}>
-                    {{confirm.reject.text}}
-                </button><!--
-                Required to strip the white-space between buttons
-                --><button type="button" class="{{acceptButtonClass}} js-button-accept" {{action "confirm" "accept"}}>
-                    {{confirm.accept.text}}
-                </button>
+                {{! Buttons must be on one line to prevent white-space errors }}
+                <button type="button" class="{{rejectButtonClass}} btn-minor js-button-reject" {{action "confirm" "reject"}}>{{confirm.reject.text}}</button><button type="button" class="{{acceptButtonClass}} js-button-accept" {{action "confirm" "accept"}}>{{confirm.accept.text}}</button>
             </footer>
             {{/if}}
         </section>