Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Commit

Permalink
Editor and 1.0 style updates
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnONolan committed Nov 14, 2016
1 parent 63a98a4 commit d52ac9b
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 51 deletions.
4 changes: 2 additions & 2 deletions app/styles/components/dropdowns.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
.dropdown-menu > .active > button:hover,
.dropdown-menu > .active > button:focus {
outline: 0;
background-color: #428bca;
background-color: var(--blue);
color: #fff;
text-decoration: none;
}
Expand All @@ -110,7 +110,7 @@
.dropdown-menu > .disabled > button,
.dropdown-menu > .disabled > button:hover,
.dropdown-menu > .disabled > button:focus {
color: #777;
color: var(--midgrey);
}

.dropdown-menu > .disabled > a:hover,
Expand Down
5 changes: 5 additions & 0 deletions app/styles/layouts/about.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
list-style: none;
}

.gh-env-list li {
margin: 0;
font-size: 1.4rem;
}

.gh-env-help {
max-width: 200px;
}
Expand Down
39 changes: 17 additions & 22 deletions app/styles/layouts/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
top: 0;
bottom: 0;
left: 0;
padding: 15px;
width: 33%;
width: 30%;
border-right: #dfe1e3 1px solid;
background: #fff;
}
Expand All @@ -54,25 +53,22 @@
}

.content-list .entry-title {
font-size: 1.6rem;
line-height: 1.4em;
margin: 0;
font-size: 1.5rem;
line-height: 1.3em;
font-weight: normal;
}

.content-list .entry-meta {
margin-top: 14px;
position: relative;
margin-top: 7px;
line-height: 18px;
}

.content-list .entry-meta .internal-tags-list {
margin-top: 5px;
line-height: 22px;
}

.content-list .avatar {
position: relative;
float: left;
margin-right: 14px;
margin: 1px 10px 0px 0;
width: 18px;
height: 18px;
background-position: center center;
Expand Down Expand Up @@ -106,8 +102,8 @@

.content-list .author {
position: absolute;
bottom: 22px;
left: 56px;
bottom: 0;
left: 28px;
opacity: 0;
}

Expand All @@ -134,7 +130,7 @@

.content-list li a {
display: block;
padding: 19px 20px 22px 24px;
padding: 19px 25px 22px 20px;
color: rgba(0, 0, 0, 0.5);
}

Expand Down Expand Up @@ -162,15 +158,15 @@

@media (min-width: 901px) {
.content-list .active a {
border-left: var(--blue) 3px solid;
box-shadow: var(--blue) 3px 0 0 inset;
}
}


/* Preview (Right pane)
/* ---------------------------------------------------------- */

.content-preview-content .content-preview-title a {
.content-preview-title a {
position: relative;
color: var(--darkgrey);
text-decoration: none;
Expand All @@ -183,8 +179,7 @@
bottom: 0;
overflow: auto;
-webkit-overflow-scrolling: touch;
padding: 15px;
width: 67%;
width: 70%;
background: #fff;
}

Expand All @@ -197,14 +192,14 @@
}
}

.content-preview .content-preview-content {
padding: 5%;
.content-preview-content {
padding: 5vw 6vw;
word-break: break-word;
hyphens: auto;
}

@media (max-width: 900px) {
.content-preview .content-preview-content {
.content-preview-content {
position: absolute;
top: 0;
right: 0;
Expand All @@ -215,7 +210,7 @@
}
}

.content-preview .content-preview-content .wrapper {
.content-preview-content .wrapper {
margin: 0 auto;
max-width: 700px;
}
Expand Down
7 changes: 6 additions & 1 deletion app/styles/layouts/editor.css
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,15 @@
height: 65px;
}

.gh-editor-status {
color: var(--midgrey);
font-weight: 300;
}

.gh-editor-container {
position: relative;
overflow-y: auto;
padding: 100px 4vw 40px;
padding: 10vw 4vw;
width: 100%;
}

Expand Down
6 changes: 5 additions & 1 deletion app/styles/layouts/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,11 @@ body > .ember-view:not(.liquid-target-container) {
line-height: 1.5em;
}

.gh-nav-list-h {
.gh-nav-list li {
margin: 0;
}

.gh-nav-list .gh-nav-list-h {
overflow: hidden;
margin-top: 15px;
padding: 5px 10px 5px 15px;
Expand Down
5 changes: 0 additions & 5 deletions app/styles/patterns/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,6 @@ textarea {
font-weight: normal;
}

.for-radio label:hover p,
.for-checkbox label:hover p {
color: var(--midgrey);
}

.for-radio input,
.for-checkbox input {
position: absolute;
Expand Down
47 changes: 34 additions & 13 deletions app/styles/patterns/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

:root {
/* Colours */
--darkgrey: #242628;
--midgrey: #7d878a;
--darkgrey: #343f44;
--midgrey: #738a94;
--lightgrey: #e2edf2;
--blue: #5ba4e5;
--red: #e25440;
--orange: #f2a925;
--green: #9fbb58;
--blue: #3eb0ef;
--red: #f05230;
--orange: #fecd35;
--green: #a4d037;
/* Style values */
--border-radius: 4px;
--font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
Expand Down Expand Up @@ -103,40 +103,61 @@ h6 {

h1 {
text-indent: -1px;
font-size: 5rem;
font-size: 2.9rem;
}
@media (max-width: 500px) {
h1 {
font-size: 2.4rem;
}
}

h2 {
text-indent: -1px;
font-size: 4.2rem;
font-size: 2.2rem;
}
@media (max-width: 500px) {
h2 {
font-size: 1.9rem;
}
}

h3 {
font-size: 3.8rem;
font-size: 1.9rem;
}
@media (max-width: 500px) {
h3 {
font-size: 1.7rem;
}
}

h4 {
font-size: 3.1rem;
font-size: 1.7rem;
}

h5 {
font-size: 2.8rem;
font-size: 1.5rem;
}

h6 {
font-size: 2.2rem;
font-size: 1.5rem;
}

p,
ul,
ol,
dl {
margin: 0 0 1.7em 0;
font-size: 1.6rem;
}

ol,
ul {
padding-left: 2.5em;
padding-left: 1.2em;
}

li {
margin-bottom: 10px;
line-height: 1.4em;
}

ol ol,
Expand Down
4 changes: 2 additions & 2 deletions app/templates/about.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
</section>

<footer class="gh-copyright-info">
Copyright 2013 - {{copyrightYear}} Ghost Foundation, released under the <a href="https://github.com/TryGhost/Ghost/blob/master/LICENSE">MIT license</a>.
Copyright 2013 &ndash; {{copyrightYear}} Ghost Foundation Ltd, released under the <a href="https://github.com/TryGhost/Ghost/blob/master/LICENSE">MIT license</a>.
<br>
<a href="https://ghost.org/">Ghost</a> is a trademark of the <a href="https://ghost.org/about/">Ghost Foundation</a>.
<a href="https://ghost.org/">Ghost</a> is a registered trademark of <a href="https://ghost.org/about/trademark/">Ghost Foundation Ltd</a>.
</footer>
</section>
</section>
5 changes: 0 additions & 5 deletions app/templates/posts.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
{{/if}}
{{/if}}
</span>
<div class="internal-tags-list">
{{#each post.internalTags as |tag|}}
<span class="label label-default">{{tag.name}}</span>
{{/each}}
</div>
</section>
{{/link-to}}
{{/gh-posts-list-item}}
Expand Down

0 comments on commit d52ac9b

Please sign in to comment.