diff --git a/core/client/app/assets/lib/uploader.js b/core/client/app/assets/lib/uploader.js index c5e13b2b48..5809494da5 100644 --- a/core/client/app/assets/lib/uploader.js +++ b/core/client/app/assets/lib/uploader.js @@ -6,7 +6,7 @@ var UploadUi, UploadUi = function ($dropzone, settings) { var $url = '
', - $cancel = '', + $cancel = '', $progress = $('
', { class: 'js-upload-progress progress progress-success active', role: 'progressbar', diff --git a/core/client/app/html/scrollbars.html b/core/client/app/html/scrollbars.html index 0f88e4967f..26a2031e82 100644 --- a/core/client/app/html/scrollbars.html +++ b/core/client/app/html/scrollbars.html @@ -70,7 +70,7 @@ - +
@@ -109,7 +109,7 @@ Test User
- Edit + Edit
@@ -134,7 +134,7 @@

Perspiciatis error ad odit earum excepturi, cumque, mollitia molestias blanditiis impedit consectetur commodi autem architecto nihil, cupiditate nobis laborum vero voluptatibus. Sit repellat autem dicta, mollitia, cum aliquid minima provident, officia quidem molestias est. Esse iusto optio saepe, dolores debitis culpa dolor quis praesentium consectetur. Quae iusto, fugiat labore! Placeat?

- +
@@ -146,7 +146,7 @@ - + - + diff --git a/core/client/app/styles/app.scss b/core/client/app/styles/app.scss index 0840fde049..5bfdcacfab 100644 --- a/core/client/app/styles/app.scss +++ b/core/client/app/styles/app.scss @@ -5,7 +5,6 @@ @import "modules/variables"; @import "modules/mixins"; @import "modules/icons"; -@import "modules/icons-new"; @import "modules/animations"; @@ -52,7 +51,6 @@ // -------------------------------------------------- @import "layouts/main"; -@import "layouts/default"; @import "layouts/setup"; @import "layouts/auth"; @import "layouts/content"; diff --git a/core/client/app/styles/components/uploader.scss b/core/client/app/styles/components/uploader.scss index 65fca30a7f..f58fee6405 100644 --- a/core/client/app/styles/components/uploader.scss +++ b/core/client/app/styles/components/uploader.scss @@ -194,7 +194,6 @@ } .image-cancel { - @include icon($i-trash, 11px); position: absolute; top: 10px; right: 10px; diff --git a/core/client/app/styles/layouts/about.scss b/core/client/app/styles/layouts/about.scss index 3162838f8a..441bcaea06 100644 --- a/core/client/app/styles/layouts/about.scss +++ b/core/client/app/styles/layouts/about.scss @@ -41,16 +41,7 @@ } .ghost_logo { - position: relative; - left: 3px; - @include icon($i-ghost, 1.7rem, $midgrey) { - position: relative; - top: -6px; - }; - @include icon-after($i-ghost-logo, 3.2rem, $darkgrey) { - position: relative; - left: -5px; - }; + content: "Ghost"; } .version { diff --git a/core/client/app/styles/layouts/content.scss b/core/client/app/styles/layouts/content.scss index cca05fba01..37173d771c 100644 --- a/core/client/app/styles/layouts/content.scss +++ b/core/client/app/styles/layouts/content.scss @@ -60,30 +60,6 @@ border: none; } - .content-filter { - position: relative; - z-index: 300; - - > a { - padding: 5px; - margin-left: -5px; - } - - .menu-drop { - display: block; - } - } - - .btn-green { - @include icon($i-add); - position: absolute; - top: 9px; - right: 20px; - z-index: 700; - padding: 2px 4px 3px 5px; - color: #fff !important; // getting overridden by floatingheader - } - .content-list-content { position: absolute; top: 0; @@ -144,15 +120,6 @@ } } - .featured { - @include icon($i-featured, 11px) { - vertical-align: 7%; - position: absolute; - bottom: 25px; - right: 25px; - }; - } - ol { list-style: none; padding: 0; @@ -171,13 +138,6 @@ padding: 19px 20px 22px 24px; color: rgba(0,0,0,0.5); - @include icon-after($i-chevron) { - position: absolute; - top: 50%; - margin-top: -6px; - right: 15px; - } - &:hover { text-decoration: none; } @@ -228,14 +188,12 @@ } .unfeatured { - @include icon($i-unfeatured, 14px); vertical-align: -6%; margin: 0 7px 0 -5px; padding: 3px; } .featured { - @include icon($i-featured, 14px); vertical-align: -6%; margin: 0 7px 0 -5px; padding: 3px; @@ -286,10 +244,6 @@ right: -3px; } - .post-edit { - @include icon($i-edit, 14px); - } - img { width:100%; height:auto; diff --git a/core/client/app/styles/layouts/default.scss b/core/client/app/styles/layouts/default.scss deleted file mode 100644 index 2c2930b216..0000000000 --- a/core/client/app/styles/layouts/default.scss +++ /dev/null @@ -1,154 +0,0 @@ -// ------------------------------------------------------------ -// Default Styles -// -// Styles for containers and elements used throughout Ghost -// -// * Global Container -// * Main Layout -// * Content Panel -// * The header bar -// ------------------------------------------------------------ - - -// -// Global Container -// -------------------------------------------------- -// Absolutely everything goes in here. It helps -// reliably position other elements, - -#container { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - overflow: hidden; -} - - -// -// Main Layout -// -------------------------------------------------- -// The
content wrapper - -.viewport { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - overflow: hidden; - z-index: 500; // Above the .global-nav when collapsed - transition: transform $settings-menu-transition cubic-bezier($settings-menu-bezier); - - @media (max-width: 900px) { - transition: transform 0.4s cubic-bezier($settings-menu-bezier); - } - - // Compiles to `body.settings-menu-expanded .viewport` - body.global-nav-expanded & { - transform: translate3d(260px, 0px, 0px); - } - - // Compiles to `body.settings-menu-expanded .viewport` - body.settings-menu-expanded & { - @media (max-width: 350px) { - transform: translate3d(-100%, 0px, 0px); - } - - @media (min-width: 351px) { - transform: translate3d(-350px, 0px, 0px); - - &:before { - content: ''; - position: absolute; - top: 0; - right: 0; - bottom: 0; - z-index: 1000; - width: 1px; - background: #EDECE4; - } - } - } -}//.viewport - - -// -// Content Panel -// -------------------------------------------------- -// We can't use position:fixed on .page-header because it would -// break the mobile menu. So we create an overflow-auto content -// area which scrolls just underneath the header, making it look -// like the header is position:fixed. - -.page-content { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: #fff; - overflow-y: auto; - overflow-x: hidden; -} - - -// -// The header bar -// -------------------------------------------------- -// Visible below 900px, as the nav isn't covering this. - -.page-header { - position: relative; - height: 44px; - line-height: 44px; - text-align: center; - color: #fff; - background: $darkgrey; - overflow: hidden; - - @media (min-width: 900px) { - height: 60px; - line-height: 60px; - } - -} - -// Centered page heading -.page-title { - display: block; - height: 44px; - line-height: 44px; - margin: 0; - padding: 0 15%; - color: #fff; - font-size: 1.8rem; - font-weight: normal; - letter-spacing: 0; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - - @media (min-width: 900px) { - height: 60px; - line-height: 60px; - } -} - -// The burger to expand .global-nav menu -.menu-button { - @include icon($i-menu, 18px) { - position: absolute; - top: 50%; - left: 12px; - transform: translateY(-50%); - } - display: block; - position: absolute; - top: 0; - left: 0; - width: 44px; - height: 44px; - color: #fff; -} diff --git a/core/client/app/styles/layouts/editor.scss b/core/client/app/styles/layouts/editor.scss index 469121906f..8294f7a86e 100644 --- a/core/client/app/styles/layouts/editor.scss +++ b/core/client/app/styles/layouts/editor.scss @@ -20,7 +20,7 @@ // Post Title // -------------------------------------------------- -.entry-container .entry-title { +.entry-title { height: 60px; padding: 0; position: relative; @@ -291,16 +291,8 @@ // -------------------------------------------------- .markdown-help { - position: relative; - top: -3px; - right: -5px; - @include icon($i-markdown, '16px', lighten($brown, 15%)); float: right; padding: 5px; - - &:hover { - @include icon($i-markdown, '', $brown); - } } @@ -487,10 +479,6 @@ body.zen { } .tag { - @include icon-after($i-x, 8px, #fff) { - margin-left: 3px; - vetical-align: -10%; - } display: inline; margin-right: 3px; padding: 2px 5px; @@ -505,6 +493,10 @@ body.zen { &:hover { cursor: pointer; } + + i { + font-size: 0.7rem; + } } }//#entry-tags @@ -647,7 +639,6 @@ body.zen { } .post-settings { - @include icon($i-settings, 14px); display: inline-block; padding: 8px 10px; color: $midgrey; diff --git a/core/client/app/styles/modules/icons-new.scss b/core/client/app/styles/modules/icons-new.scss deleted file mode 100755 index 2d4aba1959..0000000000 --- a/core/client/app/styles/modules/icons-new.scss +++ /dev/null @@ -1,95 +0,0 @@ -// ------------------------------------------------------------ -// 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/core/client/app/styles/modules/icons.scss b/core/client/app/styles/modules/icons.scss index 37b8995df3..f0d225508c 100755 --- a/core/client/app/styles/modules/icons.scss +++ b/core/client/app/styles/modules/icons.scss @@ -1,435 +1,215 @@ // ------------------------------------------------------------ // Icons -// -// Defined the @font-face rule for the icon font, as well as -// the base styles for when using icons. -// Includes the mixins for adding icons directly and the -// variables for each icon. -// -// * Font-face rule -// * Base styled for icons -// * Base styled for icons -// * The Icon (before) Mixin -// * The Icon (after) Mixin -// * Icon Variables -// * Icon Class Styles -// * Icon Classes -// * Div-based Icon Classes // ------------------------------------------------------------ // // Font-face rule -// Icon-font is generated by http://icomoon.co -// Pictos, by Drew Wilson - http://pictos.cc/ // -------------------------------------------------- @font-face { - font-family: 'GhostIcons'; - src:url('fonts/icons.woff?v=0.1') format('woff'); // Increment the ?v number every time the font files are regenerated - font-weight: normal; - font-style: normal; + 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; + } - -// -// Base styled for icons -// -------------------------------------------------- - -%icon-base { - font-family: "GhostIcons"; - font-weight: normal; - font-style: normal; - vertical-align: -3%; - text-transform:none; - speak: none; - line-height: 1; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; +[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; } - -// -// The Icon (before) Mixin -// -------------------------------------------------- - -@mixin icon($char, $size: '', $color: '') { - &:before { - @extend %icon-base; - - content: '#{$char}'; - @if $size != '' { - font-size: $size; - } - @if $color != '' { - color: $color; - } - @content; - } - - &:hover { - text-decoration:none; - } +[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; } -// -// The Icon (after) Mixin -// -------------------------------------------------- - -@mixin icon-after($char, $size: '', $color: '') { - &:after { - @extend %icon-base; - - content: '#{$char}'; - @if $size != '' { - font-size: $size; - } - @if $color != '' { - color: $color; - } - @content; - } - - &:hover { - text-decoration:none; - } -} - - -// -// Icon Variables -// -------------------------------------------------- -// For accessibility, icon characters in the icon font are stored in Unicode's -// Private Use Area characters. This means that screen readers won't attempt to -// read them out loud. -// - - -$i-add: \f632; -$i-app: \f60b; -$i-appearance: \f621; -$i-archive: \f61f; -$i-atom: \f63e; -$i-book: \f642; -$i-calendar: \f61e; -$i-camera: \f62a; -$i-check: \f633; -$i-chevron-down: \f601; -$i-chevron-left: \f643; -$i-chevron: \f61d; -$i-clock: \f628; -$i-close: \f61c; -$i-code: \f63d; -$i-comments: \f61b; -$i-compass: \f63f; -$i-content: \f62d; -$i-edit: \f60f; -$i-error: \f61a; -$i-external: \f619; -$i-featured: \f626; -$i-fullscreen: \f617; -$i-ghost-logo: \f644; -$i-ghost: \f600; -$i-grid: \f616; -$i-home: \f615; -$i-image: \f611; -$i-info: \f614; -$i-lightning: \f63c; -$i-link: \f635; -$i-list: \f613; -$i-lock: \f62c; -$i-mail: \f612; -$i-markdown: \f640; -$i-menu: \f605; -$i-mobile: \f610; -$i-notification: \f631; -$i-pacman: \f60e; -$i-pc: \f60d; -$i-pin: \f60c; -$i-power: \f62b; -$i-preview: \f60a; -$i-question: \f618; -$i-reply: \f624; -$i-repost: \f636; -$i-rss: \f609; -$i-search-left: \f608; -$i-search: \f607; -$i-services: \f620; -$i-settings: \f606; -$i-settings2: \f629; -$i-stats: \f625; -$i-success: \f630; -$i-support: \f62f; -$i-tablet: \f604; -$i-tag: \f603; -$i-trash: \f623; -$i-twitter: \f641; -$i-unfeatured: \f627; -$i-user: \f62e; -$i-users: \f602; -$i-video: \f622; -$i-weather-cloudy: \f63b; -$i-weather-partial: \f639; -$i-weather-rain: \f637; -$i-weather-snow: \f63a; -$i-weather-sun: \f638; -$i-x: \f634; - - -// -// Icon Class Styles -// -------------------------------------------------- - -[class*=icon-] { - &:before { - @extend %icon-base; - } - - &:hover { - text-decoration: none; - } -} - - -// -// Icon Classes -// -------------------------------------------------- - -.icon-add:before { - content: '#{$i-add}'; -} -.icon-app:before { - content: '#{$i-app}'; -} -.icon-appearance:before { - content: '#{$i-appearance}'; -} -.icon-archive:before { - content: '#{$i-archive}'; -} -.icon-atom:before { - content: '#{$i-atom}'; -} -.icon-book:before { - content: '#{$i-book}'; -} -.icon-calendar:before { - content: '#{$i-calendar}'; -} -.icon-camera:before { - content: '#{$i-camera}'; -} -.icon-check:before { - content: '#{$i-check}'; -} -.icon-chevron-down:before { - content: '#{$i-chevron-down}'; -} -.icon-chevron-left:before { - content: '#{$i-chevron-left}'; -} -.icon-chevron:before { - content: '#{$i-chevron}'; -} -.icon-clock:before { - content: '#{$i-clock}'; -} -.icon-close:before { - content: '#{$i-close}'; -} -.icon-code:before { - content: '#{$i-code}'; -} -.icon-comments:before { - content: '#{$i-comments}'; -} -.icon-compass:before { - content: '#{$i-compass}'; -} -.icon-content:before { - content: '#{$i-content}'; -} -.icon-edit:before { - content: '#{$i-edit}'; -} -.icon-error:before { - content: '#{$i-error}'; -} -.icon-external:before { - content: '#{$i-external}'; -} -.icon-featured:before { - content: '#{$i-featured}'; -} -.icon-fullscreen:before { - content: '#{$i-fullscreen}'; -} -.icon-ghost-logo:before { - content: '#{$i-ghost-logo}'; -} -.icon-ghost:before { - content: '#{$i-ghost}'; -} -.icon-grid:before { - content: '#{$i-grid}'; -} -.icon-home:before { - content: '#{$i-home}'; -} -.icon-image:before { - content: '#{$i-image}'; -} -.icon-info:before { - content: '#{$i-info}'; -} -.icon-lightning:before { - content: '#{$i-lightning}'; -} -.icon-link:before { - content: '#{$i-link}'; -} -.icon-list:before { - content: '#{$i-list}'; -} -.icon-lock:before { - content: '#{$i-lock}'; -} -.icon-mail:before { - content: '#{$i-mail}'; -} -.icon-markdown:before { - content: '#{$i-markdown}'; -} -.icon-menu:before { - content: '#{$i-menu}'; -} -.icon-mobile:before { - content: '#{$i-mobile}'; -} -.icon-notification:before { - content: '#{$i-notification}'; -} -.icon-pacman:before { - content: '#{$i-pacman}'; -} -.icon-pc:before { - content: '#{$i-pc}'; -} -.icon-pin:before { - content: '#{$i-pin}'; -} -.icon-power:before { - content: '#{$i-power}'; -} -.icon-preview:before { - content: '#{$i-preview}'; -} -.icon-question:before { - content: '#{$i-question}'; -} -.icon-reply:before { - content: '#{$i-reply}'; -} -.icon-repost:before { - content: '#{$i-repost}'; -} -.icon-rss:before { - content: '#{$i-rss}'; -} -.icon-search-left:before { - content: '#{$i-search-left}'; +.icon-user:before { + content: "\e000"; } .icon-search:before { - content: '#{$i-search}'; + content: "\e001"; } -.icon-services:before { - content: '#{$i-services}'; +.icon-design:before { + content: "\e003"; } -.icon-settings:before { - content: '#{$i-settings}'; -} -.icon-settings2:before { - content: '#{$i-settings2}'; -} -.icon-stats:before { - content: '#{$i-stats}'; -} -.icon-success:before { - content: '#{$i-success}'; -} -.icon-support:before { - content: '#{$i-support}'; -} -.icon-tablet:before { - content: '#{$i-tablet}'; -} -.icon-tag:before { - content: '#{$i-tag}'; -} -.icon-trash:before { - content: '#{$i-trash}'; -} -.icon-twitter:before { - content: '#{$i-twitter}'; -} -.icon-unfeatured:before { - content: '#{$i-unfeatured}'; -} -.icon-user:before { - content: '#{$i-user}'; -} -.icon-users:before { - content: '#{$i-users}'; -} -.icon-video:before { - content: '#{$i-video}'; -} -.icon-weather-cloudy:before { - content: '#{$i-weather-cloudy}'; -} -.icon-weather-partial:before { - content: '#{$i-weather-partial}'; -} -.icon-weather-rain:before { - content: '#{$i-weather-rain}'; -} -.icon-weather-snow:before { - content: '#{$i-weather-snow}'; -} -.icon-weather-sun:before { - content: '#{$i-weather-sun}'; +.icon-content:before { + content: "\e004"; } .icon-x:before { - content: '#{$i-x}'; + 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"; +} +.icon-pen:before { + content: "\e010"; +} +.icon-clip:before { + content: "\e011"; +} +.icon-trash:before { + content: "\e012"; +} +.icon-edit:before { + content: "\e013"; +} +.icon-new:before { + content: "\e014"; +} +.icon-lock-2:before { + content: "\e015"; +} +.icon-link:before { + content: "\e016"; +} +.icon-chat:before { + content: "\e017"; +} +.icon-smiley:before { + content: "\e018"; +} +.icon-star:before { + content: "\e019"; +} +.icon-rss:before { + content: "\e01b"; +} +.icon-hotspot:before { + content: "\e01d"; +} +.icon-mail:before { + content: "\e01e"; +} +.icon-sound-on:before { + content: "\e01f"; +} +.icon-sound-off:before { + content: "\e020"; +} +.icon-download:before { + content: "\e021"; +} +.icon-upload:before { + content: "\e022"; +} +.icon-bell:before { + content: "\e023"; +} +.icon-shop:before { + content: "\e01c"; +} +.icon-box:before { + content: "\e024"; +} +.icon-connections:before { + content: "\e025"; +} +.icon-arrow-right:before { + content: "\e01a"; +} +.icon-arrow-left:before { + content: "\e026"; +} +.icon-arrow-up:before { + content: "\e027"; +} +.icon-ghost:before { + content: "\e028"; +} +.icon-dice:before { + content: "\e029"; +} +.icon-ambulance:before { + content: "\e02a"; +} +.icon-calendar:before { + content: "\e02b"; +} +.icon-folder:before { + content: "\e02c"; +} +.icon-pulse:before { + content: "\e02d"; +} +.icon-photos:before { + content: "\e02e"; +} +.icon-legal:before { + content: "\e02f"; +} +.icon-letter:before { + content: "\e030"; +} +.icon-grid:before { + content: "\e031"; } - -// Specific icon size adjustments .icon-list:before { - font-size: 0.9em; + content: "\e032"; +} +.icon-blog:before { + content: "\e033"; +} +.icon-question:before { + content: "\e034"; +} +.icon-error:before { + content: "\e035"; +} +.icon-power:before { + content: "\e036"; } .icon-markdown:before { - font-size: 1.1em; - vertical-align: -7%; -} -.icon-twitter:before { - font-size: 1.1em; -} - - -// -// Div-based Icon Classes -// -------------------------------------------------- - -.icon-grab:before { - content: ''; - display: inline-block; - width: 7px; - height: 15px; - background-size: 4px 4px; - background-color: $midbrown; - background-position: -1px -1px; - background-image: linear-gradient(#fff 1px, transparent 1px), - linear-gradient(90deg, #fff 1px, transparent 1px), - linear-gradient(#fff 1px, transparent 1px), - linear-gradient(90deg, #fff 1px, transparent 1px); + content: "\e037"; } diff --git a/core/client/app/styles/patterns/forms.scss b/core/client/app/styles/patterns/forms.scss index 2eee31b62e..ab30ad6991 100644 --- a/core/client/app/styles/patterns/forms.scss +++ b/core/client/app/styles/patterns/forms.scss @@ -309,13 +309,23 @@ textarea { padding: 0; border-width: 0; - @include icon-after($i-chevron-down, 0.85em, $midbrown) { + &:after { + 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; position: absolute; top: 50%; right: 0.8em; margin-top: -0.5em; pointer-events: none; - }; + content: "\e00f"; + } select { appearance: none; diff --git a/core/client/app/styles/patterns/navlist.scss b/core/client/app/styles/patterns/navlist.scss index be57155ad6..8b40609b0a 100644 --- a/core/client/app/styles/patterns/navlist.scss +++ b/core/client/app/styles/patterns/navlist.scss @@ -30,13 +30,6 @@ // -------------------------------------------------- .nav-list-item { - @include icon($i-chevron, 1.4rem, $midbrown) { - position: absolute; - top: 50%; - right: 10px; - transform: translateY(-50%); - } - position: relative; display: block; padding: 8px 40px 8px 12px; @@ -80,4 +73,12 @@ color: $midgrey; line-height: 1.375; } + + i { + position: absolute; + top: 50%; + right: 10px; + margin-top: -0.9rem; + font-size: 1.4rem; + } }//.nav-list-item diff --git a/core/client/app/templates/-nav-menu.hbs b/core/client/app/templates/-nav-menu.hbs index fd98f46e03..5054007202 100644 --- a/core/client/app/templates/-nav-menu.hbs +++ b/core/client/app/templates/-nav-menu.hbs @@ -23,7 +23,7 @@ diff --git a/core/client/app/templates/post-tags-input.hbs b/core/client/app/templates/post-tags-input.hbs index 6a24435e8d..dbeb5f3cb8 100644 --- a/core/client/app/templates/post-tags-input.hbs +++ b/core/client/app/templates/post-tags-input.hbs @@ -6,7 +6,7 @@
{{#each tag in controller.tags}} - {{tag.name}} + {{tag.name}} {{/each}}
diff --git a/core/client/app/templates/posts/post.hbs b/core/client/app/templates/posts/post.hbs index d9222dd8ab..1c7c5b58ac 100644 --- a/core/client/app/templates/posts/post.hbs +++ b/core/client/app/templates/posts/post.hbs @@ -1,7 +1,7 @@
{{#link-to "posts" tagName="button" class="btn btn-default btn-back"}}Back{{/link-to}}

Preview

- @@ -16,7 +16,7 @@ {{#if model.author.name}}{{model.author.name}}{{else}}{{model.author.email}}{{/if}}
- {{#link-to "editor.edit" model class="btn btn-default post-edit"}} Edit{{/link-to}} + {{#link-to "editor.edit" model class="btn btn-default post-edit"}} Edit{{/link-to}}
diff --git a/core/client/app/views/editor/edit.js b/core/client/app/views/editor/edit.js index 8a9c98d71b..906fad10a8 100644 --- a/core/client/app/views/editor/edit.js +++ b/core/client/app/views/editor/edit.js @@ -3,7 +3,7 @@ import EditorViewMixin from 'ghost/mixins/editor-base-view'; var EditorView = Ember.View.extend(EditorViewMixin, { tagName: 'section', - classNames: ['entry-container'] + classNames: ['gh-view'] }); export default EditorView; diff --git a/core/client/app/views/editor/new.js b/core/client/app/views/editor/new.js index cbf9f70c22..7d90aa60c0 100644 --- a/core/client/app/views/editor/new.js +++ b/core/client/app/views/editor/new.js @@ -4,7 +4,7 @@ import EditorViewMixin from 'ghost/mixins/editor-base-view'; var EditorNewView = Ember.View.extend(EditorViewMixin, { tagName: 'section', templateName: 'editor/edit', - classNames: ['entry-container'] + classNames: ['gh-view'] }); export default EditorNewView; diff --git a/core/client/public/assets/fonts/ghosticons.eot b/core/client/public/assets/fonts/ghosticons.eot index 418852cb76..b85abdfc93 100644 Binary files a/core/client/public/assets/fonts/ghosticons.eot and b/core/client/public/assets/fonts/ghosticons.eot differ diff --git a/core/client/public/assets/fonts/ghosticons.svg b/core/client/public/assets/fonts/ghosticons.svg index 2d15362e23..0bf1988148 100644 --- a/core/client/public/assets/fonts/ghosticons.svg +++ b/core/client/public/assets/fonts/ghosticons.svg @@ -23,4 +23,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/client/public/assets/fonts/ghosticons.ttf b/core/client/public/assets/fonts/ghosticons.ttf index 8263906f75..efb7d4878a 100644 Binary files a/core/client/public/assets/fonts/ghosticons.ttf and b/core/client/public/assets/fonts/ghosticons.ttf differ diff --git a/core/client/public/assets/fonts/ghosticons.woff b/core/client/public/assets/fonts/ghosticons.woff index a4eee91ff0..9f120fe42a 100644 Binary files a/core/client/public/assets/fonts/ghosticons.woff and b/core/client/public/assets/fonts/ghosticons.woff differ diff --git a/core/client/public/assets/fonts/icons.svg b/core/client/public/assets/fonts/icons.svg deleted file mode 100755 index bf9f3f7321..0000000000 --- a/core/client/public/assets/fonts/icons.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/core/client/public/assets/fonts/icons.woff b/core/client/public/assets/fonts/icons.woff deleted file mode 100755 index b0627364b9..0000000000 Binary files a/core/client/public/assets/fonts/icons.woff and /dev/null differ