diff --git a/frontend/src/qr.js b/frontend/src/qr.js index 8edcf051..52bf5eab 100755 --- a/frontend/src/qr.js +++ b/frontend/src/qr.js @@ -120,7 +120,7 @@ export function initQR(pageThread) { } export function openQR() { - if($qr) $qr.insertAfter("div#footer"); + if($qr) $qr.insertAfter("div#content"); } window.openQR = openQR; diff --git a/html/css/burichan.css b/html/css/burichan.css index 9342a63f..e4663ebb 100644 --- a/html/css/burichan.css +++ b/html/css/burichan.css @@ -117,8 +117,7 @@ div#topbar, .topbar-item, .topbar-item:visited, .dropdown-button, -.dropdown-menu, -.dropdown-menu a { +.dropdown-menu { background: #000A89; color: #EEF2FF; } diff --git a/html/css/clear.css b/html/css/clear.css index c6d0a698..d6e9fcd7 100644 --- a/html/css/clear.css +++ b/html/css/clear.css @@ -27,22 +27,20 @@ hr { height: 0; } -input, select, textarea { +div#content input, div#content select, div#content textarea { border: 1px double #07371F; border-radius: 5px; background: #DDD; color: #000; } - -input:active, select:active, textarea:active { +div#content input:active, div#content select:active, div#content textarea:active { -webkit-filter: drop-shadow(0px 0px 5px #117743); filter: drop-shadow(0px 0px 5px #117743); } - -input[type=button], -input[type=submit], -input[type=file]::file-selector-button, -input[type=file]::-webkit-file-upload-button { +div#content input[type=button], +div#content input[type=submit], +div#content input[type=file]::file-selector-button, +div#content input[type=file]::webkit-file-upload-button { background: #A7A7A7; border: 3px double #07371F; border-radius: 5px; diff --git a/html/css/dark.css b/html/css/dark.css index fe274355..a7ca8ac3 100644 --- a/html/css/dark.css +++ b/html/css/dark.css @@ -22,8 +22,8 @@ header { color: #32DD72; } -input:not(div#qrbuttons input), -textarea { +div#content input:not(div#qrbuttons input), +div#content textarea, div#content select { background: #333; border: 1px solid #666; color: #CCC; @@ -36,14 +36,9 @@ th.postblock { text-align: left; } -select.post-actions { - color: #999; -} - div.reply, div.postprev, -div.inlinepostprev, -select.post-actions { +div.inlinepostprev { background: #333; border: 1px solid #555; border-radius: 5px; diff --git a/html/css/pipes.css b/html/css/pipes.css index cd5d5c54..0ded98b8 100644 --- a/html/css/pipes.css +++ b/html/css/pipes.css @@ -81,10 +81,10 @@ img.thumbnail { color: #FC0; } -input:not([type=submit]):not([type=button]), -textarea, -select#changepage, -select.post-actions { +div#content input:not([type=submit]):not([type=button]), +div#content textarea, +div#content select#changepage, +div#content select.post-actions { background: #25272D; border: 1px solid #8C94AB; color: #FFF; diff --git a/html/css/win9x.css b/html/css/win9x.css index 499e798b..3f4a8733 100644 --- a/html/css/win9x.css +++ b/html/css/win9x.css @@ -68,10 +68,10 @@ div#topbar a { cursor: default; } -button, -input[type=button], -input[role=pushbutton], -input[type=submit] { +div#content button, +div#content input[type=button], +div#content input[role=pushbutton], +div#content input[type=submit] { color: #000 !important; /* font-size: 12px!important; */ background: silver !important; @@ -84,9 +84,9 @@ input[type=submit] { padding: 0 12px; } -button:active, -input[type=button]:active, -input[type=submit]:active { +div#content button:active, +div#content input[type=button]:active, +div#content input[type=submit]:active { box-shadow: inset -1px -1px #fff, inset 1px 1px #0a0a0a, inset -2px -2px #dfdfdf, inset 2px 2px #808080 !important; } @@ -148,7 +148,7 @@ h1, h2, div.subtitle, a#qrDisplayButton { font-family: Arial, sans-serif; } -select { +div#content select { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='16' height='17' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15 0H0v16h1V1h14V0z' fill='%23DFDFDF'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M2 1H1v14h1V2h12V1H2z' fill='%23fff'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M16 17H0v-1h15V0h1v17z' fill='%23000'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15 1h-1v14H1v1h14V1z' fill='gray'/%3E%3Cpath fill='silver' d='M2 2h12v13H2z'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M11 6H4v1h1v1h1v1h1v1h1V9h1V8h1V7h1V6z' fill='%23000'/%3E%3C/svg%3E"); appearance: none; -webkit-appearance: none; diff --git a/sass/burichan.scss b/sass/burichan.scss index b5825dac..c2e504a2 100644 --- a/sass/burichan.scss +++ b/sass/burichan.scss @@ -56,8 +56,8 @@ div#topbar, .topbar-item, .topbar-item:visited, .dropdown-button, -.dropdown-menu, -.dropdown-menu a { +.dropdown-menu/* , +.dropdown-menu a */{ background: #000A89; color: $bgcol; } diff --git a/sass/clear.scss b/sass/clear.scss index a5ed66f2..104cbe30 100644 --- a/sass/clear.scss +++ b/sass/clear.scss @@ -30,27 +30,29 @@ hr { height: 0; } -input, select, textarea { - border: 1px double $inputshadow; - border-radius: 5px; - background: $inputcol; - color: #000; +div#content { + input, select, textarea { + border: 1px double $inputshadow; + border-radius: 5px; + background: $inputcol; + color: #000; + } + input:active, select:active, textarea:active { + // box-shadow: 0px 0px 5px $replyborder; + @include shadow-filter(0px 0px 5px $replyborder); + } + input[type="button"], + input[type="submit"], + input[type="file"]::file-selector-button, + input[type="file"]::webkit-file-upload-button { + background: #A7A7A7; + border: 3px double $inputshadow; + border-radius: 5px; + color: #000; + } } -input:active, select:active, textarea:active { - // box-shadow: 0px 0px 5px $replyborder; - @include shadow-filter(0px 0px 5px $replyborder); -} -input[type="button"], -input[type="submit"], -input[type="file"]::file-selector-button, -input[type="file"]::-webkit-file-upload-button { - background: #A7A7A7; - border: 3px double $inputshadow; - border-radius: 5px; - color: #000; -} div.reply, div.section-block, diff --git a/sass/dark.scss b/sass/dark.scss index bbf3199c..5e0a8ad8 100644 --- a/sass/dark.scss +++ b/sass/dark.scss @@ -24,12 +24,14 @@ header { color: $headercol; } -// input:not([type=submit]):not([type=button]), -input:not(div#qrbuttons input), -textarea { - background: $inputbg; - border: 1px solid $topbarbg; - color: $linkcol; +div#content { + // input:not([type=submit]):not([type=button]), + input:not(div#qrbuttons input), + textarea, select { + background: $inputbg; + border: 1px solid $topbarbg; + color: $linkcol; + } } th.postblock { @@ -39,14 +41,13 @@ th.postblock { text-align: left; } -select.post-actions { - color: $color; -} +// select.post-actions { +// color: $color; +// } div.reply, div.postprev, -div.inlinepostprev, -select.post-actions { +div.inlinepostprev { background: $inputbg; border: 1px solid $replyborder; border-radius: 5px; diff --git a/sass/pipes/_img.scss b/sass/pipes/_img.scss index cd5c198b..5b77ed7e 100644 --- a/sass/pipes/_img.scss +++ b/sass/pipes/_img.scss @@ -39,11 +39,13 @@ img.thumbnail { color: #FC0; } -input:not([type=submit]):not([type=button]), -textarea, -select#changepage, -select.post-actions { - background: #25272D; - border: 1px solid #8C94AB; - color: #FFF; +div#content { + input:not([type=submit]):not([type=button]), + textarea, + select#changepage, + select.post-actions { + background: #25272D; + border: 1px solid #8C94AB; + color: #FFF; + } } diff --git a/sass/win9x.scss b/sass/win9x.scss index ea667b72..127c3ad7 100755 --- a/sass/win9x.scss +++ b/sass/win9x.scss @@ -65,26 +65,30 @@ div#topbar a { cursor: default; } -button, -input[type=button], -input[role=pushbutton], -input[type=submit] { - color: $txtcol!important; - /* font-size: 12px!important; */ - background: silver!important; - box-shadow: $bar-shadow; - box-sizing: border-box; - border: none!important; - border-radius: 0!important; - min-width: 75px; - min-height: 22px; - padding: 0 12px; +div#content { + button, + input[type=button], + input[role=pushbutton], + input[type=submit] { + color: $txtcol!important; + /* font-size: 12px!important; */ + background: silver!important; + box-shadow: $bar-shadow; + box-sizing: border-box; + border: none!important; + border-radius: 0!important; + min-width: 75px; + min-height: 22px; + padding: 0 12px; + } } -button:active, -input[type=button]:active, -input[type=submit]:active { - box-shadow: inset -1px -1px #fff, inset 1px 1px #0a0a0a, inset -2px -2px #dfdfdf, inset 2px 2px #808080!important; +div#content { + button:active, + input[type=button]:active, + input[type=submit]:active { + box-shadow: inset -1px -1px #fff, inset 1px 1px #0a0a0a, inset -2px -2px #dfdfdf, inset 2px 2px #808080!important; + } } div#qr-title { @@ -148,7 +152,7 @@ h1, h2, div.subtitle, a#qrDisplayButton { font-family: Arial, sans-serif; } -select { +div#content select { background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg width='16' height='17' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15 0H0v16h1V1h14V0z' fill='%23DFDFDF'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M2 1H1v14h1V2h12V1H2z' fill='%23fff'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M16 17H0v-1h15V0h1v17z' fill='%23000'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15 1h-1v14H1v1h14V1z' fill='gray'/%3E%3Cpath fill='silver' d='M2 2h12v13H2z'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M11 6H4v1h1v1h1v1h1v1h1V9h1V8h1V7h1V6z' fill='%23000'/%3E%3C/svg%3E"); appearance: none; -webkit-appearance: none; diff --git a/templates/boardpage.html b/templates/boardpage.html index 76097ef6..5e5b2748 100644 --- a/templates/boardpage.html +++ b/templates/boardpage.html @@ -7,7 +7,6 @@ Board catalog
{{- template "postbox.html" . -}}
-
{{$global := .}} {{- range $t, $thread := .threads}}{{$op := $thread.OP}} @@ -60,5 +59,4 @@ {{- end}}]
- {{- template "page_footer.html" .}} diff --git a/templates/catalog.html b/templates/catalog.html index ddc6309e..cff018f4 100644 --- a/templates/catalog.html +++ b/templates/catalog.html @@ -14,7 +14,7 @@
-
{{range $_,$thread := .threads}} + {{range $_,$thread := .threads}}
{{if eq $thread.Filename ""}}(No file){{else if eq $thread.Filename "deleted"}}(File deleted){{else}} @@ -22,6 +22,5 @@ {{end}}
{{if eq $thread.Name ""}}Anonymous{{else}}{{$thread.Name}}{{end}} | R: {{numReplies $.board.ID $thread.ID}}
{{$thread.MessageHTML}} -
{{end}} -
+ {{end}}
{{template "page_footer.html" .}} diff --git a/templates/manage_bans.html b/templates/manage_bans.html index f560121e..0f803120 100644 --- a/templates/manage_bans.html +++ b/templates/manage_bans.html @@ -1,4 +1,3 @@ -
User filter:
@@ -30,5 +29,4 @@ {{range $b, $ban := $.banlist}} -{{end}}
IPName!TripcodeReasonStaff noteBoardsStaffSetExpiresPermaban
{{$ban.IP}}{{$ban.Name}}{{$ban.Reason}}{{$ban.StaffNote}}{{if eq $ban.Boards ""}}all boards{{else}}{{$ban.Boards}}{{end}}{{$ban.Staff}}{{$ban.Timestamp}}{{if $ban.Permaban}}never{{else}}{{$ban.Expires}}{{end}}{{$ban.Permaban}}
-
\ No newline at end of file +{{end}} \ No newline at end of file diff --git a/templates/manage_boards.html b/templates/manage_boards.html index 9d43c292..25ec480d 100644 --- a/templates/manage_boards.html +++ b/templates/manage_boards.html @@ -1,4 +1,3 @@ -
{{with $.boards}}{{else}} @@ -175,4 +174,3 @@ {{- end -}} -
diff --git a/templates/manage_config.html b/templates/manage_config.html index 82bc9c94..168d0f19 100644 --- a/templates/manage_config.html +++ b/templates/manage_config.html @@ -1,4 +1,3 @@ -
{{if ne .status ""}}{{.status}}
{{end}} Some fields omitted because they can not be (safely) edited from the web interface while Gochan is running. Edit these directly in gochan.json, then restart Gochan.
@@ -8,4 +7,3 @@ Edit these directly in gochan.json, then restart Gochan.
{{generateConfigTable}}
-
diff --git a/templates/manage_dashboard.html b/templates/manage_dashboard.html index 61cac501..0698e0b4 100644 --- a/templates/manage_dashboard.html +++ b/templates/manage_dashboard.html @@ -1,4 +1,3 @@ -
Announcements {{range $a, $announcement := $.announcements}}
@@ -28,4 +27,3 @@ {{end}}
-
diff --git a/templates/manage_login.html b/templates/manage_login.html index 22876b50..25ff4fe0 100644 --- a/templates/manage_login.html +++ b/templates/manage_login.html @@ -1,4 +1,3 @@ -
@@ -7,4 +6,3 @@

-
diff --git a/templates/manage_recentposts.html b/templates/manage_recentposts.html index 78ecce2d..8d51026a 100644 --- a/templates/manage_recentposts.html +++ b/templates/manage_recentposts.html @@ -1,4 +1,3 @@ -