Skip to content

Commit 8687138

Browse files
committed
Merge branch 'beta'
# Conflicts: # Awful.apk/src/main/AndroidManifest.xml
2 parents d45cf8b + bfb0f90 commit 8687138

File tree

6 files changed

+43
-8
lines changed

6 files changed

+43
-8
lines changed

Awful.apk/src/main/assets/css/amberpos.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ body {
7575
border-top: 2px solid #eacf4c;
7676
}
7777

78+
79+
/*
80+
square dots for computers
81+
*/
7882
.postmenu:after {
7983
content: "\e901";
8084
}

Awful.apk/src/main/assets/css/classic.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,14 @@ body {
8585
border: none;
8686
}
8787

88+
/* compensating for the smaller padding in .postheader */
89+
.postmenu {
90+
margin-top: -9px;
91+
}
92+
93+
/*
94+
square dots for... classic look?
95+
*/
8896
.postmenu:after {
8997
content: "\e901";
90-
padding-right: 2px;
9198
}

Awful.apk/src/main/assets/css/general.css

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,40 @@
2929
padding: 15px 0px 5px;
3030
}
3131

32+
33+
/*
34+
.postmenu acts as the touch target for the menu button (added with the :after pseudo-element)
35+
it's positioned to align basically in the top-right corner, with some adjustments to the
36+
margins so full-width themes line up the menu icon with the one in the toolbar (it looks
37+
messy when they're just slightly unaligned)
38+
*/
39+
3240
.postmenu {
33-
font-weight: bolder;
34-
font-size: 1.7em;
3541
width: 24px;
3642
height: 24px;
37-
margin-right: 5px;
38-
margin-top: -4px;
43+
margin-right: 2px;
44+
margin-top: -13px;
45+
padding: 8px;
46+
display: flex;
47+
align-items: center;
48+
justify-content: center;
3949
}
4050

51+
52+
/*a
53+
the :after element holds the ... menu glyph, but doesn't reliably handle onClick events - so
54+
the main element above defines the touch area, and this sits in it. The font size is fixed
55+
since it's an icon and shouldn't adjust based on the user's font size, and it sits in the
56+
middle of the .postmenu element.
57+
*/
4158
.postmenu:after {
4259
font-family: 'icons' !important;
4360
content: "\e902";
4461
font-weight: normal;
62+
font-size: 13pt; !important
4563
-webkit-font-smoothing: antialiased;
4664
-webkit-user-select: none;
4765
user-select: none;
48-
padding: 4px;
49-
display:block;
5066
}
5167

5268
/*

Awful.apk/src/main/assets/css/oled.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ body {
8989
padding-right: 0;
9090
}
9191

92+
/* compensating for the smaller padding in .postheader */
93+
.postmenu {
94+
margin-top: -9px;
95+
}
96+
9297
.postseparator {
9398
height: 1px;
9499
background-color: #e7e7e7;

Awful.apk/src/main/assets/css/yospos.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ body {
8080
border-top: 2px solid #0F0;
8181
}
8282

83+
/*
84+
square dots for computers
85+
*/
8386
.postmenu:after {
8487
content: "\e901";
8588
}

Awful.apk/src/main/java/com/ferg/awfulapp/webview/AwfulWebView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* call {@link #onPause()} and {@link #onResume()} to handle those lifecycle events.
3434
* <p>
3535
* Most of the time you'll want to use {@link #setContent(String)} to add the template from
36-
* {@link AwfulHtmlPage#getContainerHtml(AwfulPreferences, int)}, which
36+
* {@link AwfulHtmlPage#getContainerHtml(AwfulPreferences, Integer, boolean)}, which
3737
* loads the HTML, CSS and JS for displaying thread content, and then use {@link #setBodyHtml(String)}
3838
* to add and display that content. {@link #setJavascriptHandler(WebViewJsInterface)} needs to be
3939
* called, since the thread JS relies on it.

0 commit comments

Comments
 (0)