1
0
Fork 0
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:
Harvey Kandola 2017-03-28 12:34:01 +01:00
parent 8852a7b333
commit 2d741e9ca7
7 changed files with 51 additions and 42 deletions

View file

@ -1,16 +1,14 @@
<div class="zone-section-editor">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div id="zone-document-content" class="zone-document-content">
<div class="back-to-space">
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
{{/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 class="page-container">
<div id="page-content-wrapper">
<div id="zone-document-content" class="zone-document-content">
<div class="back-to-space">
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
{{/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>
</div>

View file

@ -14,5 +14,10 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
diff: "",
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);
}
});

View file

@ -1,17 +1,19 @@
<div class="zone-document-history">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div id="zone-document-content" class="zone-document-content">
<div class="back-to-space">
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
{{/link-to}}
</div>
{{document/document-heading document=model.document isEditor=false}}
<div class="page-container">
<div id="page-content-wrapper">
<div id="zone-document-content" class="zone-document-content">
<div class="back-to-space">
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
{{/link-to}}
</div>
{{document/document-heading document=model.document isEditor=false}}
{{#if hasRevisions}}
{{document/document-history document=model.document folder=model.folder pages=model.pages
revisions=model.revisions diff=model.diff onFetchDiff=(action 'onFetchDiff') onRollback=(action 'onRollback')}}
</div>
{{else}}
No revisions made
{{/if}}
</div>
</div>
</div>

View file

@ -1,16 +1,14 @@
<div class="zone-section-editor">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<div id="zone-document-content" class="zone-document-content">
<div class="back-to-space">
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
{{/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 class="page-container">
<div id="page-content-wrapper">
<div id="zone-document-content" class="zone-document-content">
<div class="back-to-space">
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug}}
<i class="material-icons">arrow_back</i>&nbsp;{{model.document.name}}
{{/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>
</div>

View file

@ -15,6 +15,7 @@ $sidebar-width: 400px;
position: fixed;
overflow-x: hidden;
left: $sidebar-width;
top: 0;
width: 0;
height: 100%;
margin-left: -$sidebar-width;
@ -31,11 +32,20 @@ $sidebar-width: 400px;
width: $sidebar-width;
}
.page-container {
margin-right: auto;
margin-left: auto;
padding-left: 30px;
padding-right: 30px;
max-width: 1200px;
}
#page-content-wrapper {
width: 100%;
position: absolute;
margin-top: 30px;
padding: 30px;
margin: 0 auto;
margin-top: 30px;
.page-content-title {
font-size: 2rem;

View file

@ -47,7 +47,7 @@
<li class="item" {{action 'onUnpin'}}>Unpin</li>
{{else}}
<li class="item" id="pin-document-button">Pin</li>
{{/if}}
{{/if}}
<li class="item" id="pin-document-button">
{{#link-to 'document.history'}}History{{/link-to}}
</li>

View file

@ -1,9 +1,5 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
<div id="page-content-wrapper">
{{yield}}
</div>
</div>
<div class="page-container">
<div id="page-content-wrapper">
{{yield}}
</div>
</div>