diff --git a/core/client/assets/sass/layouts/about.scss b/core/client/assets/sass/layouts/about.scss
index 54a91dcc51..417a16bf8a 100644
--- a/core/client/assets/sass/layouts/about.scss
+++ b/core/client/assets/sass/layouts/about.scss
@@ -34,6 +34,16 @@
// App Details
// --------------------------------------------------
+// Special case to hide the desktop page header, because
+// in this instance the Ghost logo replaces it.
+.settings-view-about {
+ @media (min-width: 901px) {
+ .settings-view-header {
+ display: none;
+ }
+ }
+}
+
.about-ghost-intro {
h1 {
margin-top: -6px;
@@ -92,7 +102,7 @@
.btn {
width: 100%;
display: block;
- font-size: 0.9rem;
+ font-size: 1rem;
padding-top: 9px;
padding-bottom: 9px;
min-height: 32px;
@@ -243,4 +253,4 @@
}
}
-} // .about-copyright
\ No newline at end of file
+} // .about-copyright
diff --git a/core/client/assets/sass/layouts/content.scss b/core/client/assets/sass/layouts/content.scss
index 7f2aafd9a0..6fc3ecdb9b 100644
--- a/core/client/assets/sass/layouts/content.scss
+++ b/core/client/assets/sass/layouts/content.scss
@@ -205,10 +205,14 @@
}
.content-preview-content {
- padding: 80px 40px;
+ padding: 5%;
word-break: break-word;
hyphens: auto;
+ @media (max-width:400px) {
+ padding: 0;
+ }
+
.wrapper {
max-width: 700px;
margin:0 auto;
diff --git a/core/client/assets/sass/layouts/editor.scss b/core/client/assets/sass/layouts/editor.scss
index 488793c4d1..a72f0a9e6c 100644
--- a/core/client/assets/sass/layouts/editor.scss
+++ b/core/client/assets/sass/layouts/editor.scss
@@ -433,6 +433,14 @@ body.zen {
}
.post-settings {
+ @include icon($i-settings, 14px);
+ display: inline-block;
+ padding: 0 10px;
+ color: $midgrey;
+ transition: all 0.15s ease-out 0s;
+ position: relative;
+ top: 1px;
+
&:hover,
&.active {
color: $lightgrey;
@@ -644,19 +652,23 @@ body.zen {
}
#entry-actions {
- margin-right: 6px;
position: relative;
+ margin-right: 6px;
+
.dropdown {
position: absolute;
- bottom: 49px;
right: 0;
+ bottom: 49px;
+
.dropdown-menu {
top: auto;
- left: auto;
right: 100%;
bottom: 100%;
+ left: auto;
}
+
}
+
}
#entry-actions-menu {
@@ -671,6 +683,11 @@ body.zen {
body.right-outlet-expanded {
+ // Keep settings cog highlighted when menu is open
+ .post-settings:before {
+ color: $lightgrey;
+ }
+
.editor-cover {
position: absolute;
top: 0;
@@ -680,166 +697,14 @@ body.zen {
z-index: 600;
transition: transform $side-outlet-transition-duration cubic-bezier(0.1, 0.7, 0.1, 1);
transform: translate3d(-350px, 0px, 0px); // Not off the screen, to give a parallax effect
- }//.editor-cover
-}//body.right-outlet-expanded
-
-.post-settings {
- @include icon($i-settings, 14px);
- display: inline-block;
- padding: 0 10px;
- color: $midgrey;
- transition: all 0.15s ease-out 0s;
- position: relative;
- top: 1px;
-
- &:hover,
- &.active {
- color: $darkgrey;
- }
-} // .post-settings
-
-.post-settings-menu {
-
- .dropdown-menu {
- top: auto;
- bottom: 100%;
- left: auto;
- right: 100%;
}
- /*
- padding-top: 0;
- text-transform: none;
-
- table {
- margin: 0;
- }
-
- td {
- padding: 0;
- border-top: none;
- border-bottom: lighten($grey, 5%) 1px solid;
- }
-
- .post-setting-label {
- padding: 8px 10px 8px 15px;
- border-right: lighten($grey, 5%) 1px solid;
- text-align: right;
- }
-
- label {
- position: static;
- width: auto;
- font-weight: normal;
- color: $midgrey;
- white-space: nowrap;
- }
-
- input {
- width: 200px;
- margin: 0;
-
- @media (max-width: 550px) {
- width: 200px;
- }
-
- &[type="text"] {
- border: none;
- padding: 8px 0 8px 10px;
- color: $lightgrey;
- border-radius: 0;
- background: transparent;
-
- &:focus {
- background: $grey;
- border: none;
- }
- }
- } // input
-
- .post-setting-item {
- padding: 5px 0 0 10px;
- &.no-padding {
- padding: 0;
- }
- }
-
- .gh-select {
- height: 36px;
- &:after {
- color: $lightgrey;
- margin-top: -(0.85em / 2);
- }
- select {
- border: 0;
- background: transparent;
- border-radius: 0;
- color: $lightgrey;
- height: 36px;
- &:focus {
- background: $grey;
- }
- }
- @media (max-width: 550px) {
- &,
- select {
- height: 41px;
- }
- }
- }
-
- .checkbox {
- position: relative;
- margin-top: 0;
- top: 0; // Resets a global `form label` style
- border: 0;
- &:after {
- border-color: lighten($grey, 10%);
- background: $grey;
- }
- } // .checkbox
-
- // Colour the checkbox border correctly for a dark background
- input[type='checkbox'] {
- &:focus {
- & + .checkbox {
- &:after {
- border-color: lighten($grey, 10%);
- }
- }
- }
- } // input[type='checkbox']
-
- // .select-wrapper {
- // width: calc(100% - 10px);
- // }
-
- .delete {
- display: block;
- padding: 10px 15px;
- width: 100%;
- text-align: left;
- @include icon($i-trash) {
- position: relative;
- top: -1px;
- margin-right: 10px
- };
-
- &:hover {
- background: $red;
- color: #fff;
- }
- } // .delete
-
- */
-
-} // .post-settings-menu
+}
//
// Markdown Help Modal
// --------------------------------------------------
-// TODO: This is shit.
.markdown-help-container{
padding-bottom: 20px;
diff --git a/core/client/assets/sass/layouts/post-settings-menu.scss b/core/client/assets/sass/layouts/post-settings-menu.scss
index 20fa8fa5a2..52f7fb5586 100644
--- a/core/client/assets/sass/layouts/post-settings-menu.scss
+++ b/core/client/assets/sass/layouts/post-settings-menu.scss
@@ -93,21 +93,35 @@
}
+//
+// Meta Data
+// --------------------------------------------------
+
+// These styles are copied from Google.com
.seo-preview {
font-family: Arial, sans-serif;
- line-height: 1.46;
}
+
.seo-preview-title {
- font-size: 1.6rem;
- text-decoration: underline;
+ font-size: 1.8rem;
+ line-height: 2.16rem;
color: #1E0FBE;
+ text-overflow: ellipses;
+ -webkit-text-overflow: ellipsis;
+ word-wrap: break-word;
}
+
.seo-preview-link {
+ margin: 1px 0 2px 0;
font-size: 1.3rem;
+ line-height: 1.6rem;
color: #006621;
- margin: 2px 0;
+ word-wrap: break-word;
}
+
.seo-preview-description {
font-size: 1.3rem;
+ line-height: 1.4;
color: #545454;
+ word-wrap: break-word;
}
diff --git a/core/client/assets/sass/layouts/users.scss b/core/client/assets/sass/layouts/users.scss
index 3e4cc85067..2959021580 100644
--- a/core/client/assets/sass/layouts/users.scss
+++ b/core/client/assets/sass/layouts/users.scss
@@ -15,17 +15,17 @@
font-weight: normal;
color: $midbrown;
margin-bottom: 14px;
-} // .object-list-title
+}
.object-list-item {
- @media (max-width: 600px) {
+ @media (max-width: 500px) {
display: block;
padding: 15px 0;
@include clearfix;
}
- @media (min-width: 601px) {
+ @media (min-width: 501px) {
display: flex;
justify-content: start;
align-items: center;
@@ -35,15 +35,15 @@
border-top: 1px solid $lightbrown;
-} // .object-list-item
+}
a.object-list-item {
text-decoration: none;
- &:hover {
- background: lighten($lightbrown, 5%);
- }
- &:last-of-type:hover {
- box-shadow: inset 0px -1px 0px $lightbrown;
+
+ // Hover states only for large viewports
+ @media (min-width: 601px) {
+ &:hover { background: lighten($lightbrown, 5%); }
+ &:last-of-type:hover { box-shadow: inset 0px -1px 0px $lightbrown; }
}
}
@@ -57,6 +57,7 @@ a.object-list-item {
color: transparent;
overflow: hidden;
position: relative;
+
&:before {
position: absolute;
top: 50%;
@@ -67,7 +68,7 @@ a.object-list-item {
color: $brown;
font-size: 14px;
}
-} // .object-list-item-icon
+}
.object-list-item-figure {
width: 35px;
@@ -77,7 +78,7 @@ a.object-list-item {
border-radius: 100%;
background-size: 105%;
background-position: center center;
-} // .object-list-item-figure
+}
.object-list-item-icon,
.object-list-item-figure {
@@ -88,10 +89,8 @@ a.object-list-item {
}
.object-list-item-body {
-
flex: 1 1 auto;
align-items: stretch;
-
padding-left: 15px;
line-height: 1;
@@ -113,24 +112,27 @@ a.object-list-item {
margin-top: 3px;
}
-} // .object-list-item-body
+} //.object-list-item-body
.object-list-item-aside {
@media (max-width: 500px) {
float: left;
width: 100%;
- margin-top: 15px;
+ margin: 12px 0 0 50px;
}
+
.object-list-action:not(:first-of-type) {
margin-left: 20px;
@media (min-width: 501px) {
margin-left: 50px;
}
}
+
.role-label {
float: left;
margin-top: -1px;
}
+
.role-label + .role-label {
margin-left: 5px;
}
@@ -143,7 +145,7 @@ a.object-list-item {
&:hover {
}
-} // .object-list-action
+}
//
@@ -194,12 +196,15 @@ a.object-list-item {
// --------------------------------------------------
.invite-new-user {
+
.modal-body {
@include clearfix;
+
fieldset {
margin: 1em 0 0 0;
}
}
+
.form-group {
margin-bottom: 0;
@@ -215,6 +220,7 @@ a.object-list-item {
float: left;
width: 60%;
}
+
&:nth-of-type(2) {
float: left;
width: 35%;
@@ -225,7 +231,7 @@ a.object-list-item {
width: 100%;
}
- } // .form-group
+ } //.form-group
.button-add {
width: 100%;
@@ -234,4 +240,4 @@ a.object-list-item {
line-height: 16px;
}
-} // .invite-new-user
\ No newline at end of file
+} //.invite-new-user
diff --git a/core/client/assets/sass/patterns/navlist.scss b/core/client/assets/sass/patterns/navlist.scss
index 3ab0458129..955249a935 100644
--- a/core/client/assets/sass/patterns/navlist.scss
+++ b/core/client/assets/sass/patterns/navlist.scss
@@ -1,17 +1,34 @@
+//
+// Navigation Lists
+// --------------------------------------------------
+// Mobile style groups of list of links with chevrons
+
.nav-list {
- background: #FFF;
- border: 1px solid #E0DFD7;
- border-radius: $rounded;
- max-width: 500px;
padding: 0;
+ border: 1px solid #E0DFD7;
+ max-width: 500px;
+ border-radius: $rounded;
+ background: #FFF;
+
&.nav-list-block {
max-width: none;
}
}
.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;
- position: relative;
+ color: $darkgrey;
+
+ &:hover {
+ background: lighten($lightbrown, 5%);
+ }
&:first-of-type {
border-top-left-radius: $rounded;
@@ -26,22 +43,8 @@
border-bottom: 1px solid #E0DFD7;
}
- @include icon($i-chevron, 1.4rem, $midbrown) {
- position: absolute;
- top: 50%;
- right: 10px;
- transform: translateY(-50%);
- };
-
- color: $darkgrey;
a {
- &:link, &:visited {
- color: $darkgrey;
- }
- }
-
- &:hover {
- background: lighten($lightbrown, 5%);
+ color: $darkgrey;
}
b {
@@ -50,10 +53,12 @@
font-size: 1.6rem;
line-height: 1.375;
}
+
span {
display: block;
font-size: 1.1rem;
color: $midgrey;
line-height: 1.375;
}
-}
\ No newline at end of file
+
+}//.nav-list-item
diff --git a/core/client/html/about-page.html b/core/client/html/about-page.html
deleted file mode 100644
index a64650727b..0000000000
--- a/core/client/html/about-page.html
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-
-
-
-
-
- Ghost Admin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Ghost
-
-
- v0.4.2
-
- A free, open, simple publishing platform
-
-
-
-
-
- Version: 0.4.2 (That latest version!)
-
- Environment: Production
- Database: SQLite3
- Mail: Native
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/client/html/psm.html b/core/client/html/psm.html
deleted file mode 100644
index a120d5df4b..0000000000
--- a/core/client/html/psm.html
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-
-
- New PSM
-
-
-
-
-
-
-
-
-
-
- Make the magic happen
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/client/templates/settings/about.hbs b/core/client/templates/settings/about.hbs
index de432d722b..e6d947e7b1 100644
--- a/core/client/templates/settings/about.hbs
+++ b/core/client/templates/settings/about.hbs
@@ -44,7 +44,7 @@
Ghost is built by an incredible group of contributors from all over the world. Here are just a few of the people who helped create the version you’re using right now.
- Find out how you can get involved
+ Find out how you can get involved
Copyright 2013 - 2014 Ghost Foundation, released under the MIT license .