We're just going to use the CSS we want, not the CSS provided.

This commit is contained in:
Zixaphir 2013-08-18 04:06:02 -07:00
parent 1fb2897baa
commit ce78a9d403
9 changed files with 2025 additions and 50 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -358,20 +358,14 @@ Main =
Main.thisPageIsLegit Main.thisPageIsLegit
css: """ css: """
@font-face { <%= grunt.file.read('src/General/css/font-awesome.css').replace(/\s+/g, ' ').replace(/\\/g, '\\\\').trim() %>
font-family: 'FontAwesome'; <%= grunt.file.read('src/General/css/style.css').replace(/\s+/g, ' ').trim() %>
src: url('data:application/font-woff;base64,<%= grunt.file.read('node_modules/font-awesome/font/fontawesome-webfont.woff', {encoding: 'base64'}) %>') format('woff'); <%= grunt.file.read('src/General/css/yotsuba.css').replace(/\s+/g, ' ').trim() %>
font-weight: normal; <%= grunt.file.read('src/General/css/yotsuba-b.css').replace(/\s+/g, ' ').trim() %>
font-style: normal; <%= grunt.file.read('src/General/css/futaba.css').replace(/\s+/g, ' ').trim() %>
} <%= grunt.file.read('src/General/css/burichan.css').replace(/\s+/g, ' ').trim() %>
<%= grunt.file.read('node_modules/font-awesome/css/font-awesome.min.css').replace(/@font-face\{[^}]+\}/, '').replace(/\\/g, '\\\\') %> <%= grunt.file.read('src/General/css/tomorrow.css').replace(/\s+/g, ' ').trim() %>
<%= grunt.file.read('src/General/css/style.css') %> <%= grunt.file.read('src/General/css/photon.css').replace(/\s+/g, ' ').trim() %>
<%= grunt.file.read('src/General/css/yotsuba.css') %>
<%= grunt.file.read('src/General/css/yotsuba-b.css') %>
<%= grunt.file.read('src/General/css/futaba.css') %>
<%= grunt.file.read('src/General/css/burichan.css') %>
<%= grunt.file.read('src/General/css/tomorrow.css') %>
<%= grunt.file.read('src/General/css/photon.css') %>
""" """
Main.init() Main.init()

View File

@ -2,7 +2,7 @@ Settings =
init: -> init: ->
# 4chan X settings link # 4chan X settings link
link = $.el 'a', link = $.el 'a',
className: 'settings-link icon-wrench' className: 'settings-link icon icon-wrench'
textContent: 'Settings' textContent: 'Settings'
href: 'javascript:;' href: 'javascript:;'
$.on link, 'click', Settings.open $.on link, 'click', Settings.open

1157
src/General/css/font-awesome.css vendored Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1038,22 +1038,6 @@ a:only-of-type > .remove {
.boardSubtitle[contenteditable="true"] { .boardSubtitle[contenteditable="true"] {
cursor: text !important; cursor: text !important;
} }
/* Shortcut Icons */
:root:not(.shortcut-icons) [class*=" icon-"]::before {
display: none !important;
}
:root:not(.shortcut-icons) [class*=" icon-"] {
font-family: '' !important;
}
:root.shortcut-icons [class*=" icon-"] {
font-size: 0px;
}
:root.shortcut-icons [class*=" icon-"]::before {
font-size: 13px !important;
}
/* Link Title Favicons */ /* Link Title Favicons */
.linkify.YouTube { .linkify.YouTube {
background: transparent url('data:image/png;base64,<%= grunt.file.read("src/General/img/links/youtube.png", {encoding: "base64"}) %>') center left no-repeat!important; background: transparent url('data:image/png;base64,<%= grunt.file.read("src/General/img/links/youtube.png", {encoding: "base64"}) %>') center left no-repeat!important;

View File

@ -3,7 +3,7 @@ ImageExpand =
return if g.VIEW is 'catalog' or !Conf['Image Expansion'] return if g.VIEW is 'catalog' or !Conf['Image Expansion']
@EAI = $.el 'a', @EAI = $.el 'a',
className: 'expand-all-shortcut icon-resize-full' className: 'expand-all-shortcut icon icon-resize-full'
textContent: 'EAI' textContent: 'EAI'
title: 'Expand All Images' title: 'Expand All Images'
href: 'javascript:;' href: 'javascript:;'
@ -33,11 +33,11 @@ ImageExpand =
toggleAll: -> toggleAll: ->
$.event 'CloseMenu' $.event 'CloseMenu'
if ImageExpand.on = $.hasClass ImageExpand.EAI, 'expand-all-shortcut' if ImageExpand.on = $.hasClass ImageExpand.EAI, 'expand-all-shortcut'
ImageExpand.EAI.className = 'contract-all-shortcut icon-resize-small' ImageExpand.EAI.className = 'contract-all-shortcut icon icon-resize-small'
ImageExpand.EAI.title = 'Contract All Images' ImageExpand.EAI.title = 'Contract All Images'
func = ImageExpand.expand func = ImageExpand.expand
else else
ImageExpand.EAI.className = 'expand-all-shortcut icon-resize-full' ImageExpand.EAI.className = 'expand-all-shortcut icon icon-resize-full'
ImageExpand.EAI.title = 'Expand All Images' ImageExpand.EAI.title = 'Expand All Images'
func = ImageExpand.contract func = ImageExpand.contract
for ID, post of g.posts for ID, post of g.posts

View File

@ -6,7 +6,7 @@ ThreadWatcher =
id: 'watcher-link' id: 'watcher-link'
textContent: 'Watcher' textContent: 'Watcher'
href: 'javascript:;' href: 'javascript:;'
className: 'disabled icon-bookmark' className: 'disabled icon icon-bookmark'
@db = new DataBoard 'watchedThreads', @refresh, true @db = new DataBoard 'watchedThreads', @refresh, true
@dialog = UI.dialog 'thread-watcher', 'top: 50px; left: 0px;', """ @dialog = UI.dialog 'thread-watcher', 'top: 50px; left: 0px;', """

View File

@ -6,7 +6,7 @@ QR =
if Conf['QR Shortcut'] if Conf['QR Shortcut']
sc = $.el 'a', sc = $.el 'a',
className: "qr-shortcut icon-comment-alt #{unless Conf['Persistent QR'] then 'disabled' else ''}" className: "qr-shortcut icon icon-comment-alt #{unless Conf['Persistent QR'] then 'disabled' else ''}"
textContent: 'QR' textContent: 'QR'
title: 'Quick Reply' title: 'Quick Reply'
href: 'javascript:;' href: 'javascript:;'