diff --git a/ghost/admin/app/controllers/application.js b/ghost/admin/app/controllers/application.js index 90ea7cf2e1..ed79c8db7d 100644 --- a/ghost/admin/app/controllers/application.js +++ b/ghost/admin/app/controllers/application.js @@ -1,7 +1,7 @@ import Ember from 'ember'; var ApplicationController = Ember.Controller.extend({ // jscs: disable - hideNav: Ember.computed.match('currentPath', /(error|signin|signup|setup|forgotten|reset)/), + signedOut: Ember.computed.match('currentPath', /(signin|signup|setup|forgotten|reset)/), // jscs: enable topNotificationCount: 0, diff --git a/ghost/admin/app/html/2.html b/ghost/admin/app/html/2.html new file mode 100644 index 0000000000..e408b7f7b0 --- /dev/null +++ b/ghost/admin/app/html/2.html @@ -0,0 +1,75 @@ + + + + + 2 + + + + + +
+ + + +
+

Just a year ago we launched our **Ghost(Pro)** hosted platform to allow people to easily deploy and run Ghost blogs.

+ +

We’ve come a long way.

+ +

From the very beginning, during the [Kickstarter Campaign](https://www.kickstarter.com/projects/johnonolan/ghost-just-a-blogging-platform), we put forward the idea of a hosted platform for an Open Source project as a means to make it both sustainable and profitable.

+ +

At that point it was really just a theory and a dream. No Open Source project had ever done anything quite like it before.

+ +

**Today, the Ghost Foundation turns over $350,000 and, even more significantly: is profitable.**

+ +

2014 was a pretty incredible year. It’s surreal to look back at just how far we’ve come. 2015 is set to be even bigger, and we’ve got a lot of plans.

+ +

## A Bigger Focus on Transparency

+ +

For the last year we’ve realised that a lot of things we’re passionate about are symptoms of something larger. Ghost is Open Source because we believe in free and open software which is available to everyone to use, hack and redistribute as they see fit. Ghost is not-for-profit because we believe in building an incredible company which is dedicated to its users, rather than creating wealth for its founders.

+ +

We’ve realised the larger umbrella that embodies all of these elements that ties them all together is quite simple: Transparency.

+ +

What we’re really excited about is building a company with integrity that’s completely open about what it does and why.

+ +

This year we’re going to place a much bigger focus on being even more aggressive about the number of things which we open up to the public. We’ve learned a lot from our friends over at [Buffer](http://bufferapp.com) and we’re going to be taking a leaf out of their book in several ways.

+
+ +
+ + diff --git a/ghost/admin/app/index.html b/ghost/admin/app/index.html index b259794ef0..7ded6776d5 100644 --- a/ghost/admin/app/index.html +++ b/ghost/admin/app/index.html @@ -50,6 +50,5 @@ {{content-for 'body-footer'}} - diff --git a/ghost/admin/app/styles/app.scss b/ghost/admin/app/styles/app.scss index ed41f5393d..10c452a2fe 100644 --- a/ghost/admin/app/styles/app.scss +++ b/ghost/admin/app/styles/app.scss @@ -5,6 +5,7 @@ @import "modules/variables"; @import "modules/mixins"; @import "modules/icons"; +@import "modules/icons-new"; @import "modules/animations"; @@ -51,6 +52,7 @@ // Layouts: Groups of Components // -------------------------------------------------- +@import "layouts/main"; @import "layouts/default"; @import "layouts/setup"; @import "layouts/auth"; @@ -61,4 +63,4 @@ @import "layouts/user"; @import "layouts/about"; @import "layouts/tags"; -@import "layouts/error"; \ No newline at end of file +@import "layouts/error"; diff --git a/ghost/admin/app/styles/components/dropdowns.scss b/ghost/admin/app/styles/components/dropdowns.scss index f0428ed031..9ce20c1755 100644 --- a/ghost/admin/app/styles/components/dropdowns.scss +++ b/ghost/admin/app/styles/components/dropdowns.scss @@ -18,6 +18,7 @@ // The dropdown wrapper
.dropdown { position: relative; + z-index: 1000; } // Prevent the focus on the dropdown toggle when closing dropdowns @@ -30,7 +31,6 @@ position: absolute; top: 100%; left: 0; - z-index: 1000; float: left; min-width: 220px; @@ -39,7 +39,7 @@ background-color: #fff; border: darken($lightgrey, 15%) 1px solid; - border-radius: 2px; + border-radius: 4px; box-shadow: rgba(0,0,0,0.175) 0 2px 6px; background-clip: padding-box; @@ -269,4 +269,4 @@ @extend %dropdown-triangle; @extend %dropdown-triangle-bottom; @extend %dropdown-triangle-right; -} \ No newline at end of file +} diff --git a/ghost/admin/app/styles/components/settings-menu.scss b/ghost/admin/app/styles/components/settings-menu.scss index afd7859566..fad80a0a4d 100644 --- a/ghost/admin/app/styles/components/settings-menu.scss +++ b/ghost/admin/app/styles/components/settings-menu.scss @@ -18,13 +18,14 @@ top: 0; right: 0; bottom: 0; + z-index: 500; + width: 350px; + border: #efefef 1px solid; background: $lightestgrey; - width: 100%; - max-width: 350px; overflow: hidden; transition: transform $settings-menu-transition cubic-bezier($settings-menu-bezier); - transform: translate3d(60px, 0px, 0px); + transform: translate3d(350px, 0px, 0px); // This selector ends up being `body.settings-menu-expanded .settings-menu-container` body.settings-menu-expanded & { diff --git a/ghost/admin/app/styles/layouts/content.scss b/ghost/admin/app/styles/layouts/content.scss index c81029eefa..209762b743 100644 --- a/ghost/admin/app/styles/layouts/content.scss +++ b/ghost/admin/app/styles/layouts/content.scss @@ -14,21 +14,6 @@ // ------------------------------------------------------------ -// -// Container -// -------------------------------------------------- - -.content-view-container { - position: relative; - height: 100%; - width: 100%; - - @media (max-width: 900px) { - overflow-x: hidden; - } -} - - // // Show/Hide on mobile // -------------------------------------------------- @@ -105,7 +90,6 @@ right: 0; bottom: 0; left: 0; - padding-top: 40px; overflow: auto; -webkit-overflow-scrolling: touch; } @@ -214,9 +198,8 @@ }//a }//li - li.active { + .active { @media (min-width: 901px) { - border-bottom: lighten($midgrey, 40%) 1px solid; background: lighten($lightbrown, 5%); } } diff --git a/ghost/admin/app/styles/layouts/default.scss b/ghost/admin/app/styles/layouts/default.scss index f42306e251..2c2930b216 100644 --- a/ghost/admin/app/styles/layouts/default.scss +++ b/ghost/admin/app/styles/layouts/default.scss @@ -84,17 +84,13 @@ .page-content { position: absolute; - top: 60px; + top: 0; right: 0; bottom: 0; left: 0; background: #fff; overflow-y: auto; overflow-x: hidden; - - @media (max-width: 900px) { - top: 44px; - } } @@ -155,4 +151,4 @@ width: 44px; height: 44px; color: #fff; -} \ No newline at end of file +} diff --git a/ghost/admin/app/styles/layouts/editor.scss b/ghost/admin/app/styles/layouts/editor.scss index fa6c76cc52..88e8975c17 100644 --- a/ghost/admin/app/styles/layouts/editor.scss +++ b/ghost/admin/app/styles/layouts/editor.scss @@ -22,7 +22,7 @@ .entry-container .entry-title { height: 60px; - padding: 0 20px; + padding: 0; position: relative; input { @@ -31,9 +31,10 @@ border: 0; margin: 0; padding: 0; - font-size: 3.6rem; + font-size: 3.2rem; font-weight: bold; letter-spacing: -1px; + text-indent: 20px; background: transparent; &:focus { @@ -55,11 +56,6 @@ } } - .entry-container { - position: relative; - height: 100%; - } - // The two content panel wrappers, positioned left/right .entry-markdown { left: 0; diff --git a/ghost/admin/app/styles/layouts/main.scss b/ghost/admin/app/styles/layouts/main.scss new file mode 100644 index 0000000000..086ca4d874 --- /dev/null +++ b/ghost/admin/app/styles/layouts/main.scss @@ -0,0 +1,169 @@ + + +// Layout +.gh-viewport { + display: flex; + height: 100vh; + overflow: hidden; +} + +.gh-nav { + display: flex; + flex-direction: column; + flex: 0 0 220px; + border-right: #E1E1E1 1px solid; + background: #F6F6F6; +} + +.gh-main { + position: relative; + flex-grow: 1; + overflow-y: auto; +} + +//GH-NAV + +.gh-nav-menu { + flex-shrink: 0; + display: flex; + align-items: center; + padding: 15px; + + i { + height: 11px; + width: 11px; + margin-right: 8px; + font-size: 11px; + line-height: 11px; + } +} +.gh-nav-menu:hover { cursor: pointer; } + +.gh-nav-menu-icon { + flex-shrink: 0; + margin-right: 10px; + width: 34px; + height: 34px; + background-size: 34px; + background-color: #222; + border-radius: 4px; +} + +.gh-nav-menu-details { + flex-grow: 1; + padding-right: 10px; +} + +.gh-nav-menu-details-blog { + margin-bottom: 1px; + font-size: 1.5rem; + line-height: 1.3em; + font-weight: 600; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} + +.gh-nav-menu-details-user { + font-size: 1.2rem; + line-height: 1.2em; + color: $midgrey; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} + +.gh-nav-body { + flex-grow: 1; + overflow-y: auto; +} + +.gh-nav-search { + position: relative; + margin: 0 15px 10px; +} + +.gh-nav-search-input { + padding: 5px 8px; + border-radius: 4px; + font-size: 1.3rem; +} + +.gh-nav-search-button { + display: flex; + align-items: center; + position: absolute; + top: 0; + right: 0; + bottom: 0; + padding: 0 6px 0 5px; + + i { + width: 16px; + height: 16px; + font-size: 13px; + color: $midgrey; + transform: rotate(90deg); + transition: color 0.2s ease; + } + + &:hover i { + color: $darkgrey; + } +} + +.gh-nav-list { + list-style: none; + margin: 0; + padding: 0 15px 0 0; + font-size: 1.3rem; + line-height: 1.5em; +} + +.gh-nav-list-h { + margin-top: 15px; + padding: 5px 10px 5px 15px; + text-transform: uppercase; + letter-spacing: 1px; + color: #828282; + font-size: 1.2rem; + line-height: 1.1em; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} + +.gh-nav-list a { + display: flex; + align-items: center; + padding: 5px 10px 5px 15px; + color: $darkgrey; + border-radius: 0 5px 5px 0; + transition: none; +} + +.gh-nav-list .active { + color: #fff; + background: lighten($blue, 10%); +} + +.gh-nav-list a:not(.active):hover { + color: $darkgrey; + background: lighten($blue, 30%); +} + +.gh-nav-list i { + width: 15px; + height: 15px; + margin-right: 8px; + font-size: 15px; + text-align: center; +} + +.gh-nav-footer { + flex-shrink: 0; + align-items: center; + height: 40px; + padding: 0 20px; + border-top: #E1E1E1 1px solid; +} diff --git a/ghost/admin/app/styles/layouts/settings.scss b/ghost/admin/app/styles/layouts/settings.scss index 2eda755427..2df1aa3e19 100644 --- a/ghost/admin/app/styles/layouts/settings.scss +++ b/ghost/admin/app/styles/layouts/settings.scss @@ -147,21 +147,6 @@ // The main content panel on the right .settings-content { - @media (max-width: 900px) { - &.fade-in { - animation: none; - } - } - - @media (min-width: 901px) { - position: absolute; - top: 0; - right: 0; - left: 25%; - bottom: 0; - overflow: auto; - -webkit-overflow-scrolling: touch; - } .settings-general img { max-width: 100%; diff --git a/ghost/admin/app/styles/modules/icons-new.scss b/ghost/admin/app/styles/modules/icons-new.scss new file mode 100755 index 0000000000..2d4aba1959 --- /dev/null +++ b/ghost/admin/app/styles/modules/icons-new.scss @@ -0,0 +1,95 @@ +// ------------------------------------------------------------ +// Icons +// ------------------------------------------------------------ + + +// +// Font-face rule +// -------------------------------------------------- + +@font-face { + font-family: "ghosticons"; + src:url("fonts/ghosticons.eot"); + src:url("fonts/ghosticons.eot?#iefix") format("embedded-opentype"), + url("fonts/ghosticons.woff") format("woff"), + url("fonts/ghosticons.ttf") format("truetype"), + url("fonts/ghosticons.svg#ghosticons") format("svg"); + font-weight: normal; + font-style: normal; + +} + +[data-icon]:before { + font-family: "ghosticons" !important; + content: attr(data-icon); + font-style: normal !important; + font-weight: normal !important; + font-variant: normal !important; + text-transform: none !important; + speak: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +[class^="icon-"]:before, +[class*=" icon-"]:before { + font-family: "ghosticons" !important; + font-style: normal !important; + font-weight: normal !important; + font-variant: normal !important; + text-transform: none !important; + speak: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-user:before { + content: "\e000"; +} +.icon-search:before { + content: "\e001"; +} +.icon-design:before { + content: "\e003"; +} +.icon-content:before { + content: "\e004"; +} +.icon-x:before { + content: "\e005"; +} +.icon-add:before { + content: "\e006"; +} +.icon-apps:before { + content: "\e007"; +} +.icon-settings:before { + content: "\e008"; +} +.icon-front-end:before { + content: "\e00a"; +} +.icon-dash:before { + content: "\e00b"; +} +.icon-tag:before { + content: "\e009"; +} +.icon-compass:before { + content: "\e002"; +} +.icon-code:before { + content: "\e00c"; +} +.icon-team:before { + content: "\e00d"; +} +.icon-idea:before { + content: "\e00e"; +} +.icon-arrow:before { + content: "\e00f"; +} diff --git a/ghost/admin/app/styles/patterns/forms.scss b/ghost/admin/app/styles/patterns/forms.scss index a8399aadf2..d26e7afcf5 100644 --- a/ghost/admin/app/styles/patterns/forms.scss +++ b/ghost/admin/app/styles/patterns/forms.scss @@ -170,16 +170,7 @@ legend { // Inputs, selects, and textareas // -------------------------------------------------- -.input, -input[type="email"], -input[type="number"], -input[type="password"], -input[type="search"], -input[type="tel"], -input[type="text"], -input[type="url"], -input[type="date"], -textarea, +.gh-input, .gh-select, select { display: block; @@ -362,4 +353,4 @@ textarea { border-color: $brown; } } -} \ No newline at end of file +} diff --git a/ghost/admin/app/templates/-nav-menu.hbs b/ghost/admin/app/templates/-nav-menu.hbs new file mode 100644 index 0000000000..3a7887c5e0 --- /dev/null +++ b/ghost/admin/app/templates/-nav-menu.hbs @@ -0,0 +1,45 @@ + diff --git a/ghost/admin/app/templates/application.hbs b/ghost/admin/app/templates/application.hbs index a74e2694e5..9a4f262cad 100644 --- a/ghost/admin/app/templates/application.hbs +++ b/ghost/admin/app/templates/application.hbs @@ -1,16 +1,18 @@ +
Skip to main content -{{#unless hideNav}} - {{partial "navbar"}} +{{#unless signedOut}} + {{partial "nav-menu"}} {{/unless}} {{gh-notifications location="top" notify="topNotificationChange"}} -
+
{{outlet}} {{gh-notifications location="bottom"}}
{{outlet "modal"}} - {{outlet "settings-menu"}} + +
{{!gh-viewport}} diff --git a/ghost/admin/app/templates/components/gh-file-upload.hbs b/ghost/admin/app/templates/components/gh-file-upload.hbs index 2cf8029731..873dc39092 100644 --- a/ghost/admin/app/templates/components/gh-file-upload.hbs +++ b/ghost/admin/app/templates/components/gh-file-upload.hbs @@ -1,4 +1,4 @@ - + diff --git a/ghost/admin/app/templates/components/gh-navitem.hbs b/ghost/admin/app/templates/components/gh-navitem.hbs index 0a437fb5d9..4ecdc17bf3 100644 --- a/ghost/admin/app/templates/components/gh-navitem.hbs +++ b/ghost/admin/app/templates/components/gh-navitem.hbs @@ -5,10 +5,10 @@ {{/unless}}
- {{gh-trim-focus-input focus=navItem.last placeholder="Label" value=navItem.label}} + {{gh-trim-focus-input class="gh-input" focus=navItem.last placeholder="Label" value=navItem.label}} - {{gh-navitem-url-input baseUrl=baseUrl url=navItem.url last=navItem.last change="updateUrl"}} + {{gh-navitem-url-input class="gh-input" baseUrl=baseUrl url=navItem.url last=navItem.last change="updateUrl"}}
diff --git a/ghost/admin/app/templates/components/gh-uploader.hbs b/ghost/admin/app/templates/components/gh-uploader.hbs index 5b9940e5e0..6cee284cad 100644 --- a/ghost/admin/app/templates/components/gh-uploader.hbs +++ b/ghost/admin/app/templates/components/gh-uploader.hbs @@ -3,4 +3,4 @@
{{description}}
- + diff --git a/ghost/admin/app/templates/editor/edit.hbs b/ghost/admin/app/templates/editor/edit.hbs index 9c12f432a4..1ef9e30912 100644 --- a/ghost/admin/app/templates/editor/edit.hbs +++ b/ghost/admin/app/templates/editor/edit.hbs @@ -6,7 +6,7 @@
- {{gh-trim-focus-input type="text" id="entry-title" placeholder="Your Post Title" value=model.titleScratch + {{gh-trim-focus-input type="text" id="entry-title" class="gh-input" placeholder="Your Post Title" value=model.titleScratch tabindex="1" focus=shouldFocusTitle}}
diff --git a/ghost/admin/app/templates/forgotten.hbs b/ghost/admin/app/templates/forgotten.hbs index 4aa6eacb90..0e8b40f20f 100644 --- a/ghost/admin/app/templates/forgotten.hbs +++ b/ghost/admin/app/templates/forgotten.hbs @@ -1,7 +1,7 @@
diff --git a/ghost/admin/app/templates/modals/signin.hbs b/ghost/admin/app/templates/modals/signin.hbs index 5d4ec1f87c..e33ce0124c 100644 --- a/ghost/admin/app/templates/modals/signin.hbs +++ b/ghost/admin/app/templates/modals/signin.hbs @@ -3,7 +3,7 @@
- {{input class="password" type="password" placeholder="Password" name="password" value=password}} + {{input class="gh-input password" type="password" placeholder="Password" name="password" value=password}}
diff --git a/ghost/admin/app/templates/post-settings-menu.hbs b/ghost/admin/app/templates/post-settings-menu.hbs index 17f8583113..5188c47246 100644 --- a/ghost/admin/app/templates/post-settings-menu.hbs +++ b/ghost/admin/app/templates/post-settings-menu.hbs @@ -22,7 +22,7 @@ {{/if}} - {{gh-input class="post-setting-slug" id="url" value=slugValue name="post-setting-slug" focus-out="updateSlug" selectOnClick="true" stopEnterKeyDownPropagation="true"}} + {{gh-input class="gh-input post-setting-slug" id="url" value=slugValue name="post-setting-slug" focus-out="updateSlug" selectOnClick="true" stopEnterKeyDownPropagation="true"}} {{gh-url-preview slug=slugValue tagName="p" classNames="description"}}
@@ -30,7 +30,7 @@
- {{gh-input class="post-setting-date" id="post-setting-date" value=publishedAtValue name="post-setting-date" focus-out="setPublishedAt" stopEnterKeyDownPropagation="true"}} + {{gh-input class="gh-input post-setting-date" id="post-setting-date" value=publishedAtValue name="post-setting-date" focus-out="setPublishedAt" stopEnterKeyDownPropagation="true"}}
@@ -62,13 +62,13 @@
@@ -90,13 +90,13 @@
- {{gh-input class="post-setting-meta-title" id="meta-title" value=metaTitleScratch name="post-setting-meta-title" focus-out="setMetaTitle" stopEnterKeyDownPropagation="true"}} + {{gh-input class="gh-input post-setting-meta-title" id="meta-title" value=metaTitleScratch name="post-setting-meta-title" focus-out="setMetaTitle" stopEnterKeyDownPropagation="true"}}

Recommended: 70 characters. You’ve used {{gh-count-down-characters metaTitleScratch 70}}

- {{gh-textarea class="post-setting-meta-description" id="meta-description" value=metaDescriptionScratch name="post-setting-meta-description" focus-out="setMetaDescription" stopEnterKeyDownPropagation="true"}} + {{gh-textarea class="gh-input post-setting-meta-description" id="meta-description" value=metaDescriptionScratch name="post-setting-meta-description" focus-out="setMetaDescription" stopEnterKeyDownPropagation="true"}}

Recommended: 156 characters. You’ve used {{gh-count-down-characters metaDescriptionScratch 156}}

diff --git a/ghost/admin/app/templates/posts.hbs b/ghost/admin/app/templates/posts.hbs index 5366d8a612..01041824e1 100644 --- a/ghost/admin/app/templates/posts.hbs +++ b/ghost/admin/app/templates/posts.hbs @@ -1,16 +1,5 @@ -
- -

Content

-
-
-
-
- All Posts -
- {{#link-to "editor.new" class="btn btn-green" title="New Post"}}{{/link-to}} -
{{#view "paginated-scroll-box" tagName="section" classNames="content-list-content js-content-scrollbox"}}
    {{#each post in controller itemController="posts/post" itemView="post-item-view" itemTagName="li"}} diff --git a/ghost/admin/app/templates/reset.hbs b/ghost/admin/app/templates/reset.hbs index 41011a2cd4..49f3d43767 100644 --- a/ghost/admin/app/templates/reset.hbs +++ b/ghost/admin/app/templates/reset.hbs @@ -1,10 +1,10 @@
    - {{input value=newPassword class="password" type="password" placeholder="Password" name="newpassword" autofocus="autofocus" }} + {{input value=newPassword class="gh-input password" type="password" placeholder="Password" name="newpassword" autofocus="autofocus" }}
    - {{input value=ne2Password class="password" type="password" placeholder="Confirm Password" name="ne2password" }} + {{input value=ne2Password class="gh-input password" type="password" placeholder="Confirm Password" name="ne2password" }}
    diff --git a/ghost/admin/app/templates/settings.hbs b/ghost/admin/app/templates/settings.hbs index 9cf2c1feb4..c24cd68950 100644 --- a/ghost/admin/app/templates/settings.hbs +++ b/ghost/admin/app/templates/settings.hbs @@ -1,45 +1 @@ -
    - -

    Settings

    -
    - -
    - - - {{outlet}} -
    +{{outlet}} diff --git a/ghost/admin/app/templates/settings/code-injection.hbs b/ghost/admin/app/templates/settings/code-injection.hbs index b7e4411077..b77c8b3a84 100644 --- a/ghost/admin/app/templates/settings/code-injection.hbs +++ b/ghost/admin/app/templates/settings/code-injection.hbs @@ -16,13 +16,13 @@

    Code here will be injected into the \{{ghost_head}} tag on every page of your blog

    - {{gh-cm-editor id="ghost-head" name="codeInjection[ghost_head]" class="settings-code-editor" type="text" value=model.ghost_head}} + {{gh-cm-editor id="ghost-head" class="gh-input" name="codeInjection[ghost_head]" class="settings-code-editor" type="text" value=model.ghost_head}}

    Code here will be injected into the \{{ghost_foot}} tag on every page of your blog

    - {{gh-cm-editor id="ghost-foot" name="codeInjection[ghost_foot]" class="settings-code-editor" type="text" value=model.ghost_foot}} + {{gh-cm-editor id="ghost-foot" class="gh-input" name="codeInjection[ghost_foot]" class="settings-code-editor" type="text" value=model.ghost_foot}}
    diff --git a/ghost/admin/app/templates/settings/general.hbs b/ghost/admin/app/templates/settings/general.hbs index a5e2f76655..f38e5da5e6 100644 --- a/ghost/admin/app/templates/settings/general.hbs +++ b/ghost/admin/app/templates/settings/general.hbs @@ -12,13 +12,13 @@
    - {{input id="blog-title" name="general[title]" type="text" value=model.title}} + {{input id="blog-title" class="gh-input" name="general[title]" type="text" value=model.title}}

    The name of your blog

    - {{textarea id="blog-description" name="general[description]" value=model.description}} + {{textarea id="blog-description" class="gh-input" name="general[description]" value=model.description}}

    Describe what your blog is about {{gh-count-characters model.description}} @@ -50,21 +50,21 @@

    - {{input id="email-address" name="general[email-address]" type="email" value=model.email autocapitalize="off" autocorrect="off"}} + {{input id="email-address" class="gh-input" name="general[email-address]" type="email" value=model.email autocapitalize="off" autocorrect="off"}}

    Address to use for admin notifications

    {{! `pattern` brings up numeric keypad allowing any number of digits}} - {{input id="postsPerPage" name="general[postsPerPage]" focus-out="checkPostsPerPage" value=model.postsPerPage min="1" max="1000" type="number" pattern="[0-9]*"}} + {{input id="postsPerPage" class="gh-input" name="general[postsPerPage]" focus-out="checkPostsPerPage" value=model.postsPerPage min="1" max="1000" type="number" pattern="[0-9]*"}}

    How many posts should be displayed on each page

    diff --git a/ghost/admin/app/templates/settings/tags/settings-menu.hbs b/ghost/admin/app/templates/settings/tags/settings-menu.hbs index 170ef89ba3..0b40c7c222 100644 --- a/ghost/admin/app/templates/settings/tags/settings-menu.hbs +++ b/ghost/admin/app/templates/settings/tags/settings-menu.hbs @@ -12,18 +12,18 @@
    - {{gh-input type="text" value=activeTagNameScratch focus-out="saveActiveTagName"}} + {{gh-input class="gh-input" type="text" value=activeTagNameScratch focus-out="saveActiveTagName"}}
    - {{gh-input type="text" value=activeTagSlugScratch focus-out="saveActiveTagSlug"}} + {{gh-input class="gh-input" type="text" value=activeTagSlugScratch focus-out="saveActiveTagSlug"}} {{gh-url-preview prefix="tag" slug=activeTagSlugScratch tagName="p" classNames="description"}}
    - {{gh-textarea value=activeTagDescriptionScratch focus-out="saveActiveTagDescription"}} + {{gh-textarea class="gh-input" value=activeTagDescriptionScratch focus-out="saveActiveTagDescription"}}
      @@ -53,13 +53,13 @@
      - {{gh-input type="text" value=activeTagMetaTitleScratch focus-out="saveActiveTagMetaTitle"}} + {{gh-input class="gh-input" type="text" value=activeTagMetaTitleScratch focus-out="saveActiveTagMetaTitle"}}

      Recommended: 70 characters. You’ve used {{gh-count-down-characters activeTagMetaTitleScratch 70}}

      - {{gh-textarea value=activeTagMetaDescriptionScratch focus-out="saveActiveTagMetaDescription"}} + {{gh-textarea class="gh-input" value=activeTagMetaDescriptionScratch focus-out="saveActiveTagMetaDescription"}}

      Recommended: 156 characters. You’ve used {{gh-count-down-characters activeTagMetaDescriptionScratch 156}}

      diff --git a/ghost/admin/app/templates/settings/users/user.hbs b/ghost/admin/app/templates/settings/users/user.hbs index 28ee40fa40..116e4e79ad 100644 --- a/ghost/admin/app/templates/settings/users/user.hbs +++ b/ghost/admin/app/templates/settings/users/user.hbs @@ -41,7 +41,7 @@
      - {{input value=user.name id="user-name" class="user-name" placeholder="Full Name" autocorrect="off"}} + {{input value=user.name id="user-name" class="gh-input user-name" placeholder="Full Name" autocorrect="off"}}

      Use your real name so people can recognise you

      @@ -51,13 +51,13 @@
      - {{gh-input class="user-name" id="user-slug" value=slugValue name="user" focus-out="updateSlug" placeholder="Slug" selectOnClick="true" autocorrect="off"}} + {{gh-input class="gh-input user-name" id="user-slug" value=slugValue name="user" focus-out="updateSlug" placeholder="Slug" selectOnClick="true" autocorrect="off"}}

      {{gh-blog-url}}/author/{{slugValue}}

      - {{input type="email" value=user.email id="user-email" placeholder="Email Address" autocapitalize="off" autocorrect="off" autocomplete="off"}} + {{input type="email" value=user.email id="user-email" class="gh-input" placeholder="Email Address" autocapitalize="off" autocorrect="off" autocomplete="off"}}

      Used for notifications

      {{#if view.rolesDropdownIsVisible}} @@ -72,19 +72,19 @@ {{/if}}
      - {{input type="text" value=user.location id="user-location"}} + {{input type="text" value=user.location id="user-location" class="gh-input"}}

      Where in the world do you live?

      - {{input type="url" value=user.website id="user-website" autocapitalize="off" autocorrect="off" autocomplete="off"}} + {{input type="url" value=user.website id="user-website" class="gh-input" autocapitalize="off" autocorrect="off" autocomplete="off"}}

      Have a website or blog other than this one? Link it!

      - {{textarea id="user-bio" value=user.bio}} + {{textarea id="user-bio" class="gh-input" value=user.bio}}

      Write about you, in 200 characters or less. {{gh-count-characters user.bio}} @@ -99,18 +99,18 @@ {{#unless view.isNotOwnProfile}}

      - {{input value=user.password type="password" id="user-password-old"}} + {{input value=user.password type="password" id="user-password-old" class="gh-input"}}
      {{/unless}}
      - {{input value=user.newPassword type="password" id="user-password-new"}} + {{input value=user.newPassword type="password" id="user-password-new" class="gh-input"}}
      - {{input value=user.ne2Password type="password" id="user-new-password-verification"}} + {{input value=user.ne2Password type="password" id="user-new-password-verification" class="gh-input"}}
      diff --git a/ghost/admin/app/templates/signin.hbs b/ghost/admin/app/templates/signin.hbs index 1d77a7cd33..368f351730 100644 --- a/ghost/admin/app/templates/signin.hbs +++ b/ghost/admin/app/templates/signin.hbs @@ -2,12 +2,12 @@
      - {{input class="password" type="password" placeholder="Password" name="password" value=model.password}} + {{input class="gh-input password" type="password" placeholder="Password" name="password" value=model.password}}
      diff --git a/ghost/admin/app/templates/signup.hbs b/ghost/admin/app/templates/signup.hbs index d6fd2c7590..680e93c622 100644 --- a/ghost/admin/app/templates/signup.hbs +++ b/ghost/admin/app/templates/signup.hbs @@ -12,17 +12,17 @@
      - {{input type="email" name="email" autocorrect="off" value=model.email }} + {{input class="gh-input" type="email" name="email" autocorrect="off" value=model.email }}

      Used for important notifications

      - {{gh-trim-focus-input type="text" name="name" autofocus="autofocus" autocorrect="off" value=model.name }} + {{gh-trim-focus-input class="gh-input" type="text" name="name" autofocus="autofocus" autocorrect="off" value=model.name }}

      The name that you will sign your posts with

      - {{input type="password" name="password" autofocus="autofocus" autocorrect="off" value=model.password }} + {{input class="gh-input" type="password" name="password" autofocus="autofocus" autocorrect="off" value=model.password }}

      Must be at least 8 characters