centered page content and adjusted nav bar m queries

public/assets/css/general.css

@@ -3,6 +3,13 @@ html, body {
 	padding: 0;
 	height: 100%;
 }
+
+.page-contents {
+	margin: 0px auto;
+	padding: 0px;
+	height: calc(100% - 5rem);
+    max-width: 1200px;
+}
 /* TEXT */
 
 body, button, input, textarea, label, select, option {
@@ -15,10 +22,6 @@ p {
 	padding-left: 0.3em;
 }
 
-.center-text {
-	text-align: center;
-}
-
 .url-text {
 	margin:0px;
 	padding:0px;
@@ -123,7 +126,7 @@ h3 {
 }
 
 .row--full-height {
-	height: calc(100% - 9rem);
+	height: calc(100% - 4rem);
 }
 
 .column {

public/assets/css/mediaQueries.css

@@ -1,23 +1,6 @@
 
-@media (max-width: 1000px) {
+@media (max-width: 1050px) {
 
-	.main {
-		float: none;
-		width: 100%;
-		margin-right: 0px;
-		padding-right: 0px;
-		border-right: 0px;
-		margin-bottom: 5px;
-	}
-
-	.sidebar {
-		border-top: 1px solid lightgray;
-		float: none;
-		width: 100%;
-	}
-}
-
-@media (max-width: 850px) {
 	.nav-bar-title, .nav-bar-subtitle {
 		padding-bottom: 0px;
 	}
@@ -38,6 +21,10 @@
 	.nav-bar {
 		height: 8rem;
 	}
+
+	.page-contents {
+		height: calc(100% - 8rem);
+	}
 }
 
 @media (max-width: 750px ) {

views/about.handlebars

@@ -1,4 +1,3 @@
-{{> navBar}}
 <div class="row row--full-height">
     <div class="column column--5 column--med-10 align-content-top">
         <div class="row row--short">

views/channel.handlebars

@@ -1,4 +1,3 @@
-{{> navBar}}
 <div class="row row--full-height">
     <h2>{{this.channelName}}<span class="h2--secondary">:{{this.longChannelId}}</span></h2>
     <p>Below is all the free content in this channel.</p>

views/fourOhFour.handlebars

@@ -1,4 +1,3 @@
-{{> navBar}}
 <div>
     <h3>404: Not Found</h3>
     <p>That page does not exist.  Return <a href="/">home</a>.</p>

views/index.handlebars

@@ -1,4 +1,3 @@
-{{> navBar}}
 <div class="row row--full-height">
     <div id="primary-dropzone-wrapper">
         <div id="primary-dropzone" class="dropzone" ondrop="drop_handler(event);" ondragover="dragover_handler(event);" ondragend="dragend_handler(event)" onclick="triggerFileChooser('siofu_input', event)">

views/layouts/main.handlebars

@@ -27,6 +27,9 @@
     <script src="/assets/js/loginFunctions.js"></script>
     <script src="/assets/js/createChannelFunctions.js"></script>
     <script src="/assets/js/navBarFunctions.js"></script>
+    {{> navBar}}
+    <div class="page-contents">
         {{{ body }}}
+    </div>
 </body>
 </html>

views/layouts/show.handlebars

@@ -22,7 +22,10 @@
     <script src="/assets/js/authFunctions.js"></script>
     <script src="/assets/js/loginFunctions.js"></script>
     <script src="/assets/js/navBarFunctions.js"></script>
+    {{> navBar}}
+    <div class="page-contents">
         {{{ body }}}
+    </div>
 </body>
 </html>
 

views/login.handlebars

@@ -1,5 +1,3 @@
-{{> navBar}}
-
 <div class="row row--full-height">
     <div class="column column--5 column--med-10 align-content-top">
         <p>Log in to an existing channel:</p>

views/new.handlebars

@@ -1,4 +1,3 @@
-	{{> navBar}}
 <div>
     <h2>New on Spee.ch</h2>
     <p><i>The 25 most recent publishes on spee.ch</i></p>

views/noChannel.handlebars

@@ -1,4 +1,3 @@
-	{{> navBar}}
 <div>
     <h3>No Claims</h3>
     <p>There are no free assets on this channel.</p>

views/noClaims.handlebars

@@ -1,4 +1,3 @@
-{{> navBar}}
 <div class="row">
     <h3>No Claims</h3>
     <p>There are no free assets at that claim.  You should publish one at <a href="/">spee.ch</a>.</p>

views/popular.handlebars

@@ -1,4 +1,3 @@
-{{> navBar}}
 <div class="row">
     {{#each trendingAssets}}
         {{> contentListItem}}

views/show.handlebars

@@ -1,5 +1,3 @@
-
-	{{> navBar}}
 <div class="row row--full-height">
     <div class="column column--10">
         <!-- title -->
@@ -19,5 +17,4 @@
             {{> assetInfo}}
         </div>
     </div>
-
 </div>

views/statistics.handlebars

@@ -1,7 +1,3 @@
-
-	<div class="top-bar">
-		{{> navBar}}
-	</div>
 <div>
     <h3>Site Statistics</h3>
     <p>Serve: {{ totals.totalServe }}</p>
@@ -12,26 +8,25 @@
         <tr>
             <th>action</th>
             <th >url</th>
-				<th class="center-text">count</th>
+            <th class="">count</th>
-				<th class="center-text">success</th>
+            <th class="">success</th>
-				<th class="center-text">failure</th>
+            <th class="">failure</th>
         </tr>
         {{#each records}}
         <tr>
             <td>{{ this.action }}</td>
             <td class="stats-table-url">{{ this.url }}</td>
-				<td class="center-text">{{ this.count }}</td>
+            <td class="">{{ this.count }}</td>
-				<td class="center-text">{{ this.success }}</td>
+            <td class="">{{ this.success }}</td>
-				<td class="center-text">{{ this.failure }}</td>
+            <td class="">{{ this.failure }}</td>
         </tr>
         {{/each}}
         <tr>
             <td></td>
             <td></td>
-				<td class="totals-row center-text">{{ totals.totalCount }}</td>
+            <td class="">{{ totals.totalCount }}</td>
-				<td class="totals-row center-text">{{ totals.totalSuccess }}</td>
+            <td class="">{{ totals.totalSuccess }}</td>
-				<td class="totals-row center-text">{{ totals.totalFailure }}</td>
+            <td class="">{{ totals.totalFailure }}</td>
         </tr>
     </table>
-
 </div>