6 files changed, 6 insertions, 13 deletions
diff --git a/application/views/file/fragments/audio-player.php b/application/views/file/fragments/audio-player.php
index 517506039..95503a0ad 100644
--- a/application/views/file/fragments/audio-player.php
+++ b/application/views/file/fragments/audio-player.php
@@ -1,4 +1,4 @@
-<div class="container-wide">
+<div class="container-fluid">
 <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 23f370618..7cbebe7fe 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-wide">
+<div class="container container-fluid">
 <?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 6673f22a3..a03dc9376 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-wide">
+<div class="table-responsive container-fluid">
 	<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 096bb2d59..0a84c6a4c 100644
--- a/application/views/file/fragments/video-player.php
+++ b/application/views/file/fragments/video-player.php
@@ -1,4 +1,4 @@
-<div class="container-wide">
+<div class="container-fluid">
 <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 c5bc396c6..e3a2f7d13 100644
--- a/application/views/file/html_paste_header.php
+++ b/application/views/file/html_paste_header.php
@@ -1,4 +1,4 @@
-<div class="container paste-container container-wide">
+<div class="container-fluid paste-container">
 	<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 2058326b7..f2c0542c9 100644
--- a/public_html/data/css/style.css
+++ b/public_html/data/css/style.css
@@ -201,14 +201,6 @@ 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;
@@ -218,6 +210,7 @@ body {
 .paste-container {
 	padding: 3px;
 	background: #eee;
+	margin: 0 15px 20px 15px;
 }
 
 .code pre {