Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into integration
Conflicts: Makefile mime.types package.json scripts/bootswatch.js views/extras_popular.jade
- Loading branch information
Showing
10 changed files
with
348 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,4 @@ inc/ | |
| reports/ | ||
| lint.html | ||
| config/_maxcdn.yml | ||
| shelljs_* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,108 @@ | ||
|
|
||
| types { | ||
| text/html html htm shtml; | ||
| text/css css; | ||
| text/xml xml; | ||
| image/gif gif; | ||
| image/jpeg jpeg jpg; | ||
| application/x-javascript js; | ||
| application/atom+xml atom; | ||
| application/rss+xml rss; | ||
|
|
||
| text/mathml mml; | ||
| text/plain txt; | ||
| text/vnd.sun.j2me.app-descriptor jad; | ||
| text/vnd.wap.wml wml; | ||
| text/x-component htc; | ||
| # Audio | ||
| audio/midi mid midi kar; | ||
| audio/mp4 aac f4a f4b m4a; | ||
| audio/mpeg mp3; | ||
| audio/ogg oga ogg opus; | ||
| audio/x-realaudio ra; | ||
| audio/x-wav wav; | ||
|
|
||
| # Images | ||
| image/bmp bmp; | ||
| image/gif gif; | ||
| image/jpeg jpeg jpg; | ||
| image/png png; | ||
| image/svg+xml svg svgz; | ||
| image/tiff tif tiff; | ||
| image/vnd.wap.wbmp wbmp; | ||
| image/webp webp; | ||
| image/x-icon ico cur; | ||
| image/x-jng jng; | ||
|
|
||
| # JavaScript | ||
| application/javascript js; | ||
| application/json json; | ||
|
|
||
| # Manifest files | ||
| application/x-web-app-manifest+json webapp; | ||
| text/cache-manifest manifest appcache; | ||
|
|
||
| # Microsoft Office | ||
| application/msword doc; | ||
| application/vnd.ms-excel xls; | ||
| application/vnd.ms-powerpoint ppt; | ||
| application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; | ||
| application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; | ||
| application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; | ||
|
|
||
| image/png png; | ||
| image/tiff tif tiff; | ||
| image/vnd.wap.wbmp wbmp; | ||
| image/x-icon ico; | ||
| image/x-jng jng; | ||
| image/x-ms-bmp bmp; | ||
| image/svg+xml svg svgz; | ||
| image/webp webp; | ||
| # Video | ||
| video/3gpp 3gpp 3gp; | ||
| video/mp4 mp4 m4v f4v f4p; | ||
| video/mpeg mpeg mpg; | ||
| video/ogg ogv; | ||
| video/quicktime mov; | ||
| video/webm webm; | ||
| video/x-flv flv; | ||
| video/x-mng mng; | ||
| video/x-ms-asf asx asf; | ||
| video/x-ms-wmv wmv; | ||
| video/x-msvideo avi; | ||
|
|
||
| application/java-archive jar war ear; | ||
| application/mac-binhex40 hqx; | ||
| application/msword doc; | ||
| application/pdf pdf; | ||
| application/postscript ps eps ai; | ||
| application/rtf rtf; | ||
| application/vnd.ms-excel xls; | ||
| application/vnd.ms-powerpoint ppt; | ||
| application/vnd.wap.wmlc wmlc; | ||
| application/vnd.google-earth.kml+xml kml; | ||
| application/vnd.google-earth.kmz kmz; | ||
| application/x-7z-compressed 7z; | ||
| application/x-cocoa cco; | ||
| application/x-java-archive-diff jardiff; | ||
| application/x-java-jnlp-file jnlp; | ||
| application/x-makeself run; | ||
| application/x-perl pl pm; | ||
| application/x-pilot prc pdb; | ||
| application/x-rar-compressed rar; | ||
| application/x-redhat-package-manager rpm; | ||
| application/x-sea sea; | ||
| application/x-shockwave-flash swf; | ||
| application/x-stuffit sit; | ||
| application/x-tcl tcl tk; | ||
| application/x-x509-ca-cert der pem crt; | ||
| application/x-xpinstall xpi; | ||
| application/xhtml+xml xhtml; | ||
| application/zip zip; | ||
| # Web feeds | ||
| application/xml atom rdf rss xml; | ||
|
|
||
| application/octet-stream bin exe dll; | ||
| application/octet-stream deb; | ||
| application/octet-stream dmg; | ||
| application/octet-stream eot; | ||
| application/octet-stream iso img; | ||
| application/octet-stream msi msp msm; | ||
| # Web fonts | ||
| application/font-woff woff; | ||
| application/font-woff2 woff2; | ||
| application/vnd.ms-fontobject eot; | ||
| application/x-font-ttf ttc ttf; | ||
| font/opentype otf; | ||
|
|
||
| audio/midi mid midi kar; | ||
| audio/mpeg mp3; | ||
| audio/ogg ogg; | ||
| audio/x-m4a m4a; | ||
| audio/x-realaudio ra; | ||
| # Other | ||
| application/java-archive jar war ear; | ||
| application/mac-binhex40 hqx; | ||
| application/pdf pdf; | ||
| application/postscript ps eps ai; | ||
| application/rtf rtf; | ||
| application/vnd.wap.wmlc wmlc; | ||
| application/xhtml+xml xhtml; | ||
| application/vnd.google-earth.kml+xml kml; | ||
| application/vnd.google-earth.kmz kmz; | ||
| application/x-7z-compressed 7z; | ||
| application/x-chrome-extension crx; | ||
| application/x-opera-extension oex; | ||
| application/x-xpinstall xpi; | ||
| application/x-cocoa cco; | ||
| application/x-java-archive-diff jardiff; | ||
| application/x-java-jnlp-file jnlp; | ||
| application/x-makeself run; | ||
| application/x-perl pl pm; | ||
| application/x-pilot prc pdb; | ||
| application/x-rar-compressed rar; | ||
| application/x-redhat-package-manager rpm; | ||
| application/x-sea sea; | ||
| application/x-shockwave-flash swf; | ||
| application/x-stuffit sit; | ||
| application/x-tcl tcl tk; | ||
| application/x-x509-ca-cert der pem crt; | ||
| application/x-bittorrent torrent; | ||
| application/zip zip; | ||
|
|
||
| video/3gpp 3gpp 3gp; | ||
| video/mp4 mp4; | ||
| video/mpeg mpeg mpg; | ||
| video/quicktime mov; | ||
| video/webm webm; | ||
| video/x-flv flv; | ||
| video/x-m4v m4v; | ||
| video/x-mng mng; | ||
| video/x-ms-asf asx asf; | ||
| video/x-ms-wmv wmv; | ||
| video/x-msvideo avi; | ||
| application/octet-stream bin exe dll; | ||
| application/octet-stream deb; | ||
| application/octet-stream dmg; | ||
| application/octet-stream iso img; | ||
| application/octet-stream msi msp msm; | ||
| application/octet-stream safariextz; | ||
|
|
||
| # added by jmervine on 2014-09-08 for GH issue #345 | ||
| font/ttf ttf; | ||
| font/opentype otf; | ||
| application/font-woff woff; | ||
| application/vnd.ms-fontobject eot; | ||
| text/css css; | ||
| text/html html htm shtml; | ||
| text/mathml mml; | ||
| text/plain txt; | ||
| text/vnd.sun.j2me.app-descriptor jad; | ||
| text/vnd.wap.wml wml; | ||
| text/vtt vtt; | ||
| text/x-component htc; | ||
| text/x-vcard vcf; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| /************* | ||
| Bootstrap theme | ||
| *************/ | ||
| /* jQuery Bootstrap Theme */ | ||
| .tablesorter-bootstrap { | ||
| width: 100%; | ||
| } | ||
| .tablesorter-bootstrap thead th, | ||
| .tablesorter-bootstrap thead td, | ||
| .tablesorter-bootstrap tfoot th, | ||
| .tablesorter-bootstrap tfoot td { | ||
| /*font: bold 14px/20px Arial, Sans-serif;*/ | ||
| padding: 4px; | ||
| margin: 0 0 18px; | ||
| /*background-color: #eee;*/ | ||
| } | ||
|
|
||
| .tablesorter-bootstrap .tablesorter-header:not(.sorter-false) { | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .tablesorter-bootstrap .tablesorter-header-inner { | ||
| position: relative; | ||
| padding: 4px 18px 4px 4px; | ||
| } | ||
|
|
||
| /* bootstrap uses <i> for icons */ | ||
| .tablesorter-bootstrap .tablesorter-header i.tablesorter-icon { | ||
| font-size: 11px; | ||
| position: absolute; | ||
| right: 2px; | ||
| top: 50%; | ||
| margin-top: -7px; /* half the icon height; older IE doesn't like this */ | ||
| width: 14px; | ||
| height: 14px; | ||
| background-repeat: no-repeat; | ||
| line-height: 14px; | ||
| display: inline-block; | ||
| } | ||
|
|
||
| /* black unsorted icon */ | ||
| .tablesorter-bootstrap .bootstrap-icon-unsorted { | ||
| background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAOCAMAAADOvxanAAAAVFBMVEUAAABCQkJZWVkZGRnJyckgICAZGRkZGRn8/PweHh4dHR0aGhoaGhpUVFQbGxvQ0NDc3NxMTExSUlIbGxvr6+s4ODhKSkogICAtLS00NDQzMzMnJydSEPrQAAAAGHRSTlMA1ssZRLgdAQbDyisqsZo8QdXUq0r9xPepSRwiAAAAX0lEQVQI13XHSQKAIAwEwQAKxn13Ev7/T2Pu9qmarJKPXIicI4PH4hxaKNrhm2S8bJK5h4YzKHrzJNtK6yYT/TdXzpS5zuYg4MSQYF6i4IHExdw1UVRi05HPrrvT53a+qyMFC9t04gcAAAAASUVORK5CYII=); | ||
| } | ||
|
|
||
| /* white unsorted icon */ | ||
| .tablesorter-bootstrap .icon-white.bootstrap-icon-unsorted { | ||
| background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAOBAMAAAALT/umAAAAKlBMVEUAAAD///////////////////////////////////////////////////+Gu8ovAAAADXRSTlMA4EXKBtQqvR0+sxmalc142gAAAFdJREFUCNdjYGDoamAAAjZbMxCVfvd6AgMDd+3du9UMDKx3hWSvMjBwXZww8RYDGuC53NB8h4GB8a617UUGBs7Yu3cjGRhYVO9eVQFKOskKOQApFmUgBwBZ+xXRTttNdAAAAABJRU5ErkJggg==); | ||
| } | ||
|
|
||
| /* since bootstrap (table-striped) uses nth-child(), we just use this to add a zebra stripe color */ | ||
| .tablesorter-bootstrap > tbody > tr.odd > td, | ||
| .tablesorter-bootstrap > tbody > tr.tablesorter-hasChildRow.odd:hover ~ tr.tablesorter-hasChildRow.odd ~ .tablesorter-childRow.odd > td { | ||
| background-color: #f9f9f9; | ||
| } | ||
| .tablesorter-bootstrap > tbody > tr.odd:hover > td, | ||
| .tablesorter-bootstrap > tbody > tr.even:hover > td, | ||
| .tablesorter-bootstrap > tbody > tr.tablesorter-hasChildRow.odd:hover ~ .tablesorter-childRow.odd > td, | ||
| .tablesorter-bootstrap > tbody > tr.tablesorter-hasChildRow.even:hover ~ .tablesorter-childRow.even > td { | ||
| background-color: #f5f5f5; | ||
| } | ||
| .tablesorter-bootstrap > tbody > tr.even > td, | ||
| .tablesorter-bootstrap > tbody > tr.tablesorter-hasChildRow.even:hover ~ tr.tablesorter-hasChildRow.even ~ .tablesorter-childRow.even > td { | ||
| background-color: #fff; | ||
| } | ||
|
|
||
| /* processing icon */ | ||
| .tablesorter-bootstrap .tablesorter-processing { | ||
| background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs='); | ||
| background-position: center center !important; | ||
| background-repeat: no-repeat !important; | ||
| } | ||
|
|
||
| /* caption */ | ||
| .caption { | ||
| background: #fff; | ||
| } | ||
|
|
||
| /* filter widget */ | ||
| .tablesorter-bootstrap .tablesorter-filter-row input.tablesorter-filter, | ||
| .tablesorter-bootstrap .tablesorter-filter-row select.tablesorter-filter { | ||
| width: 98%; | ||
| margin: 0 auto; | ||
| padding: 4px 6px; | ||
| color: #333; | ||
| -webkit-box-sizing: border-box; | ||
| -moz-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| -webkit-transition: height 0.1s ease; | ||
| -moz-transition: height 0.1s ease; | ||
| -o-transition: height 0.1s ease; | ||
| transition: height 0.1s ease; | ||
| } | ||
| .tablesorter-bootstrap .tablesorter-filter-row .tablesorter-filter.disabled { | ||
| background-color: #eee; | ||
| color: #555; | ||
| cursor: not-allowed; | ||
| border: 1px solid #ccc; | ||
| border-radius: 4px; | ||
| box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; | ||
| -webkit-box-sizing: border-box; | ||
| -moz-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| -webkit-transition: height 0.1s ease; | ||
| -moz-transition: height 0.1s ease; | ||
| -o-transition: height 0.1s ease; | ||
| transition: height 0.1s ease; | ||
| } | ||
| .tablesorter-bootstrap .tablesorter-filter-row td { | ||
| background: #efefef; | ||
| line-height: normal; | ||
| text-align: center; | ||
| padding: 4px 6px; | ||
| vertical-align: middle; | ||
| -webkit-transition: line-height 0.1s ease; | ||
| -moz-transition: line-height 0.1s ease; | ||
| -o-transition: line-height 0.1s ease; | ||
| transition: line-height 0.1s ease; | ||
| } | ||
| /* hidden filter row */ | ||
| .tablesorter-bootstrap .tablesorter-filter-row.hideme td { | ||
| padding: 2px; /* change this to modify the thickness of the closed border row */ | ||
| margin: 0; | ||
| line-height: 0; | ||
| } | ||
| .tablesorter-bootstrap .tablesorter-filter-row.hideme * { | ||
| height: 1px; | ||
| min-height: 0; | ||
| border: 0; | ||
| padding: 0; | ||
| margin: 0; | ||
| /* don't use visibility: hidden because it disables tabbing */ | ||
| opacity: 0; | ||
| filter: alpha(opacity=0); | ||
| } | ||
| /* rows hidden by filtering (needed for child rows) */ | ||
| .tablesorter .filtered { | ||
| display: none; | ||
| } | ||
|
|
||
| /* pager plugin */ | ||
| .tablesorter-bootstrap .tablesorter-pager select { | ||
| padding: 4px 6px; | ||
| } | ||
| .tablesorter-bootstrap .tablesorter-pager .pagedisplay { | ||
| border: 0; | ||
| } | ||
| /* tfoot i for pager controls */ | ||
| .tablesorter-bootstrap tfoot i { | ||
| font-size: 11px; | ||
| } | ||
|
|
||
| /* ajax error row */ | ||
| .tablesorter .tablesorter-errorRow td { | ||
| text-align: center; | ||
| cursor: pointer; | ||
| background-color: #e6bf99; | ||
| } |
Oops, something went wrong.