opensourcemirror
/
tinytinyrss
mirror of https://git.tt-rss.org/fox/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

css cleanup; remove auxDlg; add separate prefs.css

This commit is contained in:
Andrew Dolgov 2013-03-27 22:41:12 +04:00
parent 919984a436
commit f820f205d0
9 changed files with 141 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
atom-to-html.xsl
View File

@ -41,7 +41,6 @@
<p><a href="{enclosure/@url}">Extra...</a></p>
</xsl:if>
<hr/>
</xsl:for-each>

1
index.php
View File

@ -136,7 +136,6 @@
<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
<div id="cmdline" style="display : none"></div>
<div id="auxDlg" style="display : none"></div>
<div id="headlines-tmp" style="display : none"></div>
<div id="main" dojoType="dijit.layout.BorderContainer">

23
js/feedlist.js
View File

@ -88,8 +88,6 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
_infscroll_request_sent = timestamp;
}
hideAuxDlg();
}
Form.enable("main_toolbar_form");
@ -206,23 +204,6 @@ function request_counters(force) {
}
}
function displayNewContentPrompt(id) {
try {
var msg = "<a href='#' onclick='viewCurrentFeed()'>" +
__("New articles available in this feed (click to show)") + "</a>";
msg = msg.replace("%s", getFeedName(id));
$('auxDlg').innerHTML = msg;
new Effect.Appear('auxDlg', {duration : 0.5});
} catch (e) {
exception_error("displayNewContentPrompt", e);
}
}
function parse_counters(elems, scheduled_call) {
try {
for (var l = 0; l < elems.length; l++) {
@ -245,10 +226,6 @@ function parse_counters(elems, scheduled_call) {
continue;
}
if (id == getActiveFeedId() && ctr > getFeedUnread(id) && scheduled_call) {
displayNewContentPrompt(id);
}
if (getFeedUnread(id, (kind == "cat")) != ctr ||
(kind == "cat")) {
}

9
js/functions.js
View File

@ -717,15 +717,6 @@ function hotkey_prefix_timeout() {
}
}
function hideAuxDlg() {
try {
Element.hide('auxDlg');
} catch (e) {
exception_error("hideAuxDlg", e);
}
}
function uploadIconHandler(rc) {
try {
switch (rc) {

6
js/viewfeed.js
View File

@ -347,8 +347,6 @@ function view(id) {
console.log("cache check result: " + (cached_article != false));
hideAuxDlg();
var query = "?op=article&method=view&id=" + param_escape(id);
var neighbor_ids = getRelativePostIds(id);
@ -1433,8 +1431,6 @@ function cdmExpandArticle(id) {
if (!$("RROW-" + id)) return false;
hideAuxDlg();
var elem = $("CICD-" + getActiveArticleId());
if (id == getActiveArticleId() && Element.visible(elem))
@ -1643,8 +1639,6 @@ function cdmClicked(event, id) {
try {
//var shift_key = event.shiftKey;
hideAuxDlg();
if (!event.ctrlKey) {
if (!getInitParam("cdm_expanded")) {

129
prefs.css Normal file
View File

@ -0,0 +1,129 @@
html, body#ttrssPrefs, #main {
width: 100%;
height: 100%;
border: 0;
padding: 0;
margin: 0;
}
#header a {
color : #4684ff;
}
#header a:hover {
color : black;
}
#header img {
vertical-align : middle;
cursor : pointer;
}
div#pref-tabs .dijitContentPane {
font-size : 12px;
}
div#pref-tabs {
margin : 0px 5px 0px 5px;
}
div#pref-tabs .dijitContentPane h3 {
font-size : 14px;
font-weight : bold;
}
#pref-filter-wrap, #pref-filter-header, #pref-filter-content,
#pref-label-wrap, #pref-label-header, #pref-label-content,
#pref-user-wrap, #pref-user-header, #pref-user-content,
#pref-instance-wrap, #pref-instance-header, #pref-instance-content {
margin : 0px;
padding : 0px;
border-width : 0px;
}
#userConfigTab, #labelConfigTab, #filterConfigTab, #pref-feeds-feeds, #instanceConfigTab {
padding : 0px;
}
/* preferences */
table.prefPrefsList h3 {
margin-top : 0.5em;
margin-bottom : 0px;
}
tr.title td {
border-width : 0px 0px 1px 0px;
border-color : #ecf4ff;
border-style : solid;
color : #4684ff;
}
tr.title td a {
color : #4684ff;
}
tr.title td a:hover {
color : black;
}
div.prefFeedCatHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder {
height : 300px;
overflow : auto;
border-width : 0px 1px 1px 1px;
border-color : #c0c0c0;
border-style : solid;
margin : 0px 0px 5px 0px;
background-color : #ecf4ff;
}
div.filterTestHolder {
border-width : 1px 1px 1px 1px;
}
ul.selfUpdateList {
height : 200px;
overflow : auto;
list-style-type : none;
border : 1px solid #c0c0c0;
background-color : #ecf4ff;
margin : 0px 0px 5px 0px;
padding : 5px;
}
div#feedlistLoading, div#filterlistLoading, div#labellistLoading {
text-align : center;
padding : 5px;
color : gray;
}
div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading {
margin-right : 5px;
}
#errorButton {
color : red;
}
a.bookmarklet {
color : #4684ff;
border : 1px solid #ecf4ff;
padding : 2px;
}
table.prefPluginsList td label, table.prefUserList td {
cursor : pointer;
}
ul.userFeedList {
height : 300px;
overflow : auto;
list-style-type : none;
border : 1px solid gray;
background-color : white;
margin : 0px 0px 5px 0px;
padding : 0px;
}

