From 5c99a2fae83405fec2c98b9ad07b3b29b7457122 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 3 Jul 2013 17:38:00 -0400
Subject: [PATCH] accomodated mono and multilingual theme, small css change

Change-Id: I9513534f8d6e775cea314efcee936104c77d3db5
---
 .gitignore                         |   1 +
 os/media/sass/.extra.scss.swp      | Bin 24576 -> 0 bytes
 os/media/sass/extra.scss           |   4 ++++
 os/media/style/extra.css           |  34 ++++++++++++++++-------------
 os/templates/widgets/meta_nav.html |   4 +++-
 5 files changed, 27 insertions(+), 16 deletions(-)
 delete mode 100644 os/media/sass/.extra.scss.swp

diff --git a/.gitignore b/.gitignore
index 5df1b9b..cd08f59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .sass-cache
+.*.swp
diff --git a/os/media/sass/.extra.scss.swp b/os/media/sass/.extra.scss.swp
deleted file mode 100644
index 5a9938df7dee2acf2e802708eecb004d0aa260b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24576
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
PZuN+Vd=g^-D#3pO!L**|

diff --git a/os/media/sass/extra.scss b/os/media/sass/extra.scss
index 1668080..0bafa83 100644
--- a/os/media/sass/extra.scss
+++ b/os/media/sass/extra.scss
@@ -266,6 +266,10 @@ input.cancelSearchBtn {
     border: none !important;
     color: #888 !important;
     background: transparent !important;
+    font-size: 23px !important;
+    height: 32px !important;
+    line-height: 32px !important;
+    width: 32px !important;
 }
 button,
 input[type="submit"],
diff --git a/os/media/style/extra.css b/os/media/style/extra.css
index 91a696e..203437a 100644
--- a/os/media/style/extra.css
+++ b/os/media/style/extra.css
@@ -332,9 +332,13 @@ input.cancelSearchBtn {
   border: none !important;
   color: #888 !important;
   background: transparent !important;
+  font-size: 23px !important;
+  height: 32px !important;
+  line-height: 32px !important;
+  width: 32px !important;
 }
 
-/* line 274, ../sass/extra.scss */
+/* line 278, ../sass/extra.scss */
 button,
 input[type="submit"],
 input[type="button"],
@@ -367,46 +371,46 @@ input[type="reset"],
   border-left-color: #bababa !important;
 }
 
-/* line 294, ../sass/extra.scss */
+/* line 298, ../sass/extra.scss */
 .comments input[type="submit"],
 .comments .controls a.button {
   color: #4b4b4b !important;
   border: none !important;
 }
-/* line 297, ../sass/extra.scss */
+/* line 301, ../sass/extra.scss */
 .comments input[type="submit"]:hover,
 .comments .controls a.button:hover {
   text-decoration: underline;
 }
-/* line 301, ../sass/extra.scss */
+/* line 305, ../sass/extra.scss */
 .comments input[type="submit"] {
   color: #1b71bd;
 }
 
-/* line 305, ../sass/extra.scss */
+/* line 309, ../sass/extra.scss */
 input[type="submit"].link {
   border: none !important;
   color: 4b4b4b !important;
 }
 
-/* line 310, ../sass/extra.scss */
+/* line 314, ../sass/extra.scss */
 #footer {
   margin-top: 10px;
 }
-/* line 313, ../sass/extra.scss */
+/* line 317, ../sass/extra.scss */
 #footer .span-4,
 #footer .span-8 {
   margin: 0;
 }
-/* line 316, ../sass/extra.scss */
+/* line 320, ../sass/extra.scss */
 #footer .span-4 {
   width: 17%;
 }
-/* line 319, ../sass/extra.scss */
+/* line 323, ../sass/extra.scss */
 #footer .span-8 {
   width: 32%;
 }
-/* line 326, ../sass/extra.scss */
+/* line 330, ../sass/extra.scss */
 #footer a,
 #footer a:active,
 #footer a:hover,
@@ -416,30 +420,30 @@ input[type="submit"].link {
   font-size: 12px;
   line-height: 18px;
 }
-/* line 331, ../sass/extra.scss */
+/* line 335, ../sass/extra.scss */
 #footer p {
   margin-top: 14px;
 }
-/* line 334, ../sass/extra.scss */
+/* line 338, ../sass/extra.scss */
 #footer h3 {
   color: #de0000;
   font-size: 16px;
   margin: 0 0 8px 0;
   padding: 0;
 }
-/* line 340, ../sass/extra.scss */
+/* line 344, ../sass/extra.scss */
 #footer ul {
   list-style: none;
   margin: 0;
 }
-/* line 344, ../sass/extra.scss */
+/* line 348, ../sass/extra.scss */
 #footer textarea {
   display: block;
   margin: 12px 0 10px;
   width: 80%;
 }
 
-/* line 351, ../sass/extra.scss */
+/* line 355, ../sass/extra.scss */
 .pager,
 .paginator {
   margin-bottom: 0;
diff --git a/os/templates/widgets/meta_nav.html b/os/templates/widgets/meta_nav.html
index b1d92e6..35519f8 100644
--- a/os/templates/widgets/meta_nav.html
+++ b/os/templates/widgets/meta_nav.html
@@ -137,4 +137,6 @@ under the License.
 >{% trans %}badges{% endtrans %}</a>
 {% endif %}
 <a class="help" href="{% url "help" %}" title="{% trans %}help{% endtrans %}">{% trans %}help{% endtrans %}</a>
-{% include 'widgets/language_nav.html' %}
+{% if settings.MULTILINGUAL %}
+    {% include 'widgets/language_nav.html' %}
+{% endif %}