Merge remote branch 'remotes/schendje/master'

4 files changed, 22 insertions, 9 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 31573820..3b2a9a50 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -133,15 +133,6 @@ a.mediagoblin_logo:hover {
 
 /* common website elements */
 
-.dotted_line {
-  width:100%;
-  height:0px;
-  border-bottom: dotted 1px #5f5f5f;
-  position:absolute;
-  left:0px;
-  margin-top:-20px;
-}
-
 .button {
   font-family:'Carter One', arial, serif;
   height:32px;
@@ -164,6 +155,10 @@ a.mediagoblin_logo:hover {
   padding-right:11px;
 }
 
+.pagination{
+text-align:center;
+}
+
 /* forms */
 
 .form_box {
@@ -223,6 +218,17 @@ a.mediagoblin_logo:hover {
   width:280px;
 }
 
+/* comments */
+
+.comment_author {
+  margin-bottom:40px;
+  padding-top:4px;
+}
+
+.comment_content p {
+  margin-bottom:4px;
+}
+
 /* media galleries */
 
 ul.media_thumbnail {
@@ -240,3 +246,10 @@ li.media_thumbnail {
   zoom:1;
 . *display:inline;
 }
+
+/* icons */
+
+img.media_icon{
+  margin:0 4px;
+  vertical-align:sub;
+}
diff --git a/mediagoblin/static/images/iconDelete.png b/mediagoblin/static/images/iconDelete.png
new file mode 100644
index 00000000..9d76a5db
--- /dev/null
+++ b/mediagoblin/static/images/iconDelete.png
diff --git a/mediagoblin/static/images/iconEdit.png b/mediagoblin/static/images/iconEdit.png
new file mode 100644
index 00000000..480c73ad
--- /dev/null
+++ b/mediagoblin/static/images/iconEdit.png
diff --git a/mediagoblin/static/images/iconFeed.png b/mediagoblin/static/images/iconFeed.png
new file mode 100644
index 00000000..11e5b1e7
--- /dev/null
+++ b/mediagoblin/static/images/iconFeed.png