Georg/teddit
1
0
Fork 0
mirror of https://codeberg.org/tacerus/teddit.git synced 2024-11-22 14:59:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into changelog

Browse Source
This commit is contained in:
random_guy52 2021-01-24 03:44:39 +01:00
commit 009389a275
2 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
static/css/styles.css
View File

@ -36,7 +36,7 @@ a:hover, a:focus {
background: url(/css/sprite.png); background: url(/css/sprite.png);
background-position: -84px -1654px; background-position: -84px -1654px;
background-repeat: no-repeat; background-repeat: no-repeat;
margin: 2px 0px 2px 0px; margin: 2px 0 2px 0;
width: 100%; width: 100%;
height: 14px; height: 14px;
display: block; display: block;
@ -85,7 +85,7 @@ nav .nav-item.left a {
nav .nav-item.left img { nav .nav-item.left img {
width: 20px; width: 20px;
vertical-align: bottom; vertical-align: bottom;
margin: 0px 7px 0px 0px; margin: 0 7px 0 0;
} }
nav .nav-item.left a:hover nav .nav-item.left a:hover
nav .nav-item.left a:focus { nav .nav-item.left a:focus {
@ -119,7 +119,7 @@ nav a:focus {
max-width: 600px; max-width: 600px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
margin-top: 0px; margin-top: 0;
margin-top: 10px; margin-top: 10px;
padding: 10px 15px; padding: 10px 15px;
border: 1px solid black; border: 1px solid black;
@ -144,10 +144,10 @@ form legend {
font-weight: bold; font-weight: bold;
} }
form legend:first-child { form legend:first-child {
margin-top: 0px; margin-top: 0;
} }
form .setting { form .setting {
margin: 10px 0px; margin: 10px 0;
width: 100%; width: 100%;
} }
.container .content small.notice { .container .content small.notice {
@ -239,7 +239,7 @@ header .tabmenu li.active a {
display: inline-block; display: inline-block;
border: 1px solid; border: 1px solid;
padding: 0 4px; padding: 0 4px;
margin: 2px 6px 0px 0px; margin: 2px 6px 0 0;
border-radius: 3px; border-radius: 3px;
font-size: 0.68rem; font-size: 0.68rem;
} }
@ -251,7 +251,7 @@ header .tabmenu li.active a {
text-align: center; text-align: center;
float: left; float: left;
width: 100%; width: 100%;
margin: 40px 0px; margin: 40px 0;
} }
.nsfw-warning span { .nsfw-warning span {
font-size: 3rem; font-size: 3rem;
@ -262,7 +262,7 @@ header .tabmenu li.active a {
color: white; color: white;
} }
.nsfw-warning h2 { .nsfw-warning h2 {
margin: 20px 0px; margin: 20px 0;
} }
.nsfw-warning a { .nsfw-warning a {
margin: 20px; margin: 20px;
@ -276,7 +276,7 @@ input[type="submit"],
padding: 3px; padding: 3px;
margin-top: 7px; margin-top: 7px;
margin-right: 10px; margin-right: 10px;
border-radius: 0px; border-radius: 0;
border: 1px solid #a5a5a5; border: 1px solid #a5a5a5;
background: white; background: white;
color: #464646; color: #464646;
@ -292,11 +292,12 @@ input[type="submit"]:hover,
text-decoration: none; text-decoration: none;
} }
footer { footer {
padding: 30px 0px 30px 20px; padding: 10px;
margin: 2.5% 0px 0px; margin: 2.5% 0 0;
background: #e1e1e1; background: #e1e1e1;
float: left; float: left;
width: calc(100% - 20px); width: calc(100% - 20px);
text-align: center;
} }
footer a { footer a {
color: #646464; color: #646464;
@ -353,7 +354,7 @@ footer a {
overflow: hidden; overflow: hidden;
width: 70px; width: 70px;
background-image: url(/css/sprite.png); background-image: url(/css/sprite.png);
background-position: 0px -1267px; background-position: 0 -1267px;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 50px; height: 50px;
} }
@ -446,7 +447,7 @@ footer a {
margin-left: 6px; margin-left: 6px;
} }
#links.search .link .meta a.comments { #links.search .link .meta a.comments {
margin-left: 0px; margin-left: 0;
} }
#links .link .entry .meta .links .selftext a { #links .link .entry .meta .links .selftext a {
color: var(--linkcolor); color: var(--linkcolor);
@ -458,7 +459,7 @@ footer a {
border: 1px solid #369; border: 1px solid #369;
border-radius: 7px; border-radius: 7px;
padding: 5px 10px; padding: 5px 10px;
margin: 10px auto 5px 0px; margin: 10px auto 5px 0;
font-size: 0.84rem; font-size: 0.84rem;
max-width: 60em; max-width: 60em;
word-wrap: break-word; word-wrap: break-word;
@ -469,7 +470,7 @@ footer a {
cursor: initial; cursor: initial;
} }
#links .link .entry details { #links .link .entry details {
margin: 0px 10px 0px 0px; margin: 0 10px 0 0;
font-size: 0.7rem; font-size: 0.7rem;
} }
#links .link .entry details[open] { #links .link .entry details[open] {
@ -494,7 +495,7 @@ footer a {
border: 1px solid #b3b0b0; border: 1px solid #b3b0b0;
} }
#links .link .entry details .line:first-child { #links .link .entry details .line:first-child {
margin-top: 0px; margin-top: 0;
} }
/* COMMENTS */ /* COMMENTS */
.comment { .comment {
@ -629,7 +630,7 @@ footer a {
} }
.explore#links .link .sub-button { .explore#links .link .sub-button {
float: left; float: left;
margin: 7px 0px; margin: 7px 0;
width: 90px; width: 90px;
} }
.explore#links .link .content { .explore#links .link .content {
@ -645,8 +646,8 @@ footer a {
position: absolute; position: absolute;
right: 0; right: 0;
top: 0; top: 0;
padding: 0px 15px 0px 15px; padding: 0 15px 0 15px;
margin: 3px 0px; margin: 3px 0;
font-weight: bold; font-weight: bold;
} }
@ -659,10 +660,10 @@ footer a {
width: 100%; width: 100%;
} }
#post header { #post header {
padding-top: 0px; padding-top: 0;
} }
#post header div { #post header div {
padding: 20px 0px 20px 20px; padding: 20px 0 20px 20px;
float: left; float: left;
} }
#post header div a { #post header div a {
@ -707,7 +708,7 @@ footer a {
#post .comments-info { #post .comments-info {
float: left; float: left;
width: calc(100% - 30px); width: calc(100% - 30px);
margin: 10px 0px 10px 30px; margin: 10px 0 10px 30px;
} }
#post .comments-sort details { #post .comments-sort details {
float: left; float: left;
@ -739,7 +740,7 @@ footer a {
font-weight: bold; font-weight: bold;
} }
#post .comment .body { #post .comment .body {
padding-top: 0px; padding-top: 0;
padding-bottom: 13px; padding-bottom: 13px;
} }
#post .usertext-body { #post .usertext-body {
@ -795,7 +796,7 @@ footer a {
#post .crosspost .title { #post .crosspost .title {
width: 100%; width: 100%;
margin: 15px; margin: 15px;
margin-bottom: 0px; margin-bottom: 0;
} }
#post .crosspost .num_comments { #post .crosspost .num_comments {
float: left; float: left;
@ -826,7 +827,7 @@ footer a {
#post .gallery .item div { #post .gallery .item div {
float: left; float: left;
width: 100%; width: 100%;
padding-bottom: 0px; padding-bottom: 0;
} }
#post .gallery .item a { #post .gallery .item a {
float: left; float: left;
@ -855,7 +856,7 @@ footer a {
width: 100%; width: 100%;
} }
#user .entries .entry:first-child { #user .entries .entry:first-child {
padding-top: 0px; padding-top: 0;
} }
#user .info { #user .info {
float: right; float: right;
@ -880,7 +881,7 @@ footer a {
margin-left: 5px; margin-left: 5px;
} }
#user .entries .entry .title a { #user .entries .entry .title a {
margin-left: 0px; margin-left: 0;
font-size: 0.86rem; font-size: 0.86rem;
} }
#user .entries .entry .meta .author,#user .entries .entry .meta .subreddit { #user .entries .entry .meta .author,#user .entries .entry .meta .subreddit {
@ -924,14 +925,14 @@ footer a {
float: left; float: left;
} }
#user .entries .entry .comment .meta .author { #user .entries .entry .comment .meta .author {
margin-top: 0px; margin-top: 0;
} }
#user .comment .meta p { #user .comment .meta p {
padding-right: 0px; padding-right: 0;
} }
#user .comment .body { #user .comment .body {
padding-top: 4px; padding-top: 4px;
padding-bottom: 0px; padding-bottom: 0;
} }
#user .info .user-stat span { #user .info .user-stat span {
font-weight: bold; font-weight: bold;
@ -951,7 +952,7 @@ footer a {
float: left; float: left;
} }
#user .entries .entry .image { #user .entries .entry .image {
margin-left: 0px; margin-left: 0;
margin-right: 8px; margin-right: 8px;
position: relative; position: relative;
} }
@ -1010,10 +1011,10 @@ footer a {
font-weight: bold; font-weight: bold;
} }
#user .entries .entry .title .meta a.comments { #user .entries .entry .title .meta a.comments {
margin-left: 0px; margin-left: 0;
} }
#user .entries .entry a.comments.t1,#user .entries .entry a.context { #user .entries .entry a.comments.t1,#user .entries .entry a.context {
margin-top: 0px; margin-top: 0;
} }
#user .entries .entry a.context { #user .entries .entry a.context {
margin-right: 10px; margin-right: 10px;
@ -1060,11 +1061,11 @@ footer a {
width: calc(100% - 15px); width: calc(100% - 15px);
} }
.subreddit-listing { .subreddit-listing {
margin: 8px 0px; margin: 8px 0;
list-style: none; list-style: none;
} }
.subreddit-listing li { .subreddit-listing li {
margin: 15px 0px; margin: 15px 0;
} }
#sidebar .content .description { #sidebar .content .description {
margin-top: 38px; margin-top: 38px;
@ -1074,7 +1075,7 @@ a.sub-to-subreddit {
background: #007900; background: #007900;
font-size: var(--sm-font); font-size: var(--sm-font);
padding: 6px 8px 6px 8px; padding: 6px 8px 6px 8px;
margin: 0px 5px 0px 0px; margin: 0 5px 0 0;
} }
a.sub-to-subreddit:hover, a.sub-to-subreddit:hover,
a.sub-to-subreddit:focus { a.sub-to-subreddit:focus {
@ -1084,7 +1085,7 @@ a.sub-to-subreddit.gray {
background: gray; background: gray;
} }
.subscribe { .subscribe {
margin: 0px 0px 30px 0px; margin: 0 0px 30px 0;
width: 100%; width: 100%;
float: left; float: left;
} }
@ -1096,7 +1097,7 @@ a.sub-to-subreddit.gray {
} }
#search.sr { #search.sr {
width: calc(100% - 60px); width: calc(100% - 60px);
margin-top: 0px; margin-top: 0;
} }
#search.sr.search-page { #search.sr.search-page {
width: auto; width: auto;
@ -1131,7 +1132,7 @@ a.sub-to-subreddit.gray {
#search input[type="text"] { #search input[type="text"] {
padding: 4px; padding: 4px;
border: 1px solid #a5a5a5; border: 1px solid #a5a5a5;
border-radius: 0px; border-radius: 0;
margin-bottom: 11px; margin-bottom: 11px;
} }
/* REDDIT STYLES */ /* REDDIT STYLES */
@ -1446,7 +1447,7 @@ code {
float: right; float: right;
width: 100%; width: 100%;
text-align: center; text-align: center;
margin: 0px 0px 20px 0px; margin: 0 0px 20px 0;
} }
#user .entries { #user .entries {
float: left; float: left;
@ -1533,7 +1534,7 @@ code {
padding-left: 5px; padding-left: 5px;
} }
.explore#links .link .sub-button { .explore#links .link .sub-button {
margin: 7px 0px; margin: 7px 0;
width: 90px; width: 90px;
} }
.explore#links .link .entry { .explore#links .link .entry {

