valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

css cleanup; change notify css a bit

This commit is contained in:
Andrew Dolgov 2013-03-27 22:24:26 +04:00
parent 6deafe90db
commit 919984a436
3 changed files with 31 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/feeds.php
View File

@ -744,7 +744,7 @@ class Feeds extends Handler_Protected {
if (!$offset && $message) { if (!$offset && $message) {
$reply['content'] .= "<div class='whiteBox'>$message"; $reply['content'] .= "<div class='whiteBox'>$message";
$reply['content'] .= "<p class=\"small\"><span class=\"insensitive\">"; $reply['content'] .= "<p><span class=\"insensitive\">";
$result = db_query($this->link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds $result = db_query($this->link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']); WHERE owner_uid = " . $_SESSION['uid']);
@ -932,7 +932,7 @@ class Feeds extends Handler_Protected {
$reply['headlines']['toolbar'] = ''; $reply['headlines']['toolbar'] = '';
$reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.'); $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
$reply['headlines']['content'] .= "<p class=\"small\"><span class=\"insensitive\">"; $reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
$result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
WHERE owner_uid = " . $_SESSION['uid']); WHERE owner_uid = " . $_SESSION['uid']);

17
js/functions.js
View File

@ -194,30 +194,29 @@ function notify_real(msg, no_hide, n_type) {
*/ */
if (typeof __ != 'undefined') { msg = __(msg);
msg = __(msg);
}
if (n_type == 1) { if (n_type == 1) {
n.className = "notify"; n.className = "notify";
} else if (n_type == 2) { } else if (n_type == 2) {
n.className = "notifyProgress"; n.className = "notify progress";
msg = "<img src='images/indicator_white.gif'> " + msg; msg = "<img src='images/indicator_white.gif'> " + msg;
} else if (n_type == 3) { } else if (n_type == 3) {
n.className = "notifyError"; n.className = "notify error";
msg = "<img src='images/sign_excl.svg'> " + msg; msg = "<img src='images/sign_excl.svg'> " + msg;
} else if (n_type == 4) { } else if (n_type == 4) {
n.className = "notifyInfo"; n.className = "notify info";
msg = "<img src='images/sign_info.svg'> " + msg; msg = "<img src='images/sign_info.svg'> " + msg;
} }
// msg = "<img src='images/live_com_loading.gif'> " + msg;
if (no_hide) { if (no_hide) {
msg += " (<a href='#' onclick=\"notify('')\">X</a>)"; msg += " <span>(<a href='#' onclick=\"notify('')\">" +
__("close") + "</a>)</span>";
} }
// msg = "<img src='images/live_com_loading.gif'> " + msg;
nb.innerHTML = msg; nb.innerHTML = msg;
if (!no_hide) { if (!no_hide) {

74
tt-rss.css
View File

@ -132,53 +132,51 @@ a:hover {
} }
#notify { #notify {
border-width : 0px 1px 1px 1px; top : 10px;
right : 10px;
border-width : 1px;
border-style : solid; border-style : solid;
top : 0px;
right : 35%;
min-width : 30%;
position : absolute; position : absolute;
display : none; display : none;
float : right; float : right;
font-size : 12px; font-size : 11px;
z-index : 99; z-index : 99;
padding : 5px 5px 5px 5px; padding : 5px;
min-width : 200px;
box-shadow : 0px 0px 2px #ccc;
} }
#notify img { #notify img {
vertical-align : middle; vertical-align : middle;
} margin-right : 4px;
.notifyProgress {
border-color : #d7c47a;
background-color : #fff7d5;
color : black;
}
.notifyInfo {
border-color : #7AD78E;
background-color : #D5FFDB;
color : black;
} }
.notify { .notify {
border-color : #d7c47a; border-color : #d7c47a;
background-color : #fff7d5; background-color : #fff7d5;
color : black;
} }
.notifyError { .notify.progress {
border-color : #d7c47a;
background-color : #fff7d5;
}
.notify.info {
border-color : #88b0f0;
background-color : #ecf4ff;
}
.notify.error {
background-color : #ffcccc; background-color : #ffcccc;
border-color : #ff0000; border-color : #ff0000;
color : black;
} }
.notifyError span:hover { .notify.error span:hover {
color : red; color : red;
cursor : pointer; cursor : pointer;
} }
.Selected, .Selected { .Selected {
background-color : #fff7d5 ! important; background-color : #fff7d5 ! important;
} }
@ -254,10 +252,6 @@ a:hover {
border-color : #c0c0c0; border-color : #c0c0c0;
} }
.invisible {
display : none;
}
/* preferences */ /* preferences */
table.prefPrefsList h3 { table.prefPrefsList h3 {
@ -294,14 +288,6 @@ div.prefFeedOPMLHolder, div.filterTestHolder {
border-width : 1px 1px 1px 1px; border-width : 1px 1px 1px 1px;
} }
a.helpLink {
color : #808080;
}
a.helpLink:hover {
color : #4684ff;
}
#content-insert blockquote, #headlines-frame blockquote, .dijitContentPane blockquote { #content-insert blockquote, #headlines-frame blockquote, .dijitContentPane blockquote {
margin : 5px 0px 5px 0px; margin : 5px 0px 5px 0px;
padding : 10px; padding : 10px;
@ -383,10 +369,6 @@ span.feed_error {
color : black; color : black;
} }
.small {
font-size : 11px;
}
div#headlines-toolbar { div#headlines-toolbar {
border-width : 0px 0px 1px 0px; border-width : 0px 0px 1px 0px;
background-color : #f0f0f0; background-color : #f0f0f0;
@ -487,10 +469,6 @@ img.markedPic {
vertical-align : middle; vertical-align : middle;
} }
a.warning {
color : #f04040;
}
div.tagCloudContainer { div.tagCloudContainer {
border : 1px solid #c0c0c0; border : 1px solid #c0c0c0;
background-color : #ecf4ff; background-color : #ecf4ff;
@ -711,16 +689,6 @@ a.visibleLink {
color : #4684ff; color : #4684ff;
} }
a.visibleLinkB {
color : #4684ff;
border : 1px solid #4684ff;
padding : 2px;
}
a.visibleLinkB:hover {
background-color : #ecf4ff;
}
.hlContentH a, .hlContentH span { .hlContentH a, .hlContentH span {
color : #00cc00; color : #00cc00;
} }