diff options
41 files changed, 293 insertions, 267 deletions
diff --git a/cgi/manage.py b/cgi/manage.py index e3d7704..cd1a215 100644 --- a/cgi/manage.py +++ b/cgi/manage.py @@ -1398,10 +1398,12 @@ def manage(self, path_split): if not administrator: return + return + board = setBoard(path_split[3]) - threads = FetchAll( - 'SELECT * FROM archive WHERE boardid = %s ORDER BY timestamp DESC' % board['id']) + threads = FetchAll('SELECT * FROM archive WHERE boardid = %s ORDER BY timestamp DESC' % board['id']) + for item in threads: t = time.time() self.output += str(item['timestamp']) + '<br />' @@ -1410,22 +1412,50 @@ def manage(self, path_split): str(item["timestamp"]) + ".json" if os.path.isfile(fname): import json + with open(fname) as f: thread = json.load(f) - thread['posts'] = [ - dict(list(zip(thread['keys'], row))) for row in thread['posts']] - template_fname = "txt_archive.html" - - post_preview = cut_home_msg( - thread['posts'][0]['message'], 0) - page = renderTemplate("txt_archive.html", {"threads": [ - thread], "preview": post_preview}, False) + + #thread['posts'] = [dict(list(zip(thread['keys'], row))) for row in thread['posts']] + + #if 'posterid' not in thread['keys']: + # for post in thread['posts']: + # half = post['timestamp_formatted'].split(' ID:') + # if len(half) > 1: + # post['timestamp_formatted'] = half[0] + # post['posterid'] = half[1] + # else: + # post['posterid'] = '' + # + # thread['keys'].append('posterid') + + #if 'message' not in thread: + # thread['message'] = thread['posts'][0]['message'] + # thread['keys'].append('message') + + #thread['posts'] = [[row[key] for key in thread['keys']] for row in thread['posts']] + + ##raise UserError(thread) + + #try: + # with open(fname, "w") as f: + # json.dump(thread, f, indent=0) + #except: + # raise UserError("Can't edit") + + thread['posts'] = [dict(list(zip(thread['keys'], row))) for row in thread['posts']] + + post_preview = cut_msg(thread['message'], 0) + + page = renderTemplate("txt_archive.html", {"threads": [thread], "preview": post_preview}, False) + with open(Settings.ROOT_DIR + board["dir"] + "/kako/" + str(thread['timestamp']) + ".html", "w") as f: f.write(page) self.output += 'done' + str(time.time() - t) + '<br />' else: self.output += 'El hilo no existe.<br />' + elif path_split[2] == 'fixexpires': if not administrator: return diff --git a/cgi/templates/board.0.html b/cgi/templates/board.0.html index 51bfe71..5be1e28 100644 --- a/cgi/templates/board.0.html +++ b/cgi/templates/board.0.html @@ -13,7 +13,7 @@ <div class="replymode">respondanta reĝimo</div> <?py #endif ?> <a name="postbox"></a> -<div class="postarea"> +<div id="postarea"> <?py if allow_oekaki and not oek_finish: ?> <center> <form id="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data"> @@ -63,7 +63,7 @@ <td> <input type="text" name="fieldb" size="25" accesskey="e" /> <?py if disable_subject: ?> - <input type="submit" value="#{'konekti' if replythread else 'tusxu la mondo'}" accesskey="z" /> + <input id="sendbtn" type="submit" value="#{'konekti' if replythread else 'tusxu la mondo'}" accesskey="z" /> <?py #endif ?> </td> </tr> @@ -72,7 +72,7 @@ <td class="postblock">komerco</td> <td> <input type="text" name="subject" size="35" maxlength="100" accesskey="s" /> - <input type="submit" value="#{'konekti' if replythread else 'tusxu la mondo'}" accesskey="z" /> + <input id="sendbtn" type="submit" value="#{'konekti' if replythread else 'tusxu la mondo'}" accesskey="z" /> </td> </tr> <?py #endif ?> @@ -115,7 +115,7 @@ <?py #endif ?> <li>unuafoje? <a href="/guia.html" target="_blank">kiel uzi</a> · <a href="/faq.html" target="_blank">oftaj demandoj</a> · <a href="/bai/" target="_blank">burokratio</a></li> <li>konekti vian estaĵo, ŝlosita <a href="mailto:burocracia@bienvenidoainternet.org">en ekziston</a>.</li> - <li id="search"><form method="get" action="/tools/search.py" style="display:inline-block"><input type="hidden" name="board" value="${board}"><label for="searchin">foliumi: </label><input type="text" name="q" id="searchin" value="" size="10"> <input type="submit" value="iru"></form></li> + <li id="search"><form method="get" action="/tools/search.py" style="display:inline-block"><input type="hidden" name="board" value="${board}"><label for="searchin">foliumi: </label><input type="text" name="q" id="searchin" value="" size="10"> <input id="searchbtn" type="submit" value="iru"></form></li> </ul> </td> </tr> diff --git a/cgi/templates/board.html b/cgi/templates/board.html index d0e001a..6254bd5 100644 --- a/cgi/templates/board.html +++ b/cgi/templates/board.html @@ -14,7 +14,7 @@ <div class="replymode">Modo Respuesta</div> <?py #endif ?> <a name="postbox"></a> -<div class="postarea"> +<div id="postarea"> <?py if allow_oekaki and not oek_finish: ?> <center> <form id="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data"> @@ -64,7 +64,7 @@ <td> <input type="text" name="fieldb" size="25" accesskey="e" /> <?py if disable_subject: ?> - <input type="submit" value="#{'Responder' if replythread else 'Crear hilo'}" accesskey="z" /> + <input id="sendbtn" type="submit" value="#{'Responder' if replythread else 'Crear hilo'}" accesskey="z" /> <?py #endif ?> </td> </tr> @@ -73,7 +73,7 @@ <td class="postblock">Asunto</td> <td> <input type="text" name="subject" size="35" maxlength="100" accesskey="s" /> - <input type="submit" value="#{'Responder' if replythread else 'Crear hilo'}" accesskey="z" /> + <input id="sendbtn" type="submit" value="#{'Responder' if replythread else 'Crear hilo'}" accesskey="z" /> </td> </tr> <?py #endif ?> @@ -116,7 +116,7 @@ <li>Los hilos son automáticamente eliminados a los <b>#{maxage}</b> días de edad.</li> <?py #endif ?> <li>¿Eres nuevo? <a href="/guia.html" target="_blank">Leer antes de postear</a> · <a href="/faq.html" target="_blank">Preguntas frecuentes</a> · <a href="/bai/" target="_blank">Contacto</a></li> - <li id="search"><form method="get" action="/tools/search.py" style="display:inline-block"><input type="hidden" name="board" value="${board}"><label for="searchin">Buscar: </label><input type="text" name="q" id="searchin" value="" size="10"> <input type="submit" value="Ir"></form></li> + <li id="search"><form method="get" action="/tools/search.py" style="display:inline-block"><input type="hidden" name="board" value="${board}"><label for="searchin">Buscar: </label><input type="text" name="q" id="searchin" value="" size="10"> <input id="searchbtn" type="submit" value="Ir"></form></li> </ul> </td> </tr> @@ -178,15 +178,17 @@ <?py #endif ?> </label> <?py if post['email']: ?> - <a href="mailto:#{post['email']}"><span class="name"> - <b>#{post['name']}</b> - #{post['tripcode'] if post['tripcode'] else ''} - </span></a> + <?py if post['tripcode']: ?> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span></a> + <?py else: ?> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span></a> + <?py #endif ?> <?py else: ?> - <span class="name"> - <b>#{post['name']}</b> - #{post['tripcode'] if post['tripcode'] else ''} - </span> + <?py if post['tripcode']: ?> + <span class="name">#{post['name']} <span class="trip">#{post['tripcode']}</span></span> + <?py else: ?> + <span class="name">#{post['name']}</span> + <?py #endif ?> <?py #endif ?> <span class="date" data-unix="#{post['timestamp']}">#{post['timestamp_formatted']}</span> <?py if post['posterid']: ?> diff --git a/cgi/templates/board.jp.html b/cgi/templates/board.jp.html index 372141d..5ce2017 100644 --- a/cgi/templates/board.jp.html +++ b/cgi/templates/board.jp.html @@ -14,7 +14,7 @@ <div class="replymode">レス送信モード</div> <?py #endif ?> <a name="postbox"></a> -<div class="postarea"> +<div id="postarea"> <?py if allow_oekaki and not oek_finish: ?> <center> <form id="oekform" action="#{cgi_url}oekaki/paint" method="post" enctype="multipart/form-data"> @@ -66,7 +66,7 @@ <td> <input type="text" name="fieldb" id="f-mail" size="25" accesskey="e" /> <?py if disable_subject: ?> - <input type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" /> + <input id="sendbtn" type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" /> <?py #endif ?> </td> </tr> @@ -75,7 +75,7 @@ <td class="postblock">題 名</td> <td> <input type="text" name="subject" id="f-sub" size="35" maxlength="100" accesskey="s" /> - <input type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" /> + <input id="sendbtn" type="submit" value="#{'返信' if replythread else 'スレッドを立てる'}" accesskey="z" /> </td> </tr> <?py #endif ?> @@ -118,7 +118,7 @@ <li>スレは<b>#{maxage}</b>日間経つと自動的に消されられます.</li> <?py #endif ?> <li><a href="/guia.html" target="_blank">使い方</a> · <a href="/faq.html" target="_blank">よくある質問</a> · <a href="/bai/" target="_blank">管理人への連絡</a></li> - <li id="search"><form method="get" action="/tools/search.py" style="display: inline-block;"><input type="hidden" name="board" value="${board}"><label for="searchin">検索：</label><input type="text" name="q" id="searchin" value="" size="10"> <input type="submit" value="GO"></form></li> + <li id="search"><form method="get" action="/tools/search.py" style="display: inline-block;"><input type="hidden" name="board" value="${board}"><label for="searchin">検索：</label><input type="text" name="q" id="searchin" value="" size="10"> <input id="searchbtn" type="submit" value="GO"></form></li> </ul> </td> </tr> @@ -180,15 +180,17 @@ <?py #endif ?> </label> <?py if post['email']: ?> - Name <a href="mailto:#{post['email']}"><span class="name"> - <b>#{post['name']}</b> - #{post['tripcode'] if post['tripcode'] else ''} - </span></a> + <?py if post['tripcode']: ?> + Name <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span></a> + <?py else: ?> + Name <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span></a> + <?py #endif ?> <?py else: ?> - Name <span class="name"> - <b>#{post['name']}</b> - #{post['tripcode'] if post['tripcode'] else ''} - </span> + <?py if post['tripcode']: ?> + Name <span class="name">#{post['name']} <span class="trip">#{post['tripcode']}</span></span> + <?py else: ?> + Name <span class="name">#{post['name']}</span> + <?py #endif ?> <?py #endif ?> <span class="date" data-unix="#{post['timestamp']}">#{post['timestamp_formatted']}</span> <?py if post['posterid']: ?> diff --git a/cgi/templates/txt_archive.html b/cgi/templates/txt_archive.html index 2526f44..fe7f8c6 100644 --- a/cgi/templates/txt_archive.html +++ b/cgi/templates/txt_archive.html @@ -54,15 +54,15 @@ <h4>#{post['num']} : <?py if post['email']: ?> <?py if post['tripcode']: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span></a> <?py else: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b></span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span></a> <?py #endif ?> <?py else: ?> <?py if post['tripcode']: ?> - <span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span> + <span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span> <?py else: ?> - <span class="name"><b>#{post['name']}</b></span> + <span class="name">#{post['name']}</span> <?py #endif ?> <?py #endif ?> : <span class="date">#{post['timestamp_formatted']}</span> diff --git a/cgi/templates/txt_board.en.html b/cgi/templates/txt_board.en.html index 16fe616..567ef8e 100644 --- a/cgi/templates/txt_board.en.html +++ b/cgi/templates/txt_board.en.html @@ -52,15 +52,15 @@ <h4>#{post['num']} : <?py if post['email']: ?> <?py if post['tripcode']: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span></a> <?py else: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b></span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span></a> <?py #endif ?> <?py else: ?> <?py if post['tripcode']: ?> - <span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span> + <span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span> <?py else: ?> - <span class="name"><b>#{post['name']}</b></span> + <span class="name">#{post['name']}</span> <?py #endif ?> <?py #endif ?> : <span class="date" data-unix="#{post['timestamp']}">#{post['timestamp_formatted']}</span> diff --git a/cgi/templates/txt_board.html b/cgi/templates/txt_board.html index 8d01490..843625a 100644 --- a/cgi/templates/txt_board.html +++ b/cgi/templates/txt_board.html @@ -56,15 +56,15 @@ <h4>#{post['num']} : <?py if post['email']: ?> <?py if post['tripcode']: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span></a> <?py else: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b></span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span></a> <?py #endif ?> <?py else: ?> <?py if post['tripcode']: ?> - <span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span> + <span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span> <?py else: ?> - <span class="name"><b>#{post['name']}</b></span> + <span class="name">#{post['name']}</span> <?py #endif ?> <?py #endif ?> : <span class="date" data-unix="#{post['timestamp']}">#{post['timestamp_formatted']}</span> diff --git a/cgi/templates/txt_thread.html b/cgi/templates/txt_thread.html index ad1bce6..8375d27 100644 --- a/cgi/templates/txt_thread.html +++ b/cgi/templates/txt_thread.html @@ -38,17 +38,18 @@ <h4>#{post['num']} : <?py if post['email']: ?> <?py if post['tripcode']: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span></a> <?py else: ?> - <a href="mailto:#{post['email']}"><span class="name"><b>#{post['name']}</b></span></a> + <a class="email" href="mailto:#{post['email']}"><span class="name">#{post['name']}</span></a> <?py #endif ?> <?py else: ?> <?py if post['tripcode']: ?> - <span class="name"><b>#{post['name']}</b> #{post['tripcode']}</span> + <span class="name">#{post['name']}</span> <span class="trip">#{post['tripcode']}</span> <?py else: ?> - <span class="name"><b>#{post['name']}</b></span> + <span class="name">#{post['name']}</span> <?py #endif ?> - <?py #endif ?> : <span class="date" data-unix="#{post['timestamp']}">#{post['timestamp_formatted']}</span> + <?py #endif ?> + : <span class="date" data-unix="#{post['timestamp']}">#{post['timestamp_formatted']}</span> <?py if post['posterid']: ?> <span class="hash">ID:#{post['posterid']}</span> <?py #endif ?> diff --git a/cgi/weabot.py b/cgi/weabot.py index eaf4477..167fee6 100755 --- a/cgi/weabot.py +++ b/cgi/weabot.py @@ -382,13 +382,6 @@ class weabot(object): except Exception as messagez: self.output = "Error: " + \ str(messagez) + " : " + str(self.formdata) - elif path_split[1] == "mod": - import modapi - caught = True - self.headers = [("Content-Type", "application/json"), ("Access-Control-Allow-Origin", "*"), ("Access-Control-Allow-Methods", - "PUT, GET, POST, DELETE, OPTIONS"), ("Access-Control-Allow-Headers", "Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With")] - OpenDb() - modapi.api(self, path_split) if not caught: # Redirect the user back to the front page self.output += '<html xmlns="http://www.w3.org/1999/xhtml"><body><meta http-equiv="refresh" content="0;url=%s" /><p>--> --> --></p></body></html>' % Settings.HOME_URL diff --git a/static/css/buri.css b/static/css/buri.css index 95927f6..99f3e8a 100644 --- a/static/css/buri.css +++ b/static/css/buri.css @@ -5,8 +5,6 @@ body { font-family: Arial, Helvetica, "Nimbus Sans L", sans-serif; } a, -a .name, -a .name b, .nav label:hover { color: #34345c; } @@ -18,8 +16,6 @@ a:visited { color: #34345c; } a:hover, -a:hover .name, -a:hover .name b, .nav label:hover { color: #dd0000; } @@ -46,12 +42,12 @@ a:hover .name b, .subj { color: #0f0c5d; } -.name { - color: #228854; -} -.name b { +.info > .name { color: #117743; } +.info > .trip { + color: #228854; +} .reply, #q-p { background: #d6daf0; diff --git a/static/css/cyber.css b/static/css/cyber.css index 2ded143..135fe9a 100644 --- a/static/css/cyber.css +++ b/static/css/cyber.css @@ -5,8 +5,6 @@ body { font-family: monospace; } a, -a .name, -a .name b, .nav label { color: #c80b63; } @@ -17,8 +15,6 @@ a .name b, color: #fff; } a:hover, -a:hover .name, -a:hover .name b, .nav label:hover, #main_nav a:hover { color: #f00; @@ -43,10 +39,12 @@ textarea { color: #61ce3c; } input[type="submit"] { - border: 1px outset #999; + background: #000; + border: 1px solid #61ce3c; } input[type="submit"]:active { - border-style: inset; + color: #1a5506; + border: 1px solid #1a5506; } #main_nav { background: #1a1a1a; @@ -96,12 +94,12 @@ input[type="submit"]:active { .subj { color: #7b68ee; } -.name { - color: #fbde2d; -} -.name b { +.info > .name { color: #989898; } +.info > .trip { + color: #fbde2d; +} .omitted, .abbrev { color: #428c29; @@ -113,6 +111,7 @@ input[type="submit"]:active { margin-top: 1em; margin-bottom: 1em; padding: 5px; + overflow: hidden; } .reply, #q-p { diff --git a/static/css/dickgirl.css b/static/css/dickgirl.css index 69b2a3a..75a5944 100644 --- a/static/css/dickgirl.css +++ b/static/css/dickgirl.css @@ -4,7 +4,6 @@ body { color: #fff; } a, -a .name, .nav label { color: #dfca89; } @@ -12,7 +11,6 @@ a.rep { color: #fff; } a:hover, -a:hover .name, .nav label:hover { color: #d00; } @@ -42,6 +40,14 @@ hr { background: #a0c8de; color: #2c4c0b; } +input[type="text"], +textarea, +select { + border-top: 1px solid #000; + border-left: 1px solid #000; + border-bottom: none; + border-right: none; +} input[type="submit"], input[type="button"], button { @@ -49,15 +55,24 @@ button { color: #343b4d; border-top: 1px solid #85c8ff; border-left: 1px solid #85c8ff; - border-bottom: 1px solid #40607c; - border-right: 1px solid #40607c; + border-bottom: 1px solid #10181f; + border-right: 1px solid #10181f; +} +input[type="submit"]:hover, +input[type="button"]:hover, +button:hover { + background: #63b6e9; } input[type="submit"]:active, input[type="button"]:active, +input[type="button"].active, button:active { background: #7979a5; - color: #191d25; - border: 1px inset #4c6c88; + color: #10181f; + border-top: 1px solid #10181f; + border-left: 1px solid #10181f; + border-bottom: 1px solid #85c8ff; + border-right: 1px solid #85c8ff; } input[type="file"] { border: none; @@ -71,7 +86,8 @@ input[type="file"] { .subj { color: #ff7a7a; } -.name { +.info > .name, +.info > .trip { color: #acca82; } .omitted { diff --git a/static/css/easymodo.css b/static/css/easymodo.css index 5dfcdee..071ebe1 100644 --- a/static/css/easymodo.css +++ b/static/css/easymodo.css @@ -8,14 +8,10 @@ body { color: #000; } a, -a .name, -a .name b, .nav label { color: #34345c; } a:hover, -a:hover .name, -a:hover .name b, .nav label:hover { color: #d00; } @@ -54,12 +50,12 @@ a:hover .name b, .subj { color: #0f0c5d; } -.name { - color: #228854; -} -.name b { +.info > .name { color: #117743; } +.info > .trip { + color: #228854; +} .omitted, .abbrev { color: #707070; diff --git a/static/css/futaba.css b/static/css/futaba.css index b168c0e..cee786e 100644 --- a/static/css/futaba.css +++ b/static/css/futaba.css @@ -5,8 +5,6 @@ body { font-family: Arial, Helvetica, "Nimbus Sans L", sans-serif; } a, -a .name, -a .name b, .nav label { color: #0000ee; } @@ -15,8 +13,6 @@ a.rep { text-decoration: underline; } a:hover, -a:hover .name, -a:hover .name b, .nav label:hover { color: #d00; } @@ -39,12 +35,12 @@ a:hover .name b, .subj { color: #cc1105; } -.name { - color: #228854; -} -.name b { +.info > .name { color: #117743; } +.info > .trip { + color: #228854; +} .omitted { color: #707070; } @@ -77,4 +73,4 @@ a:hover .name b, } #main_nav.mob { background: #f0e0d6; -}
\ No newline at end of file +} diff --git a/static/css/guro.css b/static/css/guro.css index cea75cf..3b08a6e 100644 --- a/static/css/guro.css +++ b/static/css/guro.css @@ -8,14 +8,10 @@ body { color: #000; } a, -a .name, -a .name b, .nav label { color: #af0a0f; } a:hover, -a:hover .name, -a:hover .name b, .nav label:hover { color: #d00; } @@ -54,12 +50,12 @@ input[type="button"]:active { .subj { color: #0f0c5d; } -.name { - color: #117743; -} -.name b { +.info > .name { color: #228854; } +.info > .trip { + color: #117743; +} .omitted, .abbrev { color: #444; @@ -91,4 +87,4 @@ hr { } #main_nav.mob { background: #d9af9e; -}
\ No newline at end of file +} diff --git a/static/css/hotdog.css b/static/css/hotdog.css index f4b0d55..e6e04aa 100644 --- a/static/css/hotdog.css +++ b/static/css/hotdog.css @@ -11,13 +11,20 @@ html, body{ background:#000; color:#fff } -a, a .name, a .name b, .nav label, #pg a{ +a, +.nav label, +#pg a{ color:#fff } -.reply a, .reply a .name, .reply a .name b, #postform-t a, #oekform a, #main_nav a{ +.reply a, +#postform-t a, +#oekform a, +#main_nav a{ color:#000 } -a:hover, a:hover .name, a:hover .name b, .nav label:hover, #main_nav a:hover{ +a:hover, +.nav label:hover, +#main_nav a:hover{ background:#000; color:#fff; text-decoration:none @@ -29,11 +36,14 @@ hr{ textarea, input, select{ color:#000 } -textarea, input[type="text"], input[type="password"], select{ +textarea, +input[type="text"], +input[type="password"], select{ border:1px inset #c6c6c6; outline:1px solid #000 } -input[type="submit"], input[type="button"]{ +input[type="submit"], +input[type="button"]{ background:#c6c6c6; border-width:2px; border-color:#fff #848484 #848484 #fff; @@ -42,17 +52,20 @@ input[type="submit"], input[type="button"]{ padding:1px 1em; outline:1px solid #000 } -input[type="submit"]:active, input[type="button"]:active{ +input[type="submit"]:active, +input[type="button"]:active{ background:#aaa; border-color:#848484 #848484 #fff #fff } -.replymode, .extramode{ +.replymode, +.extramode{ background:#fff; border:1px solid #000; color:#000; width:100% } -#postform-t, #oekform{ +#postform-t, +#oekform{ background:#ff0; border:1px solid #000; color:#000; diff --git a/static/css/ib.css b/static/css/ib.css index 17b0f26..468fb6d 100644 --- a/static/css/ib.css +++ b/static/css/ib.css @@ -27,7 +27,7 @@ body[data-brd="2d"], body[data-brd="2d"] textarea { .spoil:hover { color: #fff; } -.postarea table { +#postform-t { margin: 0 auto; text-align: left; line-height: 1em; @@ -51,10 +51,6 @@ select { color: #000; padding: 0; } -select, -#search input { - font-size: 85%; -} #logo { font-size: 160%; font-weight: bold; @@ -63,11 +59,13 @@ select, } input[type="submit"], input[type="button"], -button, -#oekform select { +button { padding: 0 1em; height: 1.7em; } +#oekform select { + height: 1.7em; +} input[type="text"], input[type="password"], textarea { @@ -75,14 +73,16 @@ textarea { border: 1px inset gray; padding: 3px; } -#search input[type="text"] { - width: 80px; +#searchin { + width: 128px; + padding: 2px; } -#search input[type="text"], -#search select { - height: 16px; +#searchin, +#searchbtn, +#main_nav_sel { + font-size: 85%; } -#postform-t input[name="subject"] { +input[name="subject"] { max-width: 300px; } #postform-t textarea { @@ -185,6 +185,9 @@ body:not(.res) .thread.hidden > *, padding: 2px; margin: 3px 0; } +.name { + font-weight: bold; +} .name em { color: #009; font-style: normal; @@ -313,7 +316,7 @@ body:not(.res) .thread.hidden > *, padding: 4px; } #main_nav.mob { - font-size: 12px; + font-size: 14px; line-height: 1em; box-shadow: 0 0 4px #000; position: fixed; @@ -324,9 +327,6 @@ body:not(.res) .thread.hidden > *, padding: 2px; z-index: 9; } - .postarea table { - border-spacing: 1px; - } .pass, .thread td.ell, .thumbmsg, @@ -334,9 +334,12 @@ body:not(.res) .thread.hidden > *, .fs small { display: none; } + #oekform { + line-height: 2em; + } .thread table, #postform input[type="text"], - #postform input[type="submit"], + #sendbtn, #postform textarea, #postform input[type="file"], #filepreview, @@ -344,6 +347,14 @@ body:not(.res) .thread.hidden > *, max-width: 100%; width: 100%; } + #postform-t input, + #postform-t textarea { + border: 0; + } + #sendbtn { + border: 0; + margin-top: 4px; + } .thread table, .thread tbody, .thread tr, @@ -354,10 +365,6 @@ body:not(.res) .thread.hidden > *, .thread td { overflow: hidden; } - #postform-t input[type="submit"] { - height: 2em; - margin-top: 2px; - } .postblock, #rules, .fs, @@ -404,10 +411,7 @@ body:not(.res) .thread.hidden > *, #pg span { padding: 4px; } - #search input { + #searchin { width: initial !important; } - #search span { - display: inline-block; - } } diff --git a/static/css/kraut.css b/static/css/kraut.css index ec1798a..4342608 100644 --- a/static/css/kraut.css +++ b/static/css/kraut.css @@ -16,12 +16,10 @@ body { text-decoration: none; } a, -a .name, .nav label { color: #229; } a:hover, -a:hover .name, .nav label:hover { color: #922; } @@ -51,7 +49,8 @@ a:hover .name, .subj { color: #c33; } -.name { +.info > .name, +.info > .trip { color: #33c; } .omitted, diff --git a/static/css/lavanda.css b/static/css/lavanda.css index 3ae7893..fc5fcbf 100644 --- a/static/css/lavanda.css +++ b/static/css/lavanda.css @@ -4,7 +4,6 @@ body { color:#fff; } a, -a .name, .nav label { color: rgb(179, 155, 211); } @@ -12,7 +11,6 @@ a.rep { color: #fff; } a:hover, -a:hover .name, .nav label:hover { color: rgb(221, 0, 129); } @@ -42,7 +40,8 @@ a:hover .name, .subj { color: #9387c9; } -.name { +.info > .name, +.info > .trip { color: #ca8dcf; } .omitted { diff --git a/static/css/night.css b/static/css/night.css index 725fa99..754a61e 100644 --- a/static/css/night.css +++ b/static/css/night.css @@ -5,7 +5,6 @@ body { font-family: Arial, Helvetica, "Nimbus Sans L", sans-serif; } a, -a .name, .nav label { color: #c0c4c8; } @@ -14,7 +13,6 @@ a.rep { text-decoration: underline; } a:hover, -a:hover .name, .nav label:hover { color: #888c90; } @@ -38,13 +36,14 @@ a:hover .name, background: inherit; color: #962e5f; } -.name { +.info > .name, +.info > .trip { color: #5f962e; } -.name a { +.email { color: #2e5f96; } -.name a:hover { +.email:hover { color: #426fa0; } .reply { diff --git a/static/css/photon.css b/static/css/photon.css index af8f539..8f7896e 100644 --- a/static/css/photon.css +++ b/static/css/photon.css @@ -8,15 +8,11 @@ body { color: #333; } a, -a .name, -a .name b, #logo, .nav label { color: #f60; } a:hover, -a:hover .name, -a:hover .name b, .nav label:hover { color: #0066ff; } @@ -42,12 +38,12 @@ a:hover .name b, .subj { color: #111; } -.name { - color: #f30; -} -.name b { +.info > .name { color: #004a99; } +.info > .trip { + color: #f30; +} .omitted { color: #707070; } @@ -84,4 +80,4 @@ hr { } #main_nav.mob { background: #d9af9e; -}
\ No newline at end of file +} diff --git a/static/css/putaba.css b/static/css/putaba.css index 9dd38be..01d3a22 100644 --- a/static/css/putaba.css +++ b/static/css/putaba.css @@ -19,16 +19,6 @@ a:hover, .nav label:hover { background: #f00; } -a .name, -a .name b { - background: #0cf; - color: #903; -} -a:hover .name, -a:hover .name b { - background: #f33; - color: #fff; -} input[type="button"], input[type="submit"] { background: #eff931; @@ -82,7 +72,7 @@ hr, padding: 10px; overflow: auto; } -.postarea table { +#postform-t { margin: 0 auto 10px; } .info, @@ -121,13 +111,21 @@ hr, color: #909; letter-spacing: -1px; } -.name { +.info > .name { + color: white; + background: black; +} +.info > .trip { color: black; background: white; } -.name b { - color: white; - background: black; +.email { + background: #0cf; + color: #903; +} +.email:hover { + background: #f33; + color: #fff; } .date { background: #ff0; diff --git a/static/css/red.css b/static/css/red.css index 2b75263..07f80c3 100644 --- a/static/css/red.css +++ b/static/css/red.css @@ -5,12 +5,10 @@ body { color: #800000; } a, -a .name, .nav label { color: #00e; } a:hover, -a:hover .name, .nav label:hover { color: #d00; } @@ -33,7 +31,8 @@ a:hover .name, .q { color: #789922; } -.name { +.info > .name, +.info > .trip { color: #036; } .omitted, @@ -68,4 +67,4 @@ a:hover .name, } #main_nav.mob { background: #f99; -}
\ No newline at end of file +} diff --git a/static/css/rene.css b/static/css/rene.css index e13752b..baff3b0 100644 --- a/static/css/rene.css +++ b/static/css/rene.css @@ -8,12 +8,10 @@ body { color: #e0e0e0; } a, -a .name, .nav label { color: #D2D1D1; } a:hover, -a:hover .name, .nav label:hover { color: #686665; } @@ -60,6 +58,9 @@ a:hover .name, #rules a:hover { color: #7B4204; } +.info { + color: #999; +} .q { color: #789922; } @@ -67,9 +68,14 @@ a:hover .name, text-decoration: none; } .subj { - color: #d80000; + color: #f00; +} +.info > .name { + color: #a00; +} +.info > .trip { + color: #ffa500; } -.name, .omitted { color: #a3a3a3; } @@ -109,6 +115,24 @@ hr { border-color: #888; } +.postblock, +input[type="text"], +input[type="submit"], +input[type="password"], +textarea, +#rules, +.thread > a > img, +.reply, +:not(.reply) .yt +{ + box-shadow: 3px 3px #000; +} +#searchin, +#searchbtn +{ + box-shadow: none; +} + @media (max-width: 600px) { #main_nav { margin: -4px -4px 0; diff --git a/static/css/txt/amber.css b/static/css/txt/amber.css index 4f24254..100a4a2 100644 --- a/static/css/txt/amber.css +++ b/static/css/txt/amber.css @@ -23,8 +23,8 @@ h4 { padding: 0 3px; } h4 a, -.name, -.name a { +h4 > .name, +h4 > .trip { color: #000; } h1:after, @@ -129,7 +129,6 @@ button:active { .q { color: #d4b300; } - .yt { background: #000; border: 1px solid #f9690e; diff --git a/static/css/txt/ayashii.css b/static/css/txt/ayashii.css index e4c3343..3103143 100644 --- a/static/css/txt/ayashii.css +++ b/static/css/txt/ayashii.css @@ -3,12 +3,10 @@ body { color: #fff; } a, -a .name, #n2:active { color: #efe; } a:active, -a:active .name, #n2:active { color: #f00; } diff --git a/static/css/txt/baisano.css b/static/css/txt/baisano.css index a5d1a7e..a3ce009 100644 --- a/static/css/txt/baisano.css +++ b/static/css/txt/baisano.css @@ -13,21 +13,13 @@ body.threadpage { background: #efefef; } a, -a .name, #n2 { color: #00f; } a:active, -a:active .name, #n2:active { color: #f00; } -body[data-brd="zonavip"] a .name { - color: #00f; -} -body[data-brd="zonavip"] a .name:active { - color: #f00; -} h2 a { color: #f00; } @@ -70,13 +62,13 @@ h4 { background: #efefef; border: 1px outset #fff; } -.name, +h4 > .name, +h4 > .trip, .abbrev { color: green; } -body[data-brd="zonavip"] .name, -body[data-brd="zonavip"] .abbrev -{ +body[data-brd="zonavip"] h4 > .name, +body[data-brd="zonavip"] h4 > .trip { color: #f00; } .name em { diff --git a/static/css/txt/bbs.css b/static/css/txt/bbs.css index 83d1148..7eb496f 100644 --- a/static/css/txt/bbs.css +++ b/static/css/txt/bbs.css @@ -71,11 +71,6 @@ button { color: #333; padding: 3px 1em; } -input[type="submit"], -input[type="button"], -button { - background: #e8e8e8; -} input[type="submit"]:active, input[type="button"]:active, input[type="button"].active, @@ -158,7 +153,7 @@ label { margin-right: 2px; } #search > input[type="text"] { - padding: 4px; + padding: 6px; max-width: 500px; width: 100%; } @@ -204,6 +199,9 @@ label { font-weight: bold; text-decoration: none; } +.name { + font-weight: bold; +} .name em { font-style: normal; } diff --git a/static/css/txt/berries.css b/static/css/txt/berries.css index fd0e5a0..8337fd3 100644 --- a/static/css/txt/berries.css +++ b/static/css/txt/berries.css @@ -21,14 +21,10 @@ body.threadpage:before { opacity: 0.1; } a, -a .name, #n2 { color: #9d81be; } a:active, -a:focus, -a:active .name, -a:focus .name, #n2:active { color: #5d4d72; } @@ -115,7 +111,8 @@ h4 { .threadpage .thread { color: #ced1cf; } -.name, +h4 > .name, +h4 > .trip, .abbrev { color: #bd689a; } diff --git a/static/css/txt/bios.css b/static/css/txt/bios.css index 2974d57..8542d6e 100644 --- a/static/css/txt/bios.css +++ b/static/css/txt/bios.css @@ -126,14 +126,11 @@ h4 { background: #fff; color: #00a; } -h4 a, -a .name { +h4 a { color: #000; } h4 a:active, -h4 a:focus, -a:active .name, -a:focus .name { +h4 a:focus { color: #fff; } .name em { diff --git a/static/css/txt/blue moon.css b/static/css/txt/blue moon.css index da73058..41e00ce 100644 --- a/static/css/txt/blue moon.css +++ b/static/css/txt/blue moon.css @@ -26,7 +26,6 @@ form a, #main_nav a:active, .reply a:active, #q-p a:active, -a:active .name, .row a:active { color: #8c9fb4; } @@ -136,8 +135,8 @@ h5 { .reply:first-child { border-top: 2px solid #ddd; } -.name, -a .name { +h4 > .name, +h4 > .trip { color: #2b3037; } .name em { @@ -150,7 +149,7 @@ a .name { a.thumb { background: #fff; color: #000080; - margin: 10px; + margin: 12px; } .msg hr { display: block; diff --git a/static/css/txt/ciber.css b/static/css/txt/ciber.css index 12e99a8..fd54221 100644 --- a/static/css/txt/ciber.css +++ b/static/css/txt/ciber.css @@ -30,9 +30,7 @@ h4 { padding: 0 3px; } h4, -h4 a, -.name, -.name a { +h4 a { color: #9370db; } h1, diff --git a/static/css/txt/cuteanarchy.css b/static/css/txt/cuteanarchy.css index a1d7935..de15e56 100644 --- a/static/css/txt/cuteanarchy.css +++ b/static/css/txt/cuteanarchy.css @@ -138,19 +138,17 @@ h3 span { } a, -a .name, #n2 { color: #e39edc; } -.name, -.hidden { +h4 > .name, +h4 > .trip { color: #7ca380; text-shadow: 2px 0 11px #ffd7c6; background-image: url("/static/css/img/bg1.gif"); } -.name, .abbrev { color: #e9b2c8; } diff --git a/static/css/txt/futanari.css b/static/css/txt/futanari.css index 53ac646..3362d57 100644 --- a/static/css/txt/futanari.css +++ b/static/css/txt/futanari.css @@ -3,17 +3,14 @@ body { color: #fff; } a, -a .name, #n2 { color: #dfca89; } a:hover, -a:hover .name, #n2:hover { color: #ffe9a4; } a:active, -a:active .name, #n2:active { color: #d00; } @@ -40,14 +37,13 @@ h2 span, h3 span { color: #ccc; } -input, input[type="text"], textarea, select { - border-top: 1px solid #333; - border-left: 1px solid #333; - border-bottom: 1px solid #ccc; - border-right: 1px solid #ccc; + border-top: 1px solid #000; + border-left: 1px solid #000; + border-bottom: none; + border-right: none; } input[type="submit"], input[type="button"], @@ -56,8 +52,8 @@ button { color: #343b4d; border-top: 1px solid #85c8ff; border-left: 1px solid #85c8ff; - border-bottom: 1px solid #40607c; - border-right: 1px solid #40607c; + border-bottom: 1px solid #10181f; + border-right: 1px solid #10181f; } input[type="submit"]:hover, input[type="button"]:hover, @@ -69,9 +65,9 @@ input[type="button"]:active, input[type="button"].active, button:active { background: #7979a5; - color: #191d25; - border-top: 1px solid #40607c; - border-left: 1px solid #40607c; + color: #10181f; + border-top: 1px solid #10181f; + border-left: 1px solid #10181f; border-bottom: 1px solid #85c8ff; border-right: 1px solid #85c8ff; } @@ -141,7 +137,8 @@ h4:hover { .abbrev { color: #999; } -.name { +h4 > .name, +h4 > .trip { color: #afd775; } .name em { diff --git a/static/css/txt/gamer.css b/static/css/txt/gamer.css index ca7ab43..e579bfa 100644 --- a/static/css/txt/gamer.css +++ b/static/css/txt/gamer.css @@ -5,12 +5,11 @@ body { background: #000 url("../img/g_bg.png") fixed; } a, -.name, -a .name { +h4 > .name, +h4 > .trip { color: #7f6; } -a:active, -a:active .name { +a:active { color: #fff; } h1,h2,h3,h5, diff --git a/static/css/txt/headline.css b/static/css/txt/headline.css index 8e7f1dc..82b908f 100644 --- a/static/css/txt/headline.css +++ b/static/css/txt/headline.css @@ -12,16 +12,16 @@ a, #n2 { color: #d60; } -a:active .name, +a:active, h2 a:active, h4 a:active, -a:active, #n2:active { color: #fa4; } h2 a, +h4 > .name, +h4 > .trip .del a, -.name, h4 a, h4 { color: #000; diff --git a/static/css/txt/mercury.css b/static/css/txt/mercury.css index 37d6778..9323485 100644 --- a/static/css/txt/mercury.css +++ b/static/css/txt/mercury.css @@ -10,7 +10,6 @@ a, color: #32a; } a:active, -a:active .name, h2 a:active, #n2:active { color: #f48; diff --git a/static/css/txt/postal.css b/static/css/txt/postal.css index e0a6dd2..d95e049 100644 --- a/static/css/txt/postal.css +++ b/static/css/txt/postal.css @@ -6,12 +6,10 @@ body { background: #e5b98d; } a, -a .name, #n2 { color: #3683c2; } a:active, -a:active .name, #n2:active { color: #e9976b; } @@ -121,7 +119,8 @@ h4 { border-top: 1px solid #e5b98d; margin: 0 -1px; } -.name, +h4 > .name, +h4 > .trip, .abbrev { color: #416d91; } diff --git a/static/css/txt/ventanas.css b/static/css/txt/ventanas.css index 9fd4984..6fac0fa 100644 --- a/static/css/txt/ventanas.css +++ b/static/css/txt/ventanas.css @@ -20,12 +20,10 @@ body.threadpage, color: white; } a, -a .name, #n2 { color: #00f; } a:active, -a:active .name, #n2:active { color: #f00; } @@ -179,7 +177,8 @@ select:focus { .hidden, .deleted { margin-bottom: 0.5em; } -.name, +h4 > .name, +h4 > .trip, .abbrev { color: #444; } diff --git a/static/css/txt/void.css b/static/css/txt/void.css index a3264a0..5c935f2 100644 --- a/static/css/txt/void.css +++ b/static/css/txt/void.css @@ -41,7 +41,7 @@ input[type="button"].active, button:active, h4, .name, -.name b, +.trip, .date, .posterid, .del a, diff --git a/static/css/vndb.css b/static/css/vndb.css index 734bf5d..b45fdbf 100644 --- a/static/css/vndb.css +++ b/static/css/vndb.css @@ -12,12 +12,10 @@ body { color: #ddd; } a, -a .name, .nav label { color: #77bbdd; } a:hover, -a:hover .name, .nav label:hover { border-bottom: 1px dotted #ddd; text-decoration: none; @@ -66,7 +64,8 @@ input[type="submit"]:active { color: #7bd; } .ell, -.name, +.info > .name, +.info > .trip, .omitted { color: #258; } @@ -121,4 +120,4 @@ hr { #main_nav.mob { border-bottom: 1px solid #258; background: rgba(7, 28, 47, 0.95); -}
\ No newline at end of file +} |