css cleanup; change notify css a bit

diff --git a/classes/feeds.php b/classes/feeds.php
index 52fec80e7bf6e417aff0831a7a8b2cc640d4c085..20e3e7004c53b7d2d8f6b72b1b0767d4b8ef6cc6 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -744,7 +744,7 @@ class Feeds extends Handler_Protected {
                        if (!$offset && $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
                                        WHERE owner_uid = " . $_SESSION['uid']);
@@ -932,7 +932,7 @@ class Feeds extends Handler_Protected {
                $reply['headlines']['toolbar'] = '';
                $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
                        WHERE owner_uid = " . $_SESSION['uid']);

diff --git a/js/functions.js b/js/functions.js
index e93ca54e09a7e2ef24f99155a0a80fc495105e8c..ec170a7d910bc6fc7192f6d48624a6580e3b04b1 100644 (file)
--- a/js/functions.js
+++ b/js/functions.js
@@ -194,30 +194,29 @@ function notify_real(msg, no_hide, n_type) {
 
        */
 
-       if (typeof __ != 'undefined') {
-               msg = __(msg);
-       }
+       msg = __(msg);
 
        if (n_type == 1) {
                n.className = "notify";
        } else if (n_type == 2) {
-               n.className = "notifyProgress";
+               n.className = "notify progress";
                msg = "<img src='images/indicator_white.gif'> " + msg;
        } else if (n_type == 3) {
-               n.className = "notifyError";
+               n.className = "notify error";
                msg = "<img src='images/sign_excl.svg'> " + msg;
        } else if (n_type == 4) {
-               n.className = "notifyInfo";
+               n.className = "notify info";
                msg = "<img src='images/sign_info.svg'> " + msg;
        }
 
-//     msg = "<img src='images/live_com_loading.gif'> " + msg;
-
        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;
 
        if (!no_hide) {

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