From 919984a43644da47a978b8ddd6d07be7273f6366 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 27 Mar 2013 22:24:26 +0400
Subject: [PATCH] css cleanup; change notify css a bit

---
 classes/feeds.php |  4 +--
 js/functions.js   | 17 +++++------
 tt-rss.css        | 74 ++++++++++++++---------------------------------
 3 files changed, 31 insertions(+), 64 deletions(-)

diff --git a/classes/feeds.php b/classes/feeds.php
index 52fec80e7..20e3e7004 100644
--- 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 e93ca54e0..ec170a7d9 100644
--- 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 0eeb775e0..f10616f0c 100644
--- 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;
-}
-
-.notifyProgress {
-	border-color : #d7c47a;
-	background-color : #fff7d5;
-	color : black;
-}
-
-.notifyInfo {
-	border-color : #7AD78E;
-	background-color : #D5FFDB;
-	color : black;
+	margin-right : 4px;
 }
 
 .notify {
 	border-color : #d7c47a;
 	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;
 	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;
 }