Merge branch 'master' of github.com:zixaphir/appchan-x

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js

src/General/css/layout.css

@@ -2727,4 +2727,36 @@ article li {
 /* ExLinks */
 #exlinks-options-content {
   padding: 5px;
-}
+}
+/* /f/ */
+[action*='/f/'] .fileInfo {
+  padding-left: 5px !important;
+}
+[action*='/f/'] .subject, .name-col {
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  word-wrap: break-word;
+}
+div.swfSauce {
+  margin-top: 5px !important;
+}
+.mobile.center {
+  display:none!important;
+}
+table.flashListing {
+  border-spacing: 1px !important;
+  margin: 5px auto !important;
+}
+.flashListing td {
+  padding: 2px !important;
+  font-size: 9pt !important;
+  text-align: center !important;
+  margin: 0px !important;
+}
+#delform[action='https://sys.4chan.org/f/up.php'], #delform[action='https://sys.4chan.org/f/up.php'] .postblock {
+  background: none !important;
+  border: none !important;
+  box-shadow: none !important;
+}

src/General/css/theme.css

@@ -410,9 +410,6 @@ a .name {
   box-shadow: 5px 5px 5px #{theme['Shadow Color']};
 }
 /* /f/ */
-.mobile.center {
-  display:none!important;
-}
 .postblock {
   color: #{theme["Text"]};
   font-weight: bold;
@@ -421,10 +418,6 @@ a .name {
 tbody > tr:nth-of-type(2n+1){
   background: #{theme["Reply Background"]} !important;
 }
-table.flashListing {
-  margin: auto !important;
-  border-spacing: 1px !important;
-}
 table.flashListing .highlightPost::after {
   content: '●';
   color: #{theme["Text"]};
@@ -436,14 +429,4 @@ table.flashListing .highlightPost::after {
   background: url('/image/fade.png') repeat-x scroll center top #{backgroundC} !important;
   padding-top: 200px;
 }
-.flashListing td {
-  padding-left: 4px !important;
-  padding-right: 4px !important;
-  text-align: center !important;
-}
-#delform[action='https://sys.4chan.org/f/up.php'], #delform[action='https://sys.4chan.org/f/up.php'] .postblock {
-  background: none !important;
-  border: none !important;
-  box-shadow: none !important;
-}
 #{theme["Custom CSS"].replace(/\s+/g, ' ').trim()}

src/Miscellaneous/Flash.coffee

@@ -13,5 +13,7 @@ Flash =
     sauceLink = $.el 'a',
       textContent: 'Check Sauce on SWFCHAN'
       href:        "http://eye.swfchan.com/search/?q=#{swfName.textContent}"
+    $.addClass nav, 'swfSauce'
+    $.rmClass nav, 'navLinks'
     $.rmAll nav
     $.add nav, [$.tn('['), sauceLink, $.tn(']')]