Merge branch 'develop'

# Conflicts: # Awful.apk/src/main/AndroidManifest.xml # Awful.apk/src/main/assets/changelog.html
Awful · Dec 20, 2018 · 38529cb · 38529cb
2 parents deb6606 + 6d7d79f
commit 38529cb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Awful.apk/src/main/assets/changelog.html b/Awful.apk/src/main/assets/changelog.html
@@ -6,6 +6,10 @@
 
 <main>
     <section>
+        <h2>3.6.1</h2>
+        <ul>
+            <li>Had a serious talk with the post menu button about breaking the layout. It is very sorry and promised to not do it again.</li>
+        </ul>
         <h2>3.6.0</h2>
         <ul>
             <li>Now with leper's colony. Enjoy reading about why you were banned (hint: it's for posting badly)</li>

diff --git a/Awful.apk/src/main/assets/css/classic.css b/Awful.apk/src/main/assets/css/classic.css
@@ -38,14 +38,14 @@ body {
 
 .postcontent {
     padding: 5px;
-    margin: 5px 15px 0;
+    margin: 5px 5px 0;
     border: none;
 }
 
 .postcontent .bbc-block {
     border-left: 2px solid #eae9ea;
-    margin: 5px 0 5px 5px;
-    padding: 5px 10px 5px 15px;
+    margin: 5px 0;
+    padding: 5px 10px;
 }
 
 .postcontent .self {

diff --git a/Awful.apk/src/main/assets/css/general.css b/Awful.apk/src/main/assets/css/general.css
@@ -32,10 +32,7 @@
 .postmenu {
     font-weight: bolder;
     font-size: 1.7em;
-    width: 10px;
-    height: 30px;
-    padding: 0 10px;
-    margin-left: 10px;
+    display: contents;
 }
 
 .postmenu:after {
@@ -46,9 +43,9 @@
     display: inline-block;
     -webkit-user-select: none;
     user-select: none;
-    margin-left: -20px;
     margin-top: -10px;
     padding: 10px;
+    height: 100%;
 }
 
 .postcontent {

diff --git a/Awful.apk/src/main/assets/css/oled.css b/Awful.apk/src/main/assets/css/oled.css
@@ -83,7 +83,6 @@ body {
 .postheader {
     vertical-align: top;
     clear: left;
-    overflow: hidden;
     border: 0;
     border-bottom: 1px solid #e7e7e7;
     border-top: 1px solid #e7e7e7;