Merge branch 'master' into talmdal_dev

Conflicts:
	lib/gallery.common.css
	themes/admin_wind/views/admin.html.php
	themes/night_wind/views/sidebar.html.php
	themes/wind/views/sidebar.html.php

2 files changed, 1 insertions, 73 deletions

diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index 60abc08d..cb51f349 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -2,10 +2,6 @@
  * Fix display in IE 6, 7
  */
 
-.g-clearfix {
-  zoom: 1;
-}
-
 #g-banner {
   z-index: 2;
 }
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index cae472be..36231b0d 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -467,8 +467,7 @@ li.g-error select {
  * 5) Navigation and menus
  *********************************************************************/
 
-#g-site-menu,
-#g-tag-cloud ul {
+#g-site-menu {
   font-size: 1.2em;
 }
 
@@ -566,73 +565,6 @@ li.g-error select {
   background-image: url('../images/ico-print.png');
 }
 
-/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-tag-cloud ul {
-  text-align: justify;
-}
-
-#g-tag-cloud ul li {
-  display: inline;
-  line-height: 1.5em;
-  text-align: justify;
-}
-
-#g-tag-cloud ul li a {
-  text-decoration: none;
-}
-
-#g-tag-cloud ul li span {
-  display: none;
-}
-
-#g-tag-cloud ul li.size1 a {
-  color: #9cf;
-  font-size: 80%;
-  font-weight: 100;
-}
-
-#g-tag-cloud ul li.size2 a {
-  color: #69f;
-  font-size: 90%;
-  font-weight: 300;
-}
-
-#g-tag-cloud ul li.size3 a {
-  color: #69c;
-  font-size: 100%;
-  font-weight: 500;
-}
-
-#g-tag-cloud ul li.size4 a {
-  color: #369;
-  font-size: 110%;
-  font-weight: 700;
-}
-
-#g-tag-cloud ul li.size5 a {
-  color: #0e2b52;
-  font-size: 120%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li.size6 a {
-  color: #0e2b52;
-  font-size: 130%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li.size7 a {
-  color: #0e2b52;
-  font-size: 140%;
-  font-weight: 900;
-}
-
-#g-tag-cloud ul li a:hover {
-  color: #f30;
-  text-decoration: underline;
-}
-
 #g-welcome-message p {
   padding-bottom: 1em;
 }