F

core/client/app/styles/components/uploader.css

@@ -16,7 +16,7 @@
 }
 
 .image-uploader a {
-    color: var(--brown);
+    color: var(--midgrey);
     text-decoration: none;
 }
 
@@ -31,7 +31,7 @@
     left: 0;
     display: block;
     padding: 10px;
-    color: var(--brown);
+    color: var(--midgrey);
     text-decoration: none;
     line-height: 12px;
 }
@@ -130,7 +130,7 @@
     height: auto;
     background: rgba(0, 0, 0, 0.1);
     border-radius: 2px;
-    color: var(--brown);
+    color: var(--midgrey);
 }
 
 .pre-image-uploader input {
@@ -141,7 +141,7 @@
 
 .pre-image-uploader a {
     z-index: 10000;
-    color: var(--brown);
+    color: var(--midgrey);
     text-decoration: none;
 }
 

core/client/app/styles/layouts/editor.css

@@ -172,15 +172,15 @@
 
 .entry-preview-content .btn,
 .content-preview-content .btn {
-    color: var(--grey);
+    color: #e1e1e1;
     text-decoration: none;
 }
 
 .entry-preview-content .img-placeholder,
 .content-preview-content .img-placeholder {
     position: relative;
     height: 100px;
-    border: 5px dashed var(--grey);
+    border: 5px dashed #e1e1e1;
 }
 
 .entry-preview-content .img-placeholder span,

core/client/app/styles/layouts/main.css

@@ -13,6 +13,7 @@
 .gh-viewport {
     flex-grow: 1;
     display: flex;
+    max-height: 100vh;
 }
 
 .gh-main {
@@ -32,6 +33,7 @@
     flex: 0 0 235px;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
     border-right: #e1e1e1 1px solid;
     background: #f6f6f6;
     transform: translateX(0);
@@ -68,6 +70,7 @@
 
 .gh-nav-menu-details {
     flex-grow: 1;
+    overflow: hidden;
     padding-right: 10px;
 }
 
@@ -404,7 +407,8 @@
 .view-title i {
     margin: 0 10px;
     color: #818181;
-    font-size: 1.4rem;
+    font-size: 14px;
+    line-height: 12px;
 }
 
 .view-actions {

core/client/app/styles/layouts/settings.css

@@ -135,7 +135,7 @@
 
 .settings-code-editor.focused {
     outline: 0;
-    border-color: var(--brown);
+    border-color: var(--midgrey);
 }
 
 .settings-code-editor .CodeMirror {

core/client/app/styles/layouts/tags.css

@@ -109,14 +109,14 @@
 
 .settings-tag .tag-description {
     margin: 0;
-    color: var(--midbrown);
+    color: #e1e1e1;
     font-size: 13px;
 }
 
 .settings-tag .tags-count {
     position: absolute;
     top: 20px;
     right: 12px;
-    color: var(--midbrown);
+    color: #e1e1e1;
     font-size: 16px;
 }

core/client/app/styles/layouts/users.css

@@ -16,7 +16,7 @@
 
 .user-list-title {
     margin-bottom: 14px;
-    color: var(--midbrown);
+    color: #a1a1a1;
     font-size: 13px;
     font-weight: normal;
 }
@@ -74,7 +74,7 @@ a.user-list-item {
     right: 0;
     left: 0;
     margin-top: -7px;
-    color: var(--brown);
+    color: var(--midgrey);
     text-align: center;
     font-size: 14px;
 }
@@ -129,7 +129,7 @@ a.user-list-item {
 .user-list-item-body .description {
     display: inline-block;
     margin-top: 3px;
-    color: var(--midbrown);
+    color: #a1a1a1;
     white-space: nowrap;
     font-size: 12px;
 }

core/client/app/styles/patterns/forms.css

@@ -182,7 +182,7 @@ textarea {
     width: 18px;
     height: 18px;
     border: 1px solid #e1e1e1;
-    background: #f7f7f3;
+    background: #f7f7f7;
 }
 
 .for-radio p,

core/client/app/styles/patterns/global.css

@@ -8,19 +8,14 @@
 :root {
     /* Colours */
     --darkgrey: #242628;
-    --grey: #242628;
     --midgrey: #7d878a;
     --lightgrey: #e2edf2;
-    --lightestgrey: #fcfcfc;
-    --brown: #aaa9a2;
-    --midbrown: #c0bfb6;
     --blue: #5ba4e5;
     --red: #e25440;
     --orange: #f2a925;
     --green: #9fbb58;
     /* Style values */
     --border-radius: 4px;
-    --box-shadow: rgba(0,0,0,0.05) 0 1px 5px; /* TODO: not used? */
     --font-family: "Open Sans", sans-serif;
     --font-family-mono: Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
@@ -188,7 +183,7 @@ blockquote p {
 blockquote small {
     display: inline-block;
     margin: 0.8em 0 0.8em 1.5em;
-    color: var(--brown);
+    color: var(--midgrey);
     font-size: 0.9em;
 }
 /* Quotation marks */

core/client/app/styles/patterns/tables.css

@@ -30,7 +30,7 @@ table td,
 }
 
 .table th {
-    color: var(--brown);
+    color: var(--midgrey);
 }
 
 .table caption + thead tr:first-child th,

core/client/app/templates/components/gh-file-upload.hbs

@@ -1,4 +1,4 @@
-<input data-url="upload" class="gh-input btn btn-green" type="file" name="importfile" accept="{{options.acceptEncoding}}">
-<button type="submit" class="btn btn-blue" id="startupload" disabled={{uploadButtonDisabled}} {{action "upload"}}>
+<input data-url="upload" class="gh-input btn-block" type="file" name="importfile" accept="{{options.acceptEncoding}}">
+<button type="submit" class="btn btn-green btn-block" id="startupload" disabled={{uploadButtonDisabled}} {{action "upload"}}>
     {{uploadButtonText}}
 </button>

core/client/app/templates/settings/labs.hbs

@@ -19,8 +19,8 @@
             <div class="form-group">
                 <label>Import</label>
                 {{partial "import-errors"}}
-                {{gh-file-upload id="importfile" uploadButtonText=uploadButtonText}}
-                <p>Import from another Ghost installation. If you import a user, this will replace the current user & log you out.</p>
+                {{gh-file-upload id="importfile" class="flex" uploadButtonText=uploadButtonText}}
+                <p>Import from another Ghost installation. If you import a user, this will replace the current user &amp; log you out.</p>
             </div>
         </fieldset>
     {{/gh-form}}