Merge branch '2375-demo-theme-development' of github.com:okfn/ckan in…

…to 2375-demo-theme-development
ckan · Jul 25, 2012 · e58aa57 · e58aa57
2 parents 1a743ab + bc55777
commit e58aa57
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css
@@ -5498,6 +5498,11 @@ textarea {
 .select2-container-multi .select2-drop {
   margin-top: -2px;
 }
+.select2-container .select2-results li {
+  line-height: 18px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
 .control-full .select2-container {
   width: 520px !important;
 }
@@ -6548,16 +6553,14 @@ li .icon-large:before {
 .site-footer:after {
   clear: both;
 }
-.site-footer a {
-  color: #ffffff;
-}
+.site-footer,
+.site-footer a,
 .site-footer label {
-  color: #ffffff;
+  color: #fff;
+  color: rgba(255, 255, 255, 0.8);
 }
 .footer-links,
 .attribution {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
   float: left;
   margin-left: 20px;
   width: 460px;
@@ -6582,6 +6585,9 @@ li .icon-large:before {
   margin-top: 2px;
   background: url("../images/ckan-logo-footer.png") no-repeat top left;
 }
+.attribution .select2-drop {
+  color: #000;
+}
 .profile-info {
   *zoom: 1;
   -webkit-border-radius: 3px 3px 0 0;

diff --git a/ckan/public/base/less/footer.less b/ckan/public/base/less/footer.less
@@ -4,17 +4,15 @@
   padding: 20px 0;
 }
 
-.site-footer a {
-  color: @mastheadLinkColor;
-}
-
+.site-footer,
+.site-footer a,
 .site-footer label {
-  color: @mastheadLinkColor;
+  color: #fff;
+  color: rgba(255, 255, 255, 0.8);
 }
 
 .footer-links,
 .attribution {
-  .opacity(80);
   .makeColumn(6);
 }
 
@@ -41,3 +39,7 @@
   margin-top: 2px;
   background: url("@{imagePath}/ckan-logo-footer.png") no-repeat top left;
 }
+
+.attribution .select2-drop {
+  color: #000;
+}
diff --git a/ckan/public/base/less/forms.less b/ckan/public/base/less/forms.less
@@ -569,6 +569,12 @@ textarea {
   margin-top: -2px;
 }
 
+.select2-container .select2-results li {
+  line-height: 18px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
 .control-full .select2-container {
   // Important is bad but select2 incorrectly calculates the width and
   // sets it on the element.

diff --git a/ckan/templates/snippets/language_selector.html b/ckan/templates/snippets/language_selector.html
@@ -2,10 +2,10 @@
 {% set current_lang = request.environ.CKAN_LANG %}
 <form class="form-inline form-select" action="{% url_for controller='util', action='redirect' %}" data-module="select-switch" method="POST">
   <label for="field-lang-select">{{ _('Language') }}</label>
-  <select id="field-lang-select" name="url">
+  <select id="field-lang-select" name="url" data-module="autocomplete">
     {% for locale in h.get_available_locales() %}
-    <option value="{% url_for current_url, locale=locale %}" {% if locale == current_lang %}selected="selected"{% endif %}>
-    {{ locale.display_name or locale.english_name }}
+      <option value="{% url_for current_url, locale=locale %}" {% if locale == current_lang %}selected="selected"{% endif %}>
+        {{ locale.display_name or locale.english_name }}
       </option>
     {% endfor %}
   </select>