diff --git a/core/client/app/styles/components/uploader.css b/core/client/app/styles/components/uploader.css index c2016155db..f59fd16f24 100644 --- a/core/client/app/styles/components/uploader.css +++ b/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; } diff --git a/core/client/app/styles/layouts/editor.css b/core/client/app/styles/layouts/editor.css index fbfcf5f287..cff6fdeedc 100644 --- a/core/client/app/styles/layouts/editor.css +++ b/core/client/app/styles/layouts/editor.css @@ -172,7 +172,7 @@ .entry-preview-content .btn, .content-preview-content .btn { - color: var(--grey); + color: #e1e1e1; text-decoration: none; } @@ -180,7 +180,7 @@ .content-preview-content .img-placeholder { position: relative; height: 100px; - border: 5px dashed var(--grey); + border: 5px dashed #e1e1e1; } .entry-preview-content .img-placeholder span, diff --git a/core/client/app/styles/layouts/main.css b/core/client/app/styles/layouts/main.css index 905e9d8f8f..42c0b2da8c 100644 --- a/core/client/app/styles/layouts/main.css +++ b/core/client/app/styles/layouts/main.css @@ -404,7 +404,8 @@ .view-title i { margin: 0 10px; color: #818181; - font-size: 1.4rem; + font-size: 14px; + line-height: 12px; } .view-actions { diff --git a/core/client/app/styles/layouts/settings.css b/core/client/app/styles/layouts/settings.css index 10204b79cd..5529254a41 100644 --- a/core/client/app/styles/layouts/settings.css +++ b/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 { diff --git a/core/client/app/styles/layouts/tags.css b/core/client/app/styles/layouts/tags.css index 329737506f..3019d1ea11 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: var(--midbrown); + color: #e1e1e1; font-size: 13px; } @@ -117,6 +117,6 @@ position: absolute; top: 20px; right: 12px; - color: var(--midbrown); + color: #e1e1e1; font-size: 16px; } diff --git a/core/client/app/styles/layouts/users.css b/core/client/app/styles/layouts/users.css index 0f95b9767b..7c7559c711 100644 --- a/core/client/app/styles/layouts/users.css +++ b/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; } diff --git a/core/client/app/styles/patterns/forms.css b/core/client/app/styles/patterns/forms.css index 2757c77e5c..97b7a4c5aa 100644 --- a/core/client/app/styles/patterns/forms.css +++ b/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, diff --git a/core/client/app/styles/patterns/global.css b/core/client/app/styles/patterns/global.css index c43b48dbf5..540be10bff 100644 --- a/core/client/app/styles/patterns/global.css +++ b/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 */ diff --git a/core/client/app/styles/patterns/tables.css b/core/client/app/styles/patterns/tables.css index 6677a58ead..828391d0ca 100644 --- a/core/client/app/styles/patterns/tables.css +++ b/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, diff --git a/core/client/app/templates/components/gh-file-upload.hbs b/core/client/app/templates/components/gh-file-upload.hbs index 873dc39092..408f340a15 100644 --- a/core/client/app/templates/components/gh-file-upload.hbs +++ b/core/client/app/templates/components/gh-file-upload.hbs @@ -1,4 +1,4 @@ - - + + {{uploadButtonText}} diff --git a/core/client/app/templates/settings/labs.hbs b/core/client/app/templates/settings/labs.hbs index 9ea19d2a8b..a8d06b02c9 100644 --- a/core/client/app/templates/settings/labs.hbs +++ b/core/client/app/templates/settings/labs.hbs @@ -19,8 +19,8 @@ Import {{partial "import-errors"}} - {{gh-file-upload id="importfile" uploadButtonText=uploadButtonText}} - Import from another Ghost installation. If you import a user, this will replace the current user & log you out. + {{gh-file-upload id="importfile" class="flex" uploadButtonText=uploadButtonText}} + Import from another Ghost installation. If you import a user, this will replace the current user & log you out. {{/gh-form}}
Import from another Ghost installation. If you import a user, this will replace the current user & log you out.