Merge branch 'master' into upstream-master

Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/user_pages/user.html

3 files changed, 47 insertions, 0 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index b9b806f9..7b422167 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -293,6 +293,48 @@ text-align: center;
   max-width: 460px;
 }
 
+.blog_form_box_xl  {
+  background-color: #222;
+  border-top: 6px solid #D49086;
+  padding: 3% 5%;
+  display: block;
+  float: none;
+  width: 90%;
+  max-width: 800px;
+  min-height: 500px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.b_listing_title {
+  height: 30px;
+  width: 100%;
+  padding: 0px;
+  background-color: #86D4B1;
+  text-transform:capitalize;
+  text-decoration: none;
+  #border-radius: 4px;
+}
+ 
+.b_listing_title > a {
+  text-decoration: none;
+}
+
+.b_list_owner {
+  height: 100px;
+  width: 100%;
+  padding: 0em;
+  margin-right: auto;
+  background-color: #DDA0DD;
+  #border-radius: 4px;
+  text-transform: capitalize;
+}
+
+.b_list_des {
+  text-align:justify;
+}
+
+
 .edit_box {
   border-top: 6px dashed #D49086
 }
@@ -301,6 +343,10 @@ text-align: center;
   width: 100%;
 }
 
+.blog_form_field_input input, .blog_form_field_input textarea {
+  width: 100%;
+}
+
 .form_field_input {
   margin-bottom: 10px;
 }
diff --git a/mediagoblin/static/extlib/tinymce b/mediagoblin/static/extlib/tinymce
new file mode 120000
index 00000000..debf6e2e
--- /dev/null
+++ b/mediagoblin/static/extlib/tinymce
@@ -0,0 +1 @@
+../../../extlib/tinymce
\ No newline at end of file
diff --git a/mediagoblin/static/images/media_thumbs/blogpost.jpg b/mediagoblin/static/images/media_thumbs/blogpost.jpg
new file mode 100644
index 00000000..c6c68678
--- /dev/null
+++ b/mediagoblin/static/images/media_thumbs/blogpost.jpg