diff --git a/core/client/assets/fonts/icons.dev.svg b/core/client/assets/fonts/icons.dev.svg
index 4fed6fdfd4..d864f76d17 100644
--- a/core/client/assets/fonts/icons.dev.svg
+++ b/core/client/assets/fonts/icons.dev.svg
@@ -9,10 +9,7 @@ This is a custom SVG font generated by IcoMoon.
-
+
+ C 336.412,152.924, 185.323,303.886 -0.292,303.886zM -0.142,478.649l0-98.56 c 227.15,0, 412.082-185.131, 413.49-413.198L 511.929-33.131 C 510.507,249.308, 281.387,478.649 -0.142,478.649zM -0.363,35.271A68.281,68.281 1620 1 1 136.213,35.266999999999996A68.281,68.281 1620 1 1 -0.363,35.266999999999996z" data-tags="rss" />
-
+
-
+
-
@@ -284,6 +281,7 @@ This is a custom SVG font generated by IcoMoon.
c-29.874,40.708-77.021,65.125-128.208,65.125c-34.125,0-66.312-11.042-92.938-30.334c 7.479,22.854, 28.729,39.479, 54.062,39.479
c 7.75,0, 15.062-1.562, 21.75-4.332c 15.188,29.562, 45.625,50.020, 81.125,50.020s 65.958-20.457, 81.084-50.020
c 6.729,2.77, 14.083,4.332, 21.749,4.332c 31.584,0, 57.167-25.583, 57.167-57.146C 480,225.52, 474.438,212.458, 465.562,202.375z" data-tags="cloudy, weather, clouds" />
+
+
-
\ No newline at end of file
diff --git a/core/client/assets/fonts/icons.eot b/core/client/assets/fonts/icons.eot
index 8f126ab052..9aee560550 100644
Binary files a/core/client/assets/fonts/icons.eot and b/core/client/assets/fonts/icons.eot differ
diff --git a/core/client/assets/fonts/icons.svg b/core/client/assets/fonts/icons.svg
index 3595d3cd16..48c3e6124f 100644
--- a/core/client/assets/fonts/icons.svg
+++ b/core/client/assets/fonts/icons.svg
@@ -9,10 +9,7 @@ This is a custom SVG font generated by IcoMoon.
-
+
+ C 336.412,152.924, 185.323,303.886 -0.292,303.886zM -0.142,478.649l0-98.56 c 227.15,0, 412.082-185.131, 413.49-413.198L 511.929-33.131 C 510.507,249.308, 281.387,478.649 -0.142,478.649zM -0.363,35.271A68.281,68.281 1620 1 1 136.213,35.266999999999996A68.281,68.281 1620 1 1 -0.363,35.266999999999996z" />
-
+
-
+
-
@@ -284,6 +281,7 @@ This is a custom SVG font generated by IcoMoon.
c-29.874,40.708-77.021,65.125-128.208,65.125c-34.125,0-66.312-11.042-92.938-30.334c 7.479,22.854, 28.729,39.479, 54.062,39.479
c 7.75,0, 15.062-1.562, 21.75-4.332c 15.188,29.562, 45.625,50.020, 81.125,50.020s 65.958-20.457, 81.084-50.020
c 6.729,2.77, 14.083,4.332, 21.749,4.332c 31.584,0, 57.167-25.583, 57.167-57.146C 480,225.52, 474.438,212.458, 465.562,202.375z" />
+
+
-
\ No newline at end of file
diff --git a/core/client/assets/fonts/icons.ttf b/core/client/assets/fonts/icons.ttf
index 3e9d9d7aa5..71d0f74cdd 100644
Binary files a/core/client/assets/fonts/icons.ttf and b/core/client/assets/fonts/icons.ttf differ
diff --git a/core/client/assets/fonts/icons.woff b/core/client/assets/fonts/icons.woff
index eaa907140e..b209fd4522 100644
Binary files a/core/client/assets/fonts/icons.woff and b/core/client/assets/fonts/icons.woff differ
diff --git a/core/client/assets/sass/layouts/plugins.scss b/core/client/assets/sass/layouts/plugins.scss
index adfe9cad7c..f3ff6151ab 100644
--- a/core/client/assets/sass/layouts/plugins.scss
+++ b/core/client/assets/sass/layouts/plugins.scss
@@ -22,13 +22,13 @@
}
.button-update-all {
- @include icon($i-power, 1em, #FFC125){ // TODO: Need lightening icon
+ @include icon($i-lightning, 1em, #FFC125) {
margin-right: 5px;
};
}
.button-cancel {
- @include icon($i-x, 1em, #FFFFFF){
+ @include icon($i-x, 1em, #fff) {
margin-right: 5px;
};
}
@@ -168,7 +168,7 @@
}
}
-
+
.plugin-settings-icon {
display: block;
margin-top: 9px;
diff --git a/core/client/assets/sass/modules/global.scss b/core/client/assets/sass/modules/global.scss
index 45ebed072d..5bbfcf69ff 100644
--- a/core/client/assets/sass/modules/global.scss
+++ b/core/client/assets/sass/modules/global.scss
@@ -383,24 +383,25 @@ nav {
/* ==========================================================================
Main Navigation
========================================================================== */
-#global-header { /* Added because the code editor was breaking for the title "Ghost" - this also happens on TryGhost */
- #ghost {
- @include icon($i-ghost);
- display: block;
- float:left;
- height:40px;
- padding:12px 15px;
- color: lighten($grey, 10%);
- @include box-sizing(border-box);
- &:hover {text-decoration:none;}
- }
- #ghost:hover {
- color: $lightgrey;
- background:darken($darkgrey, 2%);
- }
+.ghost-logo {
+ @include icon($i-ghost);
+ display: block;
+ float:left;
+ height:40px;
+ padding:12px 15px;
+ color: lighten($grey, 10%);
+ @include box-sizing(border-box);
+
+ &:hover {text-decoration:none;}
}
+.ghost-logo:hover {
+ color: $lightgrey;
+ background:darken($darkgrey, 2%);
+}
+
+
.navbar {
height: 40px;
@@ -581,7 +582,7 @@ nav {
#global-header {
@include breakpoint(650px) {
- #ghost {
+ .ghost-logo {
@include icon($i-menu, 14px);
height:40px;
width: 40px;
diff --git a/core/client/assets/sass/modules/icons.scss b/core/client/assets/sass/modules/icons.scss
index f162ba5dad..84a305dc54 100644
--- a/core/client/assets/sass/modules/icons.scss
+++ b/core/client/assets/sass/modules/icons.scss
@@ -171,6 +171,7 @@ $i-weather-sun: \e039;
$i-weather-partial: \e03a;
$i-weather-snow: \e03b;
$i-weather-cloudy: \e03c;
+$i-lightning: \e03d;
/* =============================================================================
diff --git a/core/server/views/partials/navbar.hbs b/core/server/views/partials/navbar.hbs
index ba6e9a5301..1de8621410 100644
--- a/core/server/views/partials/navbar.hbs
+++ b/core/server/views/partials/navbar.hbs
@@ -1,6 +1,6 @@