6 files changed, 13 insertions, 6 deletions
diff --git a/application/views/file/fragments/audio-player.php b/application/views/file/fragments/audio-player.php
index 95503a0ad..517506039 100644
--- a/application/views/file/fragments/audio-player.php
+++ b/application/views/file/fragments/audio-player.php
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-wide">
 <p>
 	<audio controls="controls">
 		<source src="<?php echo site_url($filedata["id"]); ?>">
diff --git a/application/views/file/fragments/thumbnail.php b/application/views/file/fragments/thumbnail.php
index 7fad5575f..402e1ac7c 100644
--- a/application/views/file/fragments/thumbnail.php
+++ b/application/views/file/fragments/thumbnail.php
@@ -1,5 +1,5 @@
 <!-- Comment markers background: http://stackoverflow.com/a/14776780/953022 -->
-<div class="container container-fluid">
+<div class="container container-wide">
 <?php
 $base_url = site_url();
 if (substr($base_url, -1) !== "/") {
diff --git a/application/views/file/fragments/uploads_table.php b/application/views/file/fragments/uploads_table.php
index a03dc9376..6673f22a3 100644
--- a/application/views/file/fragments/uploads_table.php
+++ b/application/views/file/fragments/uploads_table.php
@@ -1,4 +1,4 @@
-<div class="table-responsive container-fluid">
+<div class="table-responsive container-wide">
 	<p>Non-previewable file(s):</p>
 	<table class="table table-striped tablesorter">
 		<thead>
diff --git a/application/views/file/fragments/video-player.php b/application/views/file/fragments/video-player.php
index 0a84c6a4c..096bb2d59 100644
--- a/application/views/file/fragments/video-player.php
+++ b/application/views/file/fragments/video-player.php
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+<div class="container-wide">
 <div class='panel panel-default'>
 	<div class='panel-heading'>
 		<?php echo anchor(site_url($filedata['id']), htmlspecialchars($filedata["filename"])); ?>
diff --git a/application/views/file/html_paste_header.php b/application/views/file/html_paste_header.php
index e3a2f7d13..c5bc396c6 100644
--- a/application/views/file/html_paste_header.php
+++ b/application/views/file/html_paste_header.php
@@ -1,4 +1,4 @@
-<div class="container-fluid paste-container">
+<div class="container paste-container container-wide">
 	<div style="border:1px solid #ccc;">
 		<div class="navbar navbar-default navbar-static-top navbar-paste">
 			<ul class="nav navbar-nav navbar-left dont-float">
diff --git a/public_html/data/css/style.css b/public_html/data/css/style.css
index 4273ff896..2996ff3d5 100644
--- a/public_html/data/css/style.css
+++ b/public_html/data/css/style.css
@@ -201,6 +201,14 @@ body {
 	padding-left: 0;
 }
 
+.container-wide {
+	padding: 0;
+	max-width: 100%;
+	margin-left: 20px;
+	margin-right: 20px;
+	margin-bottom: 20px;
+}
+
 .simple-container {
 	margin-left: 20px;
 	margin-right: 20px;
@@ -210,7 +218,6 @@ body {
 .paste-container {
 	padding: 3px;
 	background: #eee;
-	margin: 0 15px 20px 15px;
 }
 
 .code pre {