leftypol
/
leftypol
4
5
Fork 2
Code Issues 56 Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:vichan-devel/Tinyboard 

Conflicts:
	stylesheets/style.css
pull/40/head
czaks 10 years ago
parent
1e1a73c4b4 3f652ce9ad
commit
1964279436
4 changed files with 58 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      inc/config.php
  2. 6
      inc/mod/pages.php
  3. 107
      stylesheets/style.css
  4. 2
      templates/post/name.html

12
inc/config.php
View File

@ -529,6 +529,9 @@
// When true, users are instead presented a selectbox for email. Contains, blank, noko and sage. // When true, users are instead presented a selectbox for email. Contains, blank, noko and sage.
$config['field_email_selectbox'] = false; $config['field_email_selectbox'] = false;
// When true, the sage won't be displayed
$config['hide_sage'] = false;
// Attach country flags to posts. // Attach country flags to posts.
$config['country_flags'] = false; $config['country_flags'] = false;
@ -1046,10 +1049,11 @@
$config['error']['unknownext'] = _('Unknown file extension.'); $config['error']['unknownext'] = _('Unknown file extension.');
$config['error']['filesize'] = _('Maximum file size: %maxsz% bytes<br>Your file\'s size: %filesz% bytes'); $config['error']['filesize'] = _('Maximum file size: %maxsz% bytes<br>Your file\'s size: %filesz% bytes');
$config['error']['maxsize'] = _('The file was too big.'); $config['error']['maxsize'] = _('The file was too big.');
$config['error']['webmerror'] = _('There was a problem processing your webm.'); $config['error']['genwebmerror'] = _('There was a problem processing your webm.');
$config['error']['invalidwebm'] = _('Invalid webm uploaded.'); $config['error']['webmerror'] = _('There was a problem processing your webm.');//Is this error used anywhere ?
$config['error']['webmhasaudio'] = _('The uploaded webm contains an audio or another type of additional stream.'); $config['error']['invalidwebm'] = _('Invalid webm uploaded.');
$config['error']['webmtoolong'] = _('The uploaded webm is longer than ' . $config['webm']['max_length'] . ' seconds.'); $config['error']['webmhasaudio'] = _('The uploaded webm contains an audio or another type of additional stream.');
$config['error']['webmtoolong'] = _('The uploaded webm is longer than ' . $config['webm']['max_length'] . ' seconds.');
$config['error']['fileexists'] = _('That file <a href="%s">already exists</a>!'); $config['error']['fileexists'] = _('That file <a href="%s">already exists</a>!');
$config['error']['fileexistsinthread'] = _('That file <a href="%s">already exists</a> in this thread!'); $config['error']['fileexistsinthread'] = _('That file <a href="%s">already exists</a> in this thread!');
$config['error']['delete_too_soon'] = _('You\'ll have to wait another %s before deleting that.'); $config['error']['delete_too_soon'] = _('You\'ll have to wait another %s before deleting that.');

6
inc/mod/pages.php
View File