1
prefs.php
View File

@ -37,6 +37,7 @@
<?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
<?php echo stylesheet_tag("tt-rss.css"); ?>
<?php echo stylesheet_tag("prefs.css"); ?>
<?php print_user_stylesheet($link) ?>

177
tt-rss.css
View File

@ -180,6 +180,10 @@ a:hover {
background-color : #fff7d5 ! important;
}
.Unread div.hlTitle {
font-weight : bold;
}
.even.Unread.Selected {
background : #fff7d5 ! important;
border-width : 0px 0px 1px 0px;
@ -252,42 +256,17 @@ a:hover {
border-color : #c0c0c0;
}
/* preferences */
table.prefPrefsList h3 {
margin-top : 0.5em;
margin-bottom : 0px;
}
tr.title td {
border-width : 0px 0px 1px 0px;
border-color : #ecf4ff;
border-style : solid;
color : #4684ff;
}
tr.title td a {
color : #4684ff;
}
tr.title td a:hover {
color : black;
}
div.prefFeedCatHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder, div.filterTestHolder {
div.filterTestHolder {
height : 300px;
overflow : auto;
border-width : 0px 1px 1px 1px;
border-color : #c0c0c0;
border-style : solid;
margin : 0px 0px 5px 0px;
background-color : #ecf4ff;
}
div.prefFeedOPMLHolder, div.filterTestHolder {
border-width : 1px 1px 1px 1px;
}
#content-insert blockquote, #headlines-frame blockquote, .dijitContentPane blockquote {
margin : 5px 0px 5px 0px;
padding : 10px;
@ -494,30 +473,10 @@ ul.feedErrorsList {
padding : 5px;
}
ul.selfUpdateList {
height : 200px;
overflow : auto;
list-style-type : none;
border : 1px solid #c0c0c0;
background-color : #ecf4ff;
margin : 0px 0px 5px 0px;
padding : 5px;
}
ul.feedErrorsList em {
color : gray;
}
ul.userFeedList {
height : 300px;
overflow : auto;
list-style-type : none;
border : 1px solid gray;
background-color : white;
margin : 0px 0px 5px 0px;
padding : 0px;
}
ul.browseFeedList {
height : 300px;
overflow : auto;
@ -614,49 +573,12 @@ html, body#ttrssMain, #main {
margin: 0;
}
html, body#ttrssPrefs, #main {
width: 100%;
height: 100%;
border: 0;
padding: 0;
margin: 0;
}
#toolbar div.actionChooser {
display : table-cell;
text-align : right;
padding-right : 3px;
}
/* preferences layout */
div.return {
float : right;
font-size : 12px;
margin-right : 10px;
}
div.return a {
color : #4684ff;
}
div.return a:hover {
color : black;
}
#header a {
color : #4684ff;
}
#header a:hover {
color : black;
}
#header img {
vertical-align : middle;
cursor : pointer;
}
div.autocomplete {
position : absolute;
width : 250px;
@ -792,25 +714,6 @@ div#cmdline {
width : 18px;
}
div#auxDlg {
position : absolute;
z-index : 3;
bottom : 5px;
right : 25px;
padding : 5px;
border-width : 1px;
border-style : solid;
border-color : #d7c47a;
background-color : #fff7d5;
color : black;
text-align : center;
font-size : 13px;
}
div#auxDlg a {
color : #4684ff;
}
div.hlTitle {
display : table-cell;
cursor : pointer;
@ -992,65 +895,10 @@ img.feedIcon, img.tinyFeedIcon {
vertical-align : middle;
}
div#feedlistLoading, div#filterlistLoading, div#labellistLoading {
text-align : center;
padding : 5px;
color : gray;
}
div#feedlistLoading img, div#filterlistLoading img, div#labellistLoading {
margin-right : 5px;
}
div#pref-tabs .dijitContentPane {
font-size : 12px;
}
div#pref-tabs {
margin : 0px 5px 0px 5px;
}
div#pref-tabs .dijitContentPane h3 {
font-size : 14px;
font-weight : bold;
}
#pref-filter-wrap, #pref-filter-header, #pref-filter-content,
#pref-label-wrap, #pref-label-header, #pref-label-content,
#pref-user-wrap, #pref-user-header, #pref-user-content,
#pref-instance-wrap, #pref-instance-header, #pref-instance-content {
margin : 0px;
padding : 0px;
border-width : 0px;
}
#userConfigTab, #labelConfigTab, #filterConfigTab, #pref-feeds-feeds, #instanceConfigTab {
padding : 0px;
}
#errorButton {
color : red;
}
span.labelFixedLength {
display : inline-block;
width : 70%;
}
#filter_dlg_date_chk_box {
display : inline-block;
}
.dijitDialog .dijitToolbar {
border : 1px solid #c0c0c0;
}
a.bookmarklet {
color : #4684ff;
border : 1px solid #ecf4ff;
padding : 2px;
}
.player {
display : inline-block;
color : gray;
@ -1063,6 +911,7 @@ a.bookmarklet {
text-align : center;
background : white;
}
.player.playing {
color : #00c000;
border-color : #00c000;
@ -1081,10 +930,6 @@ a.bookmarklet {
color : gray;
}
td.error {
color : red;
}
div.dialogNotice {
margin-bottom : 5px;
color : gray;
@ -1111,10 +956,6 @@ ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitChec
margin-right : 5px;
}
table.prefPluginsList td label, table.prefUserList td {
cursor : pointer;
}
ul.helpKbList {
max-height : 300px;
overflow : auto;
@ -1149,10 +990,6 @@ div.postContent p {
max-width : 650px;
}
.Unread div.hlTitle {
font-weight : bold;
}
div.postContent iframe {
min-width : 50%;
}

5
utility.css
View File

@ -99,7 +99,6 @@ div.rss h1 {
div.rss h2 {
font-size : 12pt;
margin : 0px;
}
div.rss a.extlink {
@ -110,6 +109,10 @@ div.rss a.extlink {
font-size : 9pt;
}
div.rss img {
max-width : 775px;
}
div.rss p.description {
color : gray;
font-size : 9pt;