Content view

This commit is contained in:
John O'Nolan 2015-05-12 13:55:24 +01:00 committed by Hannah Wolfe
parent 13a96605d4
commit 3e668f5125
15 changed files with 43 additions and 61 deletions

View File

@ -8,17 +8,16 @@
}
.gh-nav {
flex: 0 0 220px;
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;
display: flex;
}
//GH-NAV
@ -169,14 +168,21 @@
}
//--------------------------------------------------------------
#ember720 { flex-grow: 1; display: flex; } // TODO: REMOVE
.gh-view {
flex-grow: 1;
display: flex;
flex-direction: column;
}
.view-header {
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: space-between;
height: 65px;
padding: 0 20px;
margin: 0 0 20px 0;
border-bottom: #E1E1E1 1px solid;
}
@ -194,3 +200,14 @@
.view-actions {
display: flex;
}
.view-container,
.view-content {
flex-grow: 1;
overflow-x: hidden;
overflow-y: auto;
}
.view-content {
padding: 20px;
}

View File

@ -14,50 +14,6 @@
// * Labs
// ------------------------------------------------------------
//
// Content
// --------------------------------------------------
// The main content panel on the right
.settings-content {
.settings-general img {
max-width: 100%;
max-height: 400px;
display: block;
}
.blog-logo,
.blog-cover {
cursor: pointer;
}
.content {
padding: 0 40px;
@media (max-width: 900px) {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
padding: 15px;
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}
}//.content
.word-count {
float: right;
font-weight: bold;
}
}//.settings-content
//
// Navigation
// --------------------------------------------------

View File

@ -85,11 +85,11 @@
position: relative;
padding: 0 45px 0 0;
display: block;
border-top: 1px solid $lightbrown;
border-bottom: 1px solid $lightbrown;
.tag-edit-button {
width: calc(100% + 45px);
padding: 20px 15px;
padding: 20px;
text-align: left;
&:hover,
@ -133,4 +133,4 @@
font-size: 16px;
color: $midbrown;
}
}//.settings-tag
}//.settings-tag

View File

@ -27,6 +27,11 @@ form {
font-size: 1.3rem;
font-weight: bold;
}
.word-count {
float: right;
font-weight: bold;
}
}

View File

@ -234,6 +234,10 @@ button {
padding: 0;
}
img {
max-width: 100%;
}
//
// Utility Classes

View File

@ -1,4 +1,4 @@
<section class="content settings-about">
<section class="view-content settings-about">
<section class="about-ghost-intro">
<h1>
<span class="ghost_logo">

View File

@ -2,7 +2,7 @@
<h2 class="view-title">Apps</h2>
</header>
<section class="content settings-apps">
<section class="view-content settings-apps">
<table class="js-apps">
<thead>
<th>App name</th>

View File

@ -5,7 +5,7 @@
</section>
</header>
<section class="content settings-code">
<section class="view-content">
<form id="settings-code" novalidate="novalidate">
<fieldset>
<p>

View File

@ -5,7 +5,7 @@
</section>
</header>
<section class="content settings-general">
<section class="view-content">
<form id="settings-general" novalidate="novalidate">
<fieldset>

View File

@ -3,7 +3,7 @@
</header>
<section class="content settings-debug">
<section class="view-content settings-debug">
<p><strong>Important note:</strong> Labs is a testing ground for experimental features which aren't quite ready for primetime. They may change, break or inexplicably disappear at any time.</p>
<form id="settings-export">
<fieldset>

View File

@ -5,7 +5,7 @@
</section>
</header>
<section class="content settings-navigation">
<section class="view-content settings-navigation">
<form id="settings-navigation" class="js-settings-navigation" novalidate="novalidate">
{{#each navItem in navigationItems}}
{{gh-navitem navItem=navItem baseUrl=blogUrl addItem="addItem" deleteItem="deleteItem" updateUrl="updateUrl"}}

View File

@ -5,7 +5,7 @@
</section>
</header>
<section class="content settings-tags">
<section class="view-container settings-tags">
{{#each tag in tags}}
<div class="settings-tag">
<button class="tag-edit-button" {{action "editTag" tag}}>

View File

@ -6,7 +6,7 @@
</section>
</header>
<section class="content settings-users">
<section class="view-content settings-users">
{{#if invitedUsers}}

View File

@ -17,7 +17,7 @@
</section>
</header>
<div class="content settings-user">
<div class="view-content settings-user">
<figure class="user-cover" style={{coverImageBackground}}>
<button class="btn btn-default user-cover-edit js-modal-cover" {{action "openModal" "upload" user "cover"}}>Change Cover</button>

View File

@ -7,7 +7,7 @@ import MobileContentView from 'ghost/views/mobile/content-view';
var SettingsContentBaseView = MobileContentView.extend({
tagName: 'section',
classNames: ['settings-content', 'js-settings-content']
classNames: ['gh-view', 'js-settings-content']
});
export default SettingsContentBaseView;