diff --git a/README.md b/README.md index f7dae832..ae00bd50 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,10 @@ The initial code-base was forked from one of my side projects, but has now gone Discord Server: https://discord.gg/eyYvtTf +If you like this software, please give it a star and give us some feedback :) + +If you dislike it, please give us some feedback on how to make it better! We're always looking for feedback. We love hearing your opinions. If there's something missing or something doesn't look quite right, don't worry! We plan to change many things before the alpha! + # Features Basic Forum Functionality. All of the little things you would expect of any forum software. E.g. Moderation, Custom Themes, Avatars, and so on. diff --git a/images/cosmo-profiles.PNG b/images/cosmo-profiles.PNG new file mode 100644 index 00000000..1511d67c Binary files /dev/null and b/images/cosmo-profiles.PNG differ diff --git a/images/plugin_bbcode_invalidurl.PNG b/images/plugin_bbcode_invalidurl.PNG new file mode 100644 index 00000000..9366c13f Binary files /dev/null and b/images/plugin_bbcode_invalidurl.PNG differ diff --git a/images/profiles.PNG b/images/profiles.PNG deleted file mode 100644 index 1e63c3f8..00000000 Binary files a/images/profiles.PNG and /dev/null differ diff --git a/images/tempra-conflux-mobile-320px.png b/images/tempra-conflux-mobile-320px.png new file mode 100644 index 00000000..26a786ef Binary files /dev/null and b/images/tempra-conflux-mobile-320px.png differ diff --git a/images/laptop-1440px.PNG b/images/tempra-simple-laptop-1440px.png similarity index 100% rename from images/laptop-1440px.PNG rename to images/tempra-simple-laptop-1440px.png diff --git a/images/mobile-320px.PNG b/images/tempra-simple-mobile-320px.png similarity index 100% rename from images/mobile-320px.PNG rename to images/tempra-simple-mobile-320px.png diff --git a/images/mobile-375px.PNG b/images/tempra-simple-mobile-375px.png similarity index 100% rename from images/mobile-375px.PNG rename to images/tempra-simple-mobile-375px.png diff --git a/images/mobile-425px.PNG b/images/tempra-simple-mobile-425px.png similarity index 100% rename from images/mobile-425px.PNG rename to images/tempra-simple-mobile-425px.png diff --git a/images/tempra-simple-profiles.PNG b/images/tempra-simple-profiles.PNG new file mode 100644 index 00000000..c6cd0f05 Binary files /dev/null and b/images/tempra-simple-profiles.PNG differ diff --git a/images/tempra-simple-profiles2.png b/images/tempra-simple-profiles2.png new file mode 100644 index 00000000..c08fa6a2 Binary files /dev/null and b/images/tempra-simple-profiles2.png differ diff --git a/images/tablet-1024px.PNG b/images/tempra-simple-tablet-1024px.png similarity index 100% rename from images/tablet-1024px.PNG rename to images/tempra-simple-tablet-1024px.png diff --git a/images/tablet-768px.PNG b/images/tempra-simple-tablet-768px.png similarity index 100% rename from images/tablet-768px.PNG rename to images/tempra-simple-tablet-768px.png diff --git a/plugin_bbcode.go b/plugin_bbcode.go index 4caa8d40..ce230aa0 100644 --- a/plugin_bbcode.go +++ b/plugin_bbcode.go @@ -1,7 +1,14 @@ package main +//import "log" +//import "fmt" +import "bytes" //import "strings" import "regexp" +var bbcode_invalid_url []byte +var bbcode_url_open []byte +var bbcode_url_open2 []byte +var bbcode_url_close []byte var bbcode_bold *regexp.Regexp var bbcode_italic *regexp.Regexp var bbcode_underline *regexp.Regexp @@ -14,8 +21,13 @@ func init() { } func init_bbcode() { - plugins["bbcode"].AddHook("parse_assign", bbcode_parse_without_code) - //plugins["bbcode"].AddHook("parse_assign", bbcode_full_parse) + //plugins["bbcode"].AddHook("parse_assign", bbcode_parse_without_code) + plugins["bbcode"].AddHook("parse_assign", bbcode_full_parse) + + bbcode_invalid_url = []byte("[Invalid URL]") + bbcode_url_open = []byte("") + bbcode_url_close = []byte("") bbcode_bold = regexp.MustCompile(`(?s)\[b\](.*)\[/b\]`) bbcode_italic = regexp.MustCompile(`(?s)\[i\](.*)\[/i\]`) @@ -27,8 +39,8 @@ func init_bbcode() { } func deactivate_bbcode() { - plugins["bbcode"].RemoveHook("parse_assign", bbcode_parse_without_code) - //plugins["bbcode"].RemoveHook("parse_assign", bbcode_full_parse) + //plugins["bbcode"].RemoveHook("parse_assign", bbcode_parse_without_code) + plugins["bbcode"].RemoveHook("parse_assign", bbcode_full_parse) } func bbcode_regex_parse(data interface{}) interface{} { @@ -147,13 +159,12 @@ func bbcode_parse_without_code(data interface{}) interface{} { closer := []byte("") msgbytes = append(msgbytes, closer...) } - msg = string(msgbytes) if complex_bbc { msg = bbcode_url.ReplaceAllString(msg,"$1$2//$3") msg = bbcode_url_label.ReplaceAllString(msg,"$4") } - return msg + return string(msgbytes) } // Does every type of BBCode @@ -233,13 +244,73 @@ func bbcode_full_parse(data interface{}) interface{} { closer := []byte("") msgbytes = append(msgbytes, closer...) } - msg = string(msgbytes) if complex_bbc { - msg = bbcode_url.ReplaceAllString(msg,"$1$2//$3") + var start int + var lastTag int + var outbytes []byte + for i := 0; i < len(msgbytes); i++ { + MainLoop: + if msgbytes[i] == '[' { + OuterComplex: + if msgbytes[i + 1] == 'u' { + if msgbytes[i + 2] == 'r' && msgbytes[i + 3] == 'l' && msgbytes[i + 4] == ']' { + outbytes = append(outbytes, msgbytes[lastTag:i]...) + start = i + 5 + i = start + if msgbytes[i] == 'h' { + if msgbytes[i + 1] == 't' && msgbytes[i + 2] == 't' && msgbytes[i + 3] == 'p' { + if bytes.Equal(msgbytes[i + 4:i + 7],[]byte("s://")) { + i += 7 + } else if msgbytes[i + 4] == ':' && msgbytes[i + 5] == '/' && msgbytes[i + 6] == '/' { + i += 6 + } else { + outbytes = append(outbytes, bbcode_invalid_url...) + continue + } + } + } else if msgbytes[i] == 'f' { + if bytes.Equal(msgbytes[i + 1:i + 5],[]byte("tp://")) { + i += 5 + } + } + + for ;; i++ { + if msgbytes[i] == '[' { + if !bytes.Equal(msgbytes[i + 1:i + 6],[]byte("/url]")) { + //log.Print("Not the URL closing tag!") + //fmt.Println(msgbytes[i + 1:i + 6]) + goto OuterComplex + } + break + } else if msgbytes[i] != '\\' && msgbytes[i] != '_' && !(msgbytes[i] > 44 && msgbytes[i] < 58) && !(msgbytes[i] > 64 && msgbytes[i] < 91) && !(msgbytes[i] > 96 && msgbytes[i] < 123) { + outbytes = append(outbytes, bbcode_invalid_url...) + //log.Print("Weird character") + //fmt.Println(msgbytes[i]) + goto MainLoop + } + } + outbytes = append(outbytes, bbcode_url_open...) + outbytes = append(outbytes, msgbytes[start:i]...) + outbytes = append(outbytes, bbcode_url_open2...) + outbytes = append(outbytes, msgbytes[start:i]...) + outbytes = append(outbytes, bbcode_url_close...) + i += 6 + lastTag = i + } + } + } + } + if len(outbytes) != 0 { + return string(outbytes) + } + + msg = string(msgbytes) + //msg = bbcode_url.ReplaceAllString(msg,"$1$2//$3") msg = bbcode_url_label.ReplaceAllString(msg,"$4") - //msg = strings.Replace(msg,"[code]","",-1) - //msg = strings.Replace(msg,"[/code]","",-1) + // Convert [code] into class="codequotes" + } else { + msg = string(msgbytes) } return msg } \ No newline at end of file diff --git a/routes.go b/routes.go index f076f5c8..c5bb014a 100644 --- a/routes.go +++ b/routes.go @@ -109,7 +109,7 @@ func route_topics(w http.ResponseWriter, r *http.Request){ } if topicItem.Is_Closed { - topicItem.Status = "shut" + topicItem.Status = "closed" } else { topicItem.Status = "open" } @@ -183,7 +183,7 @@ func route_forum(w http.ResponseWriter, r *http.Request){ } if topicItem.Is_Closed { - topicItem.Status = "shut" + topicItem.Status = "closed" } else { topicItem.Status = "open" } @@ -297,7 +297,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){ topic.ContentLines = strings.Count(content,"\n") if topic.Is_Closed { - topic.Status = "shut" + topic.Status = "closed" // We don't want users posting in locked topics... if !user.Is_Mod { diff --git a/template_forum.go b/template_forum.go index 36b87421..89cc1ca9 100644 --- a/template_forum.go +++ b/template_forum.go @@ -86,7 +86,7 @@ w.Write([]byte(`background-color: #eaeaea;`)) w.Write([]byte(`"> ` + item.Title + ` `)) if item.Is_Closed { -w.Write([]byte(`shut +w.Write([]byte(`closed `)) } else { w.Write([]byte(`open`)) diff --git a/template_profile.go b/template_profile.go index 18abf87c..5c02a28d 100644 --- a/template_profile.go +++ b/template_profile.go @@ -66,7 +66,7 @@ w.Write([]byte(`
` + item + `
`)) } w.Write([]byte(`
-
+
` + tmpl_profile_vars.ProfileOwner.Name + ``)) if tmpl_profile_vars.ProfileOwner.Tag != "" { @@ -95,12 +95,11 @@ w.Write([]byte(`
Comments
-
- `)) +
`)) if len(tmpl_profile_vars.ItemList) != 0 { for _, item := range tmpl_profile_vars.ItemList { w.Write([]byte(` -
- ` + string(item.ContentHtml) + ` + ` + string(item.ContentHtml) + `

` + item.CreatedByName + ` `)) @@ -124,28 +123,28 @@ if item.Tag != "" { w.Write([]byte(`` + item.Tag + ``)) } w.Write([]byte(` -
`)) +
+`)) } } -w.Write([]byte(` -
+w.Write([]byte(`
+
`)) if !tmpl_profile_vars.CurrentUser.Is_Banned { w.Write([]byte(` -
-
- -
-
-
-
-
-
-
-
+
+ +
+
+
+
+
+
+
`)) } w.Write([]byte(` +
diff --git a/template_topic.go b/template_topic.go index f0142925..3d5c520a 100644 --- a/template_topic.go +++ b/template_topic.go @@ -1,8 +1,8 @@ /* This file was automatically generated by the software. Please don't edit it as your changes may be overwritten at any moment. */ package main -import "html/template" import "io" import "strconv" +import "html/template" func init() { template_topic_handle = template_topic @@ -78,8 +78,11 @@ w.Write([]byte(` style="background-color: #eaeaea;"`)) } w.Write([]byte(`> ` + tmpl_topic_vars.Topic.Title + ` - ` + tmpl_topic_vars.Topic.Status + ` - Status + `)) +if tmpl_topic_vars.Topic.Is_Closed { +w.Write([]byte(`🔒︎`)) +} +w.Write([]byte(` `)) if tmpl_topic_vars.CurrentUser.Is_Mod { w.Write([]byte(` @@ -96,7 +99,7 @@ w.Write([]byte(` `)) diff --git a/template_topic_alt.go b/template_topic_alt.go index de94884f..4bca87b4 100644 --- a/template_topic_alt.go +++ b/template_topic_alt.go @@ -1,8 +1,8 @@ /* This file was automatically generated by the software. Please don't edit it as your changes may be overwritten at any moment. */ package main -import "io" import "strconv" import "html/template" +import "io" func init() { template_topic_alt_handle = template_topic_alt @@ -78,8 +78,11 @@ w.Write([]byte(` topic_closed_head`)) } w.Write([]byte(`"> ` + tmpl_topic_alt_vars.Topic.Title + ` - ` + tmpl_topic_alt_vars.Topic.Status + ` - Status + `)) +if tmpl_topic_alt_vars.Topic.Is_Closed { +w.Write([]byte(`🔒︎`)) +} +w.Write([]byte(` `)) if tmpl_topic_alt_vars.CurrentUser.Is_Mod { w.Write([]byte(` @@ -109,9 +112,9 @@ w.Write([]byte(`
-
-
 
-
` + tmpl_topic_alt_vars.Topic.CreatedByName + `
+
+
 
+ ` + tmpl_topic_alt_vars.Topic.CreatedByName + ` `)) if tmpl_topic_alt_vars.Topic.Tag != "" { w.Write([]byte(`
` + tmpl_topic_alt_vars.Topic.Tag + `
`)) @@ -119,7 +122,7 @@ w.Write([]byte(`
-
` + string(tmpl_topic_alt_vars.Topic.Content.(template.HTML)) + `
+
` + string(tmpl_topic_alt_vars.Topic.Content.(template.HTML)) + `
@@ -130,8 +133,8 @@ for _, item := range tmpl_topic_alt_vars.ItemList { w.Write([]byte(`
-
 
-
` + item.CreatedByName + `
+
 
+ ` + item.CreatedByName + ` `)) if item.Tag != "" { w.Write([]byte(`
` + item.Tag + `
`)) diff --git a/template_topics.go b/template_topics.go index ce0e1ff4..e893fca6 100644 --- a/template_topics.go +++ b/template_topics.go @@ -1,7 +1,7 @@ /* This file was automatically generated by the software. Please don't edit it as your changes may be overwritten at any moment. */ package main -import "strconv" import "io" +import "strconv" func init() { template_topics_handle = template_topics @@ -86,13 +86,9 @@ w.Write([]byte(`background-color: #eaeaea;`)) w.Write([]byte(`"> ` + item.Title + ` `)) if item.Is_Closed { -w.Write([]byte(`shut - `)) -} else { -w.Write([]byte(`open`)) +w.Write([]byte(`🔒︎`)) } w.Write([]byte(` - Status
`)) } diff --git a/templates/forum.html b/templates/forum.html index d9c671ca..610f0801 100644 --- a/templates/forum.html +++ b/templates/forum.html @@ -4,7 +4,7 @@
{{range .ItemList}}
- {{.Title}} {{if .Is_Closed}}shut + {{.Title}} {{if .Is_Closed}}closed {{else}}open{{end}} Status
diff --git a/templates/profile.html b/templates/profile.html index d7e2aea1..5e914af3 100644 --- a/templates/profile.html +++ b/templates/profile.html @@ -1,6 +1,6 @@ {{template "header.html" . }}
-
+
{{.ProfileOwner.Name}}{{if .ProfileOwner.Tag}}{{.ProfileOwner.Tag}}{{end}}
@@ -15,29 +15,28 @@
Comments
-
- {{range .ItemList}} -
- {{.ContentHtml}} +
{{range .ItemList}} +
+ {{.ContentHtml}}

{{.CreatedByName}} {{if $.CurrentUser.Is_Mod}} {{end}} {{ if .Tag }}{{.Tag}}{{end}} -
{{end}} -
+
+{{end}}
+
{{if not .CurrentUser.Is_Banned}} -
-
- -
-
-
-
-
-
-
-
+
+ +
+
+
+
+
+
+
{{end}} +
{{template "footer.html" . }} \ No newline at end of file diff --git a/templates/topic.html b/templates/topic.html index 90784185..34df7b55 100644 --- a/templates/topic.html +++ b/templates/topic.html @@ -3,17 +3,16 @@
{{.Topic.Title}} - {{.Topic.Status}} - Status + {{if .Topic.Is_Closed}}🔒︎{{end}} {{if .CurrentUser.Is_Mod}} Edit Delete - {{ if .Topic.Sticky }}Unpin{{else}}Pin{{end}} + {{if .Topic.Sticky}}Unpin{{else}}Pin{{end}} {{end}} diff --git a/templates/topic_alt.html b/templates/topic_alt.html index b077bbbb..45eaeb29 100644 --- a/templates/topic_alt.html +++ b/templates/topic_alt.html @@ -3,12 +3,11 @@
{{.Topic.Title}} - {{.Topic.Status}} - Status + {{if .Topic.Is_Closed}}🔒︎{{end}} {{if .CurrentUser.Is_Mod}} Edit Delete - {{ if .Topic.Sticky }}Unpin{{else}}Pin{{end}} + {{if .Topic.Sticky}}Unpin{{else}}Pin{{end}}
@@ -38,8 +37,8 @@ {{range .ItemList}}
-
 
-
{{.CreatedByName}}
+
 
+ {{.CreatedByName}} {{if .Tag}}
{{.Tag}}
{{end}}
diff --git a/templates/topics.html b/templates/topics.html index 9db97c35..75de9f73 100644 --- a/templates/topics.html +++ b/templates/topics.html @@ -4,9 +4,7 @@
{{range .ItemList}}
- {{.Title}} {{if .Is_Closed}}shut - {{else}}open{{end}} - Status + {{.Title}} {{if .Is_Closed}}🔒︎{{end}}
{{else}}
There aren't any topics yet.
{{end}}
diff --git a/themes/cosmo-conflux/public/main.css b/themes/cosmo-conflux/public/main.css index 031fd3fc..7dc03095 100644 --- a/themes/cosmo-conflux/public/main.css +++ b/themes/cosmo-conflux/public/main.css @@ -175,9 +175,8 @@ hr { color: silver; border: 1px solid silver; } .colhead a { color: white; display: block; padding-top: 5px; } .colhead span { display: block; padding-top: 5px; } .open_edit { display: none !important; } -/*.username { display: none !important; }*/ .show_on_edit { display: none; } -.status_label, .topic_status_e/*, .topic_button*/ { display: none !important; } +.rowhead .topic_status_e { display: none !important; } .topic_button { float: right; position: relative; top: -22px; margin-right: 2px; border-style: solid !important; } .colblock_left @@ -344,7 +343,7 @@ hr { color: silver; border: 1px solid silver; } box-sizing: border-box; } -button +/*button { background: #ce2424; background: linear-gradient(#f97779, #ce2424); @@ -357,7 +356,7 @@ button margin-bottom: 2px; border-radius: 5px; } -button .big { padding: 6px; } +button .big { padding: 6px; }*/ .formbutton { @@ -481,11 +480,6 @@ blockquote p max-height: 128px; max-width: 128px; } -.bigAvatar -{ - max-height: 64px; - max-width: 64px; -} /* From Tempra Conflux */ .user_content { @@ -497,6 +491,9 @@ blockquote p padding-bottom: 0; width: 100%; } +.user_content.nobuttons { + min-height: 153px; +} .button_container { border-top: solid 1px #eaeaea; @@ -520,6 +517,10 @@ blockquote p padding-left: 5px; padding-right: 5px; } + +.post_item:not(.simple) { + background-color: #eaeaea; +} .post_item { background-color: #eaeaea; padding-top: 4px; @@ -533,6 +534,13 @@ blockquote p .post_tag { display: none; } +.the_name { + margin-top: 3px; + text-align: center; + color: #505050; + display: block; +} + .userinfo { background: white; width: 132px; @@ -543,6 +551,17 @@ blockquote p top: 4px; box-shadow:0 1px 2px rgba(0,0,0,.1); } +.userinfo .avatar_item { + background-repeat: no-repeat, repeat-y; + background-size: 128px; + width: 128px; + height: 100%; + min-height: 128px; + border-style: solid; + border-color: #eaeaea; + border-width: 1px; +} + .content_container { background: white; margin-left: 137px; @@ -783,7 +802,6 @@ blockquote p clear: left; width: 100%; } - li { font-size: 15px; @@ -797,7 +815,6 @@ blockquote p position: relative; top: -25px; } - #main { padding-left: 4px; @@ -825,10 +842,22 @@ blockquote p max-height: 80px; max-width: 80px; } - .userRibbon { word-wrap: break-word; } + .tag_block { word-wrap: break-word; } .notice:first-child { display: inline-block; } .getTopics { display: none; } + + .userinfo { + width: 70px; + } + .userinfo .avatar_item { + background-size: 64px; + width: 64px; + min-height: 64px; + } + .content_container { + margin-left: 73px; + } } @media (min-width: 800px) { @@ -981,12 +1010,6 @@ blockquote p padding: 8px; } .nav { width: 1000px; } - - .bigAvatar - { - max-height: 128px; - max-width: 128px; - } } @media (min-width: 1603px) diff --git a/themes/cosmo/public/main.css b/themes/cosmo/public/main.css index 7634315e..159a3183 100644 --- a/themes/cosmo/public/main.css +++ b/themes/cosmo/public/main.css @@ -172,9 +172,8 @@ hr { color: silver; border: 1px solid silver; } .colhead a { color: white; display: block; padding-top: 5px; } .colhead span { display: block; padding-top: 5px; } .open_edit { display: none !important; } -/*.username { display: none !important; }*/ .show_on_edit { display: none; } -.status_label, .topic_status_e/*, .topic_button*/ { display: none !important; } +.rowhead .topic_status_e { display: none !important; } .topic_button { float: right; position: relative; top: -22px; margin-right: 2px; border-style: solid !important; } .colblock_left @@ -342,7 +341,7 @@ hr { color: silver; border: 1px solid silver; } box-sizing: border-box; } -button +/*button { background: #ce2424; background: linear-gradient(#f97779, #ce2424); @@ -355,7 +354,7 @@ button margin-bottom: 2px; border-radius: 5px; } -button .big { padding: 6px; } +button .big { padding: 6px; }*/ .formbutton { @@ -523,13 +522,13 @@ blockquote p right: -1px; } -.post_block.groupRibbon +.tag_block.groupRibbon { display: none; } /* From Tempra Conflux */ -.user_content { +.user_content:not(.simple) { padding: 5px; margin-top: 3px; margin-bottom: 0; @@ -538,6 +537,9 @@ blockquote p padding-bottom: 0; width: 100%; } +.user_content.nobuttons { + min-height: 153px; +} .button_container { border-top: solid 1px #eaeaea; @@ -561,8 +563,10 @@ blockquote p padding-left: 5px; padding-right: 5px; } -.post_item { +.post_item:not(.simple) { background-color: #eaeaea; +} +.post_item { padding-top: 4px; padding-left: 7px !important; clear: both; @@ -574,6 +578,13 @@ blockquote p .post_item:last-child { padding-bottom: 7px; } +.the_name { + margin-top: 3px; + text-align: center; + color: #505050; + display: block; +} + .userinfo { border-radius: 5px; @@ -586,6 +597,17 @@ blockquote p top: 4px; box-shadow:0 1px 2px rgba(0,0,0,.1); } +.userinfo .avatar_item { + background-repeat: no-repeat, repeat-y; + background-size: 128px; + width: 128px; + height: 100%; + min-height: 128px; + border-style: solid; + border-color: #eaeaea; + border-width: 1px; +} + .content_container { background: white; margin-left: 140px; @@ -599,26 +621,6 @@ blockquote p /* Anything that isn't a small mobile */ @media(min-width: 501px) { - /*.top - { - margin-top: 0px; - margin-bottom: 0px; - margin-left: auto; - margin-right: auto; - width: 200px; - padding: 0px; - outline: none; - } - - .top h1 - { - text-align: center; - color: darkgray; - text-shadow: 0px 1px 0px #646464; - margin: 0px; - line-height: 60px; - }*/ - .options { float: right; @@ -741,13 +743,6 @@ blockquote p @media (max-width: 800px) { body { background: #cdcdcd; margin-bottom: 10px;} - /*.top - { - background: url('../../images/atombb-small.png') no-repeat left, url('../../images/head-bg.png'); - width: 100%; - } - .top img { display: none; }*/ - #main { width: 100%; @@ -810,9 +805,7 @@ blockquote p body { overflow-x: hidden; } h1 { font-size: 0; } - /*.top { display: none !important; }*/ .options { display: none !important; } - /*.top div {display: none;}*/ ul { line-height: 30px; @@ -828,7 +821,6 @@ blockquote p clear: left; width: 100%; } - li { font-size: 15px; @@ -842,7 +834,6 @@ blockquote p position: relative; top: -25px; } - #main { padding-left: 4px; @@ -870,27 +861,27 @@ blockquote p max-height: 80px; max-width: 80px; } - .userRibbon { word-wrap: break-word; } + .tag_block { word-wrap: break-word; } + .tag_block:last-child { margin-bottom: 5px; } .notice:first-child { display: inline-block; } .forumLastposter img { display: none; } .getTopics { display: none; } + + .userinfo { + width: 70px; + } + .userinfo .avatar_item { + background-size: 64px; + width: 64px; + min-height: 64px; + } + .content_container { + margin-left: 73px; + } } @media (min-width: 800px) { - /*.top { - min-height: 50px !important; - -webkit-animation-duration: 2s; - -moz-animation-duration: 2s; - animation-duration: 2s; - -webkit-animation-name: slidein; - -moz-animation-name: slidein; - animation-name: slidein; - } - .top a - { - height: 50px !important; - }*/ @-webkit-keyframes slidein { from { transform: translate(0,-50px) scale(0.75); } @@ -906,8 +897,6 @@ blockquote p from { transform: translate(0,-50px) scale(0.75); } to {} } - /*.top img { min-height: 50px !important; } - .top h1 { display: none; }*/ .right_most { margin-right: 15%; } #back @@ -922,7 +911,6 @@ blockquote p border-top: none; padding: 0px; padding-top: 0px; - /*padding-bottom: 50px;*/ padding-bottom: 10px; background-color: rgba(30,30,30,0.75); @@ -1029,12 +1017,6 @@ blockquote p padding: 8px; } .nav { width: 1000px; } - - .bigAvatar - { - max-height: 128px; - max-width: 128px; - } } @media (min-width: 1603px) @@ -1044,9 +1026,7 @@ blockquote p width: 1548px; margin-left: auto; margin-right: auto; - /*background-color: rgba(60,60,60,0.75);*/ } - #main { width: 1250px; } .forumLastposter .title { width: 280px; } } diff --git a/themes/tempra-conflux/public/main.css b/themes/tempra-conflux/public/main.css index e963481e..02c7b080 100644 --- a/themes/tempra-conflux/public/main.css +++ b/themes/tempra-conflux/public/main.css @@ -333,6 +333,9 @@ button.username padding-bottom: 0; width: 100%; } +.user_content.nobuttons { + min-height: 153px; +} .button_container { border-top: solid 1px #eaeaea; @@ -357,8 +360,11 @@ button.username padding-right: 5px; } -.post_item { +.simple { background-color: white; } +.post_item:not(.simple) { background-color: #eaeaea; +} +.post_item { padding-top: 4px; padding-left: 5px; clear: both; @@ -372,6 +378,12 @@ button.username .post_tag { display: none; } +.the_name { + margin-top: 3px; + text-align: center; + color: #505050; + display: block; +} .userinfo { background: white; @@ -383,6 +395,17 @@ button.username top: 4px; box-shadow:0 1px 2px rgba(0,0,0,.1); } +.userinfo .avatar_item { + background-repeat: no-repeat, repeat-y; + background-size: 128px; + width: 128px; + height: 100%; + min-height: 128px; + border-style: solid; + border-color: #eaeaea; + border-width: 1px; +} + .content_container { background: white; margin-left: 137px; @@ -468,5 +491,17 @@ button.username width: 60px; font-size: 15px; } + .userinfo { + width: 70px; + } + .userinfo .avatar_item { + background-size: 64px; + width: 64px; + min-height: 64px; + } + .content_container { + margin-left: 73px; + } + .container { width: 100% !important; } } \ No newline at end of file diff --git a/themes/tempra-conflux/theme.json b/themes/tempra-conflux/theme.json index 24ba2f2b..45017c71 100644 --- a/themes/tempra-conflux/theme.json +++ b/themes/tempra-conflux/theme.json @@ -4,6 +4,7 @@ "Version": "0.0.1", "Creator": "Azareal", "FullImage": "tempra-conflux.png", + "MobileFriendly": true, "Templates": [ { "Name": "topic",