css: font size tweaks

This commit is contained in:
Andrew Dolgov 2010-11-19 19:09:31 +03:00
parent df1c35f46c
commit e5df6e9eb4
4 changed files with 19 additions and 32 deletions

View File

@ -135,8 +135,6 @@ function viewfeed(feed, subop, is_cat, offset) {
console.log(query); console.log(query);
var container = $("headlinesInnerContainer");
var unread_ctr = -1; var unread_ctr = -1;
if (!is_cat) unread_ctr = getFeedUnread(feed); if (!is_cat) unread_ctr = getFeedUnread(feed);

View File

@ -4,6 +4,7 @@ body#ttrssMain, body#ttrssPrefs {
margin : 0px; margin : 0px;
padding : 0px; padding : 0px;
font-family : "Lucida Grande", Arial, sans-serif; font-family : "Lucida Grande", Arial, sans-serif;
font-size : 12px;
} }
body#ttrssPrefs { body#ttrssPrefs {
@ -596,7 +597,6 @@ div#headlines-toolbar div#subtoolbar_ftitle {
} }
span.contentPreview { span.contentPreview {
font-size : 12px;
color : gray; color : gray;
font-weight : normal; font-weight : normal;
} }
@ -1244,16 +1244,6 @@ div#l_progress_i {
height : 10px; height : 10px;
} }
/* #content-insert {
background-color : white;
overflow : auto;
position : absolute;
left : 0px;
right : 0px;
bottom : 0px;
top : 6px;
} */
div.dlgSec { div.dlgSec {
font-size : 12px; font-size : 12px;
color : gray; color : gray;
@ -1508,10 +1498,6 @@ div.fatalError textarea {
display : none; display : none;
} }
#headlinesInnerContainer {
font-size : 12px;
}
#content-tabs { #content-tabs {
margin : 0px; margin : 0px;
padding : 0px; padding : 0px;

View File

@ -256,7 +256,7 @@ function init() {
dojo.require("dijit.form.Select"); dojo.require("dijit.form.Select");
dojo.require("dijit.Toolbar"); dojo.require("dijit.Toolbar");
dojo.require("dijit.ProgressBar"); dojo.require("dijit.ProgressBar");
dojo.require("dojo.parser"); dojo.require("dijit.Menu");
dojo.registerModulePath("fox", "../.."); dojo.registerModulePath("fox", "../..");

View File

@ -98,11 +98,11 @@ function headlines_callback2(transport, feed_cur_page) {
if (feed_cur_page == 0) { if (feed_cur_page == 0) {
if (headlines) { if (headlines) {
$("headlinesInnerContainer").innerHTML = headlines_content.firstChild.nodeValue; dijit.byId("headlines-frame").attr('content',
$("headlines-toolbar").innerHTML = headlines_toolbar.firstChild.nodeValue; headlines_content.firstChild.nodeValue);
dojo.parser.parse("headlines-toolbar"); dijit.byId("headlines-toolbar").attr('content',
//dijit.byId("main").resize(); headlines_toolbar.firstChild.nodeValue);
var cache_prefix = ""; var cache_prefix = "";
@ -121,19 +121,21 @@ function headlines_callback2(transport, feed_cur_page) {
} else { } else {
console.warn("headlines_callback: returned no data"); console.warn("headlines_callback: returned no data");
$('headlinesInnerContainer').innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML data)') + "</div>"; dijit.byId("headlines-frame").attr('content',
"<div class='whiteBox'>" +
__('Could not update headlines (missing XML data)') + "</div>");
} }
} else { } else {
if (headlines) { if (headlines) {
if (headlines_count > 0) { if (headlines_count > 0) {
console.log("adding some more headlines..."); console.log("adding some more headlines...");
c = $("headlinesInnerContainer");
var c = dijit.byId("headlines-frame");
var ids = getSelectedArticleIds2(); var ids = getSelectedArticleIds2();
c.innerHTML = c.innerHTML + headlines_content.firstChild.nodeValue; c.attr('content', c.attr('content') +
headlines_content.firstChild.nodeValue);
console.log("restore selected ids: " + ids); console.log("restore selected ids: " + ids);
@ -172,7 +174,8 @@ function headlines_callback2(transport, feed_cur_page) {
} else { } else {
console.warn("headlines_callback: returned no XML object"); console.warn("headlines_callback: returned no XML object");
$('headlinesInnerContainer').innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML object)') + "</div>"; dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" +
__('Could not update headlines (missing XML object)') + "</div>");
} }
@ -866,7 +869,7 @@ function getSelectedArticleIds2() {
var rv = []; var rv = [];
$$("#headlinesInnerContainer > div[id*=RROW][class*=Selected]").each( $$("#headlines-frame > div[id*=RROW][class*=Selected]").each(
function(child) { function(child) {
rv.push(child.id.replace("RROW-", "")); rv.push(child.id.replace("RROW-", ""));
}); });
@ -877,7 +880,7 @@ function getSelectedArticleIds2() {
function getLoadedArticleIds() { function getLoadedArticleIds() {
var rv = []; var rv = [];
var children = $$("#headlinesInnerContainer > div[id*=RROW-]"); var children = $$("#headlines-frame > div[id*=RROW-]");
children.each(function(child) { children.each(function(child) {
rv.push(child.id.replace("RROW-", "")); rv.push(child.id.replace("RROW-", ""));
@ -891,7 +894,7 @@ function getLoadedArticleIds() {
function selectArticles(mode) { function selectArticles(mode) {
try { try {
var children = $$("#headlinesInnerContainer > div[id*=RROW]"); var children = $$("#headlines-frame > div[id*=RROW]");
children.each(function(child) { children.each(function(child) {
var id = child.id.replace("RROW-", ""); var id = child.id.replace("RROW-", "");
@ -1164,7 +1167,7 @@ function cdmWatchdog() {
try { try {
var ctr = $("headlinesInnerContainer"); var ctr = $("headlines-frame");
if (!ctr) return; if (!ctr) return;
@ -1775,7 +1778,7 @@ function scrollArticle(offset) {
ci.scrollTop += offset; ci.scrollTop += offset;
} }
} else { } else {
var hi = $("headlinesInnerContainer"); var hi = $("headlines-frame");
if (hi) { if (hi) {
hi.scrollTop += offset; hi.scrollTop += offset;
} }