@ -1567,10 +1567,12 @@ function mod_spoiler_image($board, $post, $file) {
$result = $query->fetch(PDO::FETCH_ASSOC); $result = $query->fetch(PDO::FETCH_ASSOC);
$files = json_decode($result['files']); $files = json_decode($result['files']);
$size_spoiler_image = @getimagesize($config['spoiler_image']);
file_unlink($board . '/' . $config['dir']['thumb'] . $files[$file]->thumb); file_unlink($board . '/' . $config['dir']['thumb'] . $files[$file]->thumb);
$files[$file]->thumb = 'spoiler'; $files[$file]->thumb = 'spoiler';
$files[$file]->thumbheight = 128; $files[$file]->thumbwidth = $size_spoiler[0];
$files[$file]->thumbwidth = 128; $files[$file]->thumbheight = $size_spoiler_image[1];
// Make thumbnail spoiler // Make thumbnail spoiler
$query = prepare(sprintf("UPDATE ``posts_%s`` SET `files` = :files WHERE `id` = :id", $board)); $query = prepare(sprintf("UPDATE ``posts_%s`` SET `files` = :files WHERE `id` = :id", $board));

107
stylesheets/style.css
View File

@ -1,7 +1,7 @@
body { body {
background: #EEF2FF url('img/fade-blue.png') repeat-x 50% 0%; background: #EEF2FF url('img/fade-blue.png') repeat-x 50% 0%;
color: black; color: black;
font-family: arial, helvetica, sans-serif; font-family: arial,helvetica,sans-serif;
font-size: 10pt; font-size: 10pt;
margin: 0 4px; margin: 0 4px;
padding-left: 4px; padding-left: 4px;
@ -12,12 +12,12 @@ table * {
margin: 1px; margin: 1px;
} }
a, a:visited { a,a:visited {
text-decoration: underline; text-decoration: underline;
color: #34345C; color: #34345C;
} }
a:hover, p.intro a.post_no:hover { a:hover,p.intro a.post_no:hover {
color: #ff0000; color: #ff0000;
} }
@ -31,9 +31,7 @@ p.intro a.post_no {
color: inherit; color: inherit;
} }
p.intro a.post_no, p.intro a.post_no,p.intro a.email,p.intro a.post_anchor {
p.intro a.email,
p.intro a.post_anchor {
margin: 0; margin: 0;
} }
@ -49,7 +47,7 @@ p.intro label {
display: inline; display: inline;
} }
p.intro time, p.intro a.ip-link, p.intro a.capcode { p.intro time,p.intro a.ip-link,p.intro a.capcode {
direction: ltr; direction: ltr;
unicode-bidi: embed; unicode-bidi: embed;
} }
@ -72,7 +70,7 @@ h1 {
margin: 0; margin: 0;
} }
header div.subtitle, h1 { header div.subtitle,h1 {
color: #AF0A0F; color: #AF0A0F;
text-align: center; text-align: center;
} }
@ -93,7 +91,7 @@ form table input {
height: auto; height: auto;
} }
input[type="text"], input[type="password"], textarea { input[type="text"],input[type="password"],textarea {
border: 1px solid #a9a9a9; border: 1px solid #a9a9a9;
text-indent: 0; text-indent: 0;
text-shadow: none; text-shadow: none;
@ -140,7 +138,7 @@ form table tr td div label {
font-size: 10px; font-size: 10px;
} }
.unimportant, .unimportant * { .unimportant,.unimportant * {
font-size: 10px; font-size: 10px;
} }
@ -174,7 +172,7 @@ div.banner {
margin: 1em 0; margin: 1em 0;
} }
div.banner, div.banner a { div.banner,div.banner a {
color: white; color: white;
} }
@ -183,7 +181,7 @@ div.banner a:hover {
text-decoration: none; text-decoration: none;
} }
img.banner, img.board_image { img.banner,img.board_image {
display: block; display: block;
border: 1px solid #a9a9a9; border: 1px solid #a9a9a9;
margin: 12px auto 0 auto; margin: 12px auto 0 auto;
@ -225,7 +223,6 @@ p.intro {
margin: 0.5em 0; margin: 0.5em 0;
padding: 0; padding: 0;
padding-bottom: 0.2em; padding-bottom: 0.2em;
clear: both;
} }
input.delete { input.delete {
@ -243,7 +240,7 @@ p.intro span.name {
font-weight: bold; font-weight: bold;
} }
p.intro span.capcode, p.intro a.capcode, p.intro a.nametag { p.intro span.capcode,p.intro a.capcode,p.intro a.nametag {
color: #F00000; color: #F00000;
margin-left: 0; margin-left: 0;
} }
@ -276,7 +273,6 @@ div.post.reply div.body a {
} }
div.post { div.post {
max-width: 95%;
padding-left: 20px; padding-left: 20px;
} }
@ -293,7 +289,6 @@ div.post.reply {
border-style: none solid solid none; border-style: none solid solid none;
border-color: #B7C5D9; border-color: #B7C5D9;
display: inline-block; display: inline-block;
max-width: 95%;
} }
span.trip { span.trip {
@ -342,7 +337,7 @@ div.ban {
margin: 30px auto; margin: 30px auto;
} }
div.ban p, div.ban h2 { div.ban p,div.ban h2 {
padding: 3px 7px; padding: 3px 7px;
} }
@ -377,7 +372,7 @@ div.post.reply div.body span.spoiler a {
color: black; color: black;
} }
span.spoiler:hover, div.post.reply div.body span.spoiler:hover a { span.spoiler:hover,div.post.reply div.body span.spoiler:hover a {
color: white; color: white;
} }
@ -398,7 +393,7 @@ table.test {
width: 100%; width: 100%;
} }
table.test td, table.test th { table.test td,table.test th {
text-align: left; text-align: left;
padding: 5px; padding: 5px;
} }
@ -436,7 +431,7 @@ div.pages.top {
@media screen and (max-width: 800px) { @media screen and (max-width: 800px) {
div.pages.top { div.pages.top {
display: none !important; display: none!important;
} }
} }
@ -506,7 +501,7 @@ table.modlog tr th {
background: #98E; background: #98E;
} }
td.minimal, th.minimal { td.minimal,th.minimal {
width: 1%; width: 1%;
white-space: nowrap; white-space: nowrap;
} }
@ -554,7 +549,6 @@ table.mod.config-editor input[type="text"] {
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
/*text-shadow: white 1px 0 6px, white 1px 0 6px, black 1px 0 3px;*/
margin-top: 0; margin-top: 0;
z-index: 30; z-index: 30;
box-shadow: 0 1px 2px rgba(0, 0, 0, .15); box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
@ -562,11 +556,6 @@ table.mod.config-editor input[type="text"] {
background-color: #D6DAF0; background-color: #D6DAF0;
} }
/*.desktop-style div.boardlist:nth-child(1):hover, .desktop-style div.boardlist:nth-child(1).cb-menu {
>>>>>>> f3d7ef5801ae050ed2338156d888c6ed858789a9
background-color: rgba(90%, 90%, 90%, 0.6);
}*/
.desktop-style body { .desktop-style body {
padding-top: 20px; padding-top: 20px;
} }
@ -582,7 +571,7 @@ table.mod.config-editor input[type="text"] {
background: url('img/arrow.png') right center no-repeat; background: url('img/arrow.png') right center no-repeat;
} }
.desktop-style .sub .sub:hover, .desktop-style .sub .sub.hover { .desktop-style .sub .sub:hover,.desktop-style .sub .sub.hover {
display: inline; display: inline;
text-indent: 0; text-indent: 0;
background: inherit; background: inherit;
@ -611,7 +600,7 @@ table.mod.config-editor input[type="text"] {
} }
#attention_bar:hover { #attention_bar:hover {
background-color: rgba(100%, 100%, 100%, 0.2); background-color: rgba(100%,100%,100%,0.2);
} }
p.intro.thread-hidden { p.intro.thread-hidden {
@ -627,13 +616,21 @@ form.ban-appeal textarea {
display: block; display: block;
} }
.MathJax_Display {
display: inline!important;
}
pre {
margin: 0;
}
.theme-catalog div.thread img { .theme-catalog div.thread img {
float: none!important; float: none!important;
margin: auto; margin: auto;
max-height: 150px; max-height: 150px;
max-width: 200px; max-width: 200px;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.55); box-shadow: 0 0 4px rgba(0,0,0,0.55);
border: 2px solid rgba(153, 153, 153, 0); border: 2px solid rgba(153,153,153,0);
} }
.theme-catalog div.thread { .theme-catalog div.thread {
@ -650,8 +647,8 @@ form.ban-appeal textarea {
position: relative; position: relative;
font-size: 11px; font-size: 11px;
max-height: 300px; max-height: 300px;
background: rgba(182, 182, 182, 0.12); background: rgba(182,182,182,0.12);
border: 2px solid rgba(111, 111, 111, 0.34); border: 2px solid rgba(111,111,111,0.34);
} }
.theme-catalog div.thread strong { .theme-catalog div.thread strong {
@ -669,36 +666,33 @@ div.thread:hover {
} }
.theme-catalog div.grid-size-vsmall img { .theme-catalog div.grid-size-vsmall img {
max-height: 64px; max-height: 33%;
max-width: 100px; max-width: 95%
} }
.theme-catalog div.grid-size-vsmall { .theme-catalog div.grid-size-vsmall {
width: 100px; min-width:90px; max-width: 90px;
max-width: 100px; max-height: 148px;
max-height: 150px;
} }
.theme-catalog div.grid-size-small img { .theme-catalog div.grid-size-small img {
max-height: 128px; max-height: 33%;
max-width: 225px; max-width: 95%
} }
.theme-catalog div.grid-size-small { .theme-catalog div.grid-size-small {
width: 200px; min-width:140px; max-width: 140px;
max-width: 225px; max-height: 192px;
max-height: 300px;
} }
.theme-catalog div.grid-size-large img { .theme-catalog div.grid-size-large img {
max-height: 148px; max-height: 40%;
max-width: 300px; max-width: 95%
} }
.theme-catalog div.grid-size-large { .theme-catalog div.grid-size-large {
width: 300px; min-width: 256px; max-width: 256px;
max-width: 300px; max-height: 384px;
max-height: 450px;
} }
.theme-catalog img.thread-image { .theme-catalog img.thread-image {
@ -746,7 +740,6 @@ div.thread:hover {
padding: 5px 6px 8px 6px; padding: 5px 6px 8px 6px;
} }
/* styles also used by watch.js */
.cb-menuitem { .cb-menuitem {
display: table-row; display: table-row;
} }
@ -755,7 +748,7 @@ div.thread:hover {
padding: 5px; padding: 5px;
display: table-cell; display: table-cell;
text-align: left; text-align: left;
border-top: 1px solid rgba(0, 0, 0, 0.5); border-top: 1px solid rgba(0,0,0,0.5);
} }
.cb-menuitem span.cb-uri { .cb-menuitem span.cb-uri {
@ -787,7 +780,6 @@ div.thread:hover {
vertical-align: middle; vertical-align: middle;
} }
/* live-index.js */
.new-posts { .new-posts {
opacity: 0.6; opacity: 0.6;
margin-top: 1em; margin-top: 1em;
@ -797,7 +789,6 @@ div.thread:hover {
text-align: center; text-align: center;
} }
/* options.js */
#options_handler { #options_handler {
position: fixed; position: fixed;
top: 0px; top: 0px;
@ -897,15 +888,8 @@ div.thread:hover {
word-wrap: break-word; word-wrap: break-word;
} }
pre { .poster_id {
width: 99%; cursor: pointer;
padding: 0;
margin: 0;
overflow:auto;
}
.poster_id{
cursor: pointer;
} }
code > pre { code > pre {
@ -918,7 +902,6 @@ code > pre > span.pln {
color: grey; color: grey;
} }
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
p.intro { p.intro {
clear: none; clear: none;

2
templates/post/name.html
View File

@ -1,5 +1,5 @@
{% set capcode = post.capcode|capcode %} {% set capcode = post.capcode|capcode %}
{% if post.email|length > 0 %} {% if post.email|length > 0 and (config.hide_sage!=true or post.email!='sage') %}
{# start email #} {# start email #}
<a class="email" href="mailto:{{ post.email }}"> <a class="email" href="mailto:{{ post.email }}">
{% endif %} {% endif %}

Write Preview
Loading…
Cancel
Save