From ce3fa4d5075e74071601f7ef01134256e63684da Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 21 Mar 2013 16:11:05 -0400
Subject: [PATCH] Replace "ok" with a close glyph
---
.../javascripts/discourse/templates/composer.js.handlebars | 4 ++--
app/assets/stylesheets/application/compose.css.scss | 7 +++++++
config/locales/client.en.yml | 1 -
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index 317b739f7..7ad7b464e 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -3,12 +3,12 @@
<div class='contents'>
<div id='new-user-education' class='composer-popup' style='display: none'>
- <a href='#' {{action closeEducation}} class='close'>{{i18n ok}}</a>
+ <a href='#' {{action closeEducation}} class='close'><i class='icon icon-remove-sign'></i></a>
{{{controller.educationContents}}}
</div>
<div id='similar-topics' class='composer-popup' style='display: none'>
- <a href='#' {{action closeSimilar}} class='close'>{{i18n ok}}</a>
+ <a href='#' {{action closeSimilar}} class='close'><i class='icon icon-remove-sign'></i></a>
<h3>{{i18n composer.similar_topics}}<h3>
<ul class='topics'>
diff --git a/app/assets/stylesheets/application/compose.css.scss b/app/assets/stylesheets/application/compose.css.scss
index 42bf77dd6..b7b3e67b6 100644
--- a/app/assets/stylesheets/application/compose.css.scss
+++ b/app/assets/stylesheets/application/compose.css.scss
@@ -14,6 +14,13 @@
a.close {
float: right;
+ color: $black;
+ opacity: 0.5;
+ font-size: 15px;
+ }
+
+ a.close:hover {
+ opacity: 1.0;
}
background-color: lighten($yellow, 40%);
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 04bf3d33e..f0969d3b6 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -24,7 +24,6 @@ en:
links: Links
faq: "FAQ"
you: "You"
- ok: "ok"
or: "or"
now: "just now"