14
views/index.pug
View File

@ -112,6 +112,13 @@ html
!= unescape(link.selftext_html) != unescape(link.selftext_html)
a(href="" + link.permalink + "", class="comments") a(href="" + link.permalink + "", class="comments")
| #{link.num_comments} comments | #{link.num_comments} comments
if json.info.before || json.info.after
.view-more-links
- var subreddit = 'all'
if(user_preferences.subbed_subreddits && Array.isArray(user_preferences.subbed_subreddits))
- subreddit = user_preferences.subbed_subreddits.join('+')
if json.info.after
a(href="/r/" + subreddit + "/" + sortby + "?t=" + (past ? past : '') + "&after=" + json.info.after + "") next ›
#search #search
form(action="/r/all/search", method="GET") form(action="/r/all/search", method="GET")
div div
@ -121,11 +128,4 @@ html
label(for="nsfw") include NSFW results label(for="nsfw") include NSFW results
input(type="checkbox", name="nsfw", id="nsfw", checked="checked") input(type="checkbox", name="nsfw", id="nsfw", checked="checked")
input(type="submit", value="search") input(type="submit", value="search")
if json.info.before || json.info.after
.view-more-links
- var subreddit = 'all'
if(user_preferences.subbed_subreddits && Array.isArray(user_preferences.subbed_subreddits))
- subreddit = user_preferences.subbed_subreddits.join('+')
if json.info.after
a(href="/r/" + subreddit + "/" + sortby + "?t=" + (past ? past : '') + "&after=" + json.info.after + "") next ›
include includes/footer.pug include includes/footer.pug