mirror of
https://github.com/documize/community.git
synced 2025-07-23 15:19:42 +02:00
improved grid sizing for different screen sizes
This commit is contained in:
parent
8852a7b333
commit
2d741e9ca7
7 changed files with 51 additions and 42 deletions
|
@ -1,16 +1,14 @@
|
||||||
<div class="zone-section-editor">
|
<div class="zone-section-editor">
|
||||||
<div class="container">
|
<div class="page-container">
|
||||||
<div class="row">
|
<div id="page-content-wrapper">
|
||||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
|
<div id="zone-document-content" class="zone-document-content">
|
||||||
<div id="zone-document-content" class="zone-document-content">
|
<div class="back-to-space">
|
||||||
<div class="back-to-space">
|
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
|
||||||
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
|
<i class="material-icons">arrow_back</i> {{model.document.name}}
|
||||||
<i class="material-icons">arrow_back</i> {{model.document.name}}
|
{{/link-to}}
|
||||||
{{/link-to}}
|
|
||||||
</div>
|
|
||||||
{{document/document-heading document=model.document isEditor=false}}
|
|
||||||
{{document/block-editor document=model.document folder=model.folder block=model.block onCancel=(action 'onCancel') onAction=(action 'onAction')}}
|
|
||||||
</div>
|
</div>
|
||||||
|
{{document/document-heading document=model.document isEditor=false}}
|
||||||
|
{{document/block-editor document=model.document folder=model.folder block=model.block onCancel=(action 'onCancel') onAction=(action 'onAction')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -14,5 +14,10 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
|
||||||
diff: "",
|
diff: "",
|
||||||
revisions: this.get('documentService').getDocumentRevisions(this.modelFor('document').document.get('id'))
|
revisions: this.get('documentService').getDocumentRevisions(this.modelFor('document').document.get('id'))
|
||||||
});
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
setupController(controller, model) {
|
||||||
|
controller.set('model', model);
|
||||||
|
controller.set('hasRevisions', model.revisions.length > 0);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,17 +1,19 @@
|
||||||
<div class="zone-document-history">
|
<div class="zone-document-history">
|
||||||
<div class="container">
|
<div class="page-container">
|
||||||
<div class="row">
|
<div id="page-content-wrapper">
|
||||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
|
<div id="zone-document-content" class="zone-document-content">
|
||||||
<div id="zone-document-content" class="zone-document-content">
|
<div class="back-to-space">
|
||||||
<div class="back-to-space">
|
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
|
||||||
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
|
<i class="material-icons">arrow_back</i> {{model.document.name}}
|
||||||
<i class="material-icons">arrow_back</i> {{model.document.name}}
|
{{/link-to}}
|
||||||
{{/link-to}}
|
</div>
|
||||||
</div>
|
{{document/document-heading document=model.document isEditor=false}}
|
||||||
{{document/document-heading document=model.document isEditor=false}}
|
{{#if hasRevisions}}
|
||||||
{{document/document-history document=model.document folder=model.folder pages=model.pages
|
{{document/document-history document=model.document folder=model.folder pages=model.pages
|
||||||
revisions=model.revisions diff=model.diff onFetchDiff=(action 'onFetchDiff') onRollback=(action 'onRollback')}}
|
revisions=model.revisions diff=model.diff onFetchDiff=(action 'onFetchDiff') onRollback=(action 'onRollback')}}
|
||||||
</div>
|
{{else}}
|
||||||
|
No revisions made
|
||||||
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
<div class="zone-section-editor">
|
<div class="zone-section-editor">
|
||||||
<div class="container">
|
<div class="page-container">
|
||||||
<div class="row">
|
<div id="page-content-wrapper">
|
||||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
|
<div id="zone-document-content" class="zone-document-content">
|
||||||
<div id="zone-document-content" class="zone-document-content">
|
<div class="back-to-space">
|
||||||
<div class="back-to-space">
|
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
|
||||||
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
|
<i class="material-icons">arrow_back</i> {{model.document.name}}
|
||||||
<i class="material-icons">arrow_back</i> {{model.document.name}}
|
{{/link-to}}
|
||||||
{{/link-to}}
|
|
||||||
</div>
|
|
||||||
{{document/document-heading document=model.document isEditor=false}}
|
|
||||||
{{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta onCancel=(action 'onCancel') onAction=(action 'onAction')}}
|
|
||||||
</div>
|
</div>
|
||||||
|
{{document/document-heading document=model.document isEditor=false}}
|
||||||
|
{{document/document-editor document=model.document folder=model.folder page=model.page meta=model.meta onCancel=(action 'onCancel') onAction=(action 'onAction')}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -15,6 +15,7 @@ $sidebar-width: 400px;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
left: $sidebar-width;
|
left: $sidebar-width;
|
||||||
|
top: 0;
|
||||||
width: 0;
|
width: 0;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
margin-left: -$sidebar-width;
|
margin-left: -$sidebar-width;
|
||||||
|
@ -31,11 +32,20 @@ $sidebar-width: 400px;
|
||||||
width: $sidebar-width;
|
width: $sidebar-width;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.page-container {
|
||||||
|
margin-right: auto;
|
||||||
|
margin-left: auto;
|
||||||
|
padding-left: 30px;
|
||||||
|
padding-right: 30px;
|
||||||
|
max-width: 1200px;
|
||||||
|
}
|
||||||
|
|
||||||
#page-content-wrapper {
|
#page-content-wrapper {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
margin-top: 30px;
|
|
||||||
padding: 30px;
|
padding: 30px;
|
||||||
|
margin: 0 auto;
|
||||||
|
margin-top: 30px;
|
||||||
|
|
||||||
.page-content-title {
|
.page-content-title {
|
||||||
font-size: 2rem;
|
font-size: 2rem;
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
<li class="item" {{action 'onUnpin'}}>Unpin</li>
|
<li class="item" {{action 'onUnpin'}}>Unpin</li>
|
||||||
{{else}}
|
{{else}}
|
||||||
<li class="item" id="pin-document-button">Pin</li>
|
<li class="item" id="pin-document-button">Pin</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
<li class="item" id="pin-document-button">
|
<li class="item" id="pin-document-button">
|
||||||
{{#link-to 'document.history'}}History{{/link-to}}
|
{{#link-to 'document.history'}}History{{/link-to}}
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
<div class="container">
|
<div class="page-container">
|
||||||
<div class="row">
|
<div id="page-content-wrapper">
|
||||||
<div class="col-lg-12">
|
{{yield}}
|
||||||
<div id="page-content-wrapper">
|
|
||||||
{{yield}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue