Touch-ups

LICENSE

@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.1.3 - 2013-06-04
+* appchan x - Version 2.1.3 - 2013-06-06
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

src/General/css/dynamic.css

@@ -41,6 +41,7 @@ body {
 .thread > .replyContainer > .reply.post {
   border-width: #{if _conf['Post Spacing'] is "0" then "1px 1px 0 1px" else '1px'};
 }
+#post-preview,
 .postMessage {
   margin: #{_conf['Vertical Post Padding']}px #{_conf['Horizontal Post Padding']}px;
 }

src/General/css/layout.css

@@ -853,7 +853,8 @@ th {
   display: none !important;
 }
 /* Threads */
-.rounded-edges .board > .thread{
+#threads,
+.rounded-edges .board > .thread {
   border-radius: 4px;
 }
 /* Thread Clearfix */
@@ -2084,7 +2085,8 @@ article li {
 #info .btn-wrap {
   display: inline-block;
 }
-#post-preview {
+#post-preview,
+#quote-preview {
   position: absolute;
   z-index: 22;
 }
@@ -2102,7 +2104,7 @@ article li {
   display: inline-block;
   word-wrap: break-word;
   overflow: hidden;
-  margin-top: 5px;
+  margin: 1px;
   padding: 5px 0 3px;
   text-align: center;
 }

src/General/css/theme.css

@@ -135,6 +135,7 @@ textarea.field:focus {
 #mouseover,
 #post-preview,
 #qp .post,
+#threads > .thread,
 #xupdater,
 .box-outer,
 .reply.post {
@@ -155,6 +156,7 @@ textarea.field:focus {
   border-color: #{theme["Navigation Border"]};
 }
 #doc,
+#threads,
 .board > .thread {
   background: #{theme["Thread Wrapper Background"]};
   border: 1px solid #{theme["Thread Wrapper Border"]};
@@ -344,16 +346,17 @@ a .name {
 #fappeTyme {
   #{unless Style.lightTheme then "<%= filter %>: url(\"#icons-filter\");" else ""}
 }
-.alternate-post-colors .replyContainer:not(.hidden):nth-of-type(2n+1) .post {
+.alternate-post-colors #threads > .thread:nth-of-type(2n+1),
-  background-image: linear-gradient(#{if Style.lightTheme then "rgba(0,0,0,0.05), rgba(0,0,0,0.05)" else "rgba(255,255,255,0.02), rgba(255,255,255,0.02)"});
+.alternate-post-colors .replyContainer:nth-of-type(2n+1) .post {
+  background-image: linear-gradient(#{if replybg then ("rgba(" + (replybg.shiftRGB -4, false) + ",0.8), rgba(" + (replybg.shiftRGB -4, false) + ",0.8)") else if Style.lightTheme then "rgba(0,0,0,0.05), rgba(0,0,0,0.05)" else "rgba(255,255,255,0.02), rgba(255,255,255,0.02)"});
 }
 .color-reply-headings .boxbar,
 .color-reply-headings .postInfo {
-  background: #{if (replyHeading = new Style.color Style.colorToHex theme["Reply Background"]) then "rgba(" + (replyHeading.shiftRGB -12, false) + ",0.8)" else "rgba(0,0,0,0.1)"};
+  background: #{if replybg then "rgba(" + (replybg.shiftRGB -12, false) + ",0.8)" else "rgba(0,0,0,0.1)"};
   border-bottom: 1px solid #{theme["Reply Border"]}
 }
 .color-file-info .file {
-  background: #{if (fileHeading = new Style.color Style.colorToHex theme["Reply Background"]) then "rgba(" + (fileHeading.shiftRGB -8, false) + ",0.8)" else "rgba(0,0,0,0.1)"};
+  background: #{if replybg then "rgba(" + (replybg.shiftRGB -8, false) + ",0.8)" else "rgba(0,0,0,0.1)"};
   border-bottom: 1px solid #{theme["Reply Border"]}
   border-top: 1px solid #{theme["Reply Border"]}
 }

src/Theming/Style.coffee

@@ -180,6 +180,7 @@ Style =
 
   theme: (theme) ->
     bgColor = new Style.color(Style.colorToHex(backgroundC = theme["Background Color"]) or 'aaaaaa')
+    replybg = new Style.color Style.colorToHex theme["Reply Background"]
 
     Style.lightTheme = bgColor.isLight()
 
@@ -291,34 +292,12 @@ Style =
     Style.icons.textContent = css
 
   padding: ->
-    return unless (sheet = Style.paddingSheet) and Style.padding.nav
+    css = """<%= grunt.file.read('src/General/css/padding.nav.css') %>"""
-    _conf = Conf
+    
-    Style.padding.nav.property = if _conf['Bottom Header'] then 'bottom' else 'top'
     if Style.padding.pages
-      Style.padding.pages.property = _conf["Pagination"].split(" ")
+      css += """<%= grunt.file.read('src/General/css/padding.pages.css') %>"""
-      Style.padding.pages.property = Style.padding.pages.property[Style.padding.pages.property.length - 1]
-    css = "body::before {\n"
-    if _conf['4chan SS Navigation'] and Style.padding.pages and ["sticky top", "top", "sticky bottom"].contains _conf["Pagination"]
-      css += "  #{Style.padding.pages.property}: #{Style.padding.pages.offsetHeight}px !important;\n"
 
-    if _conf['4chan SS Navigation'] and _conf['Fixed Header']
+    Style.paddingSheet.textContent = css
-      css += "  #{Style.padding.nav.property}: #{Style.padding.nav.offsetHeight}px !important;\n"
-
-    css += """
-}
-body {
-  padding-bottom: 0;\n
-"""
-
-    if Style.padding.pages? and ["sticky top", "top", "sticky bottom"].contains _conf["Pagination"]
-      css += "  padding-#{Style.padding.pages.property}: #{Style.padding.pages.offsetHeight + 1}px;\n"
-
-    unless _conf['Header auto-hide'] or _conf['Hide Header']
-      css += "  padding-#{Style.padding.nav.property}: #{Style.padding.nav.offsetHeight + 1}px;\n"
-
-    css += "}"
-
-    sheet.textContent = css
 
   color: (hex) ->
     @hex = "#" + hex