From 195b85d42555e9e6b219dadb572e918f89fc662f Mon Sep 17 00:00:00 2001
From: Andrew Berry <deviantintegral@gmail.com>
Date: Thu, 28 Jun 2012 09:50:43 -0400
Subject: [PATCH 1/4] Issue #660772: Use spans instead of divs for the static
 widget.

---
 css/fivestar.css            | 10 +++++-----
 includes/fivestar.theme.inc | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/css/fivestar.css b/css/fivestar.css
index c467e1a..366ca06 100644
--- a/css/fivestar.css
+++ b/css/fivestar.css
@@ -30,15 +30,15 @@ form.fivestar-widget input {
 }
 
 /* Static View-only Star Version */
-div.fivestar-widget-static {
+.fivestar-widget-static {
   display: block;
 }
 
-div.fivestar-widget-static br {
+.fivestar-widget-static br {
   clear: left; /* RTL */
 }
 
-div.fivestar-widget-static .star {
+.fivestar-widget-static .star {
   float: left; /* RTL */
   width: 17px;
   height: 15px;
@@ -47,14 +47,14 @@ div.fivestar-widget-static .star {
   background: url(../widgets/default/star.gif) no-repeat 0 0; /* RTL */
 }
 
-div.fivestar-widget-static .star span.on {
+.fivestar-widget-static .star span.on {
   display: block;
   width: 100%;
   height: 100%;
   background: url(../widgets/default/star.gif) no-repeat 0 -32px; /* RTL */
 }
 
-div.fivestar-widget-static .star span.off {
+.fivestar-widget-static .star span.off {
   display: block;
   width: 100%;
   height: 100%;
diff --git a/includes/fivestar.theme.inc b/includes/fivestar.theme.inc
index 8038abc..05cf4b6 100644
--- a/includes/fivestar.theme.inc
+++ b/includes/fivestar.theme.inc
@@ -188,8 +188,8 @@ function theme_fivestar_static($variables) {
     drupal_add_css($widget['css']);
   }
 
-  $output = '<div class="fivestar-' . $widget['name'] . '">';
-  $output .= '<div class="fivestar-widget-static fivestar-widget-static-'. $tag .' fivestar-widget-static-'. $stars . ' clearfix">';
+  $output = '<span class="fivestar-' . $widget['name'] . '">';
+  $output .= '<span class="fivestar-widget-static fivestar-widget-static-'. $tag .' fivestar-widget-static-'. $stars . ' clearfix">';
   if (empty($stars)) {
     $stars = 5;
   }
@@ -200,7 +200,7 @@ function theme_fivestar_static($variables) {
     $zebra = ($n % 2 == 0) ? 'even' : 'odd';
     $first = $n == 1 ? ' star-first' : '';
     $last = $n == $stars ? ' star-last' : '';
-    $output .= '<div class="star star-'. $n .' star-'. $zebra . $first . $last .'">';
+    $output .= '<span class="star star-'. $n .' star-'. $zebra . $first . $last .'">';
     if ($rating < $star_value && $rating > $prev_star_value) {
       $percent = (($rating - $prev_star_value) / ($star_value - $prev_star_value)) * 100;
       $output .= '<span class="on" style="width: '. $percent .'%">';
@@ -212,9 +212,9 @@ function theme_fivestar_static($variables) {
       $output .= '<span class="off">';
     }
     if ($n == 1)$output .= $numeric_rating;
-    $output .= '</span></div>';
+    $output .= '</span></span>';
   }
-  $output .= '</div></div>';
+  $output .= '</span></span>';
   return $output;
 }
 
-- 
1.7.11.1


From 6a01294c99817accc1d16b09db848aeadcceed39 Mon Sep 17 00:00:00 2001
From: Andrew Berry <deviantintegral@gmail.com>
Date: Mon, 2 Jul 2012 09:30:01 -0400
Subject: [PATCH 2/4] Issue #660772: Remove divs from all styles for the
 static widget.

---
 widgets/basic/basic-rtl.css     |  4 +--
 widgets/basic/basic.css         |  8 ++---
 widgets/craft/craft-rtl.css     |  8 ++---
 widgets/craft/craft.css         | 70 ++++++++++++++++++++---------------------
 widgets/drupal/drupal.txt       |  8 ++---
 widgets/flames/flames-rtl.css   |  8 ++---
 widgets/flames/flames.css       |  8 ++---
 widgets/hearts/hearts-rtl.css   |  2 +-
 widgets/hearts/hearts.css       |  8 ++---
 widgets/lullabot/lullabot.txt   |  8 ++---
 widgets/minimal/minimal-rtl.css |  2 +-
 widgets/minimal/minimal.css     |  8 ++---
 widgets/outline/outline-rtl.css |  4 +--
 widgets/outline/outline.css     |  8 ++---
 widgets/oxygen/oxygen-rtl.css   |  2 +-
 widgets/oxygen/oxygen.css       |  6 ++--
 widgets/small/small-rtl.css     |  6 ++--
 widgets/small/small.css         |  8 ++---
 18 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/widgets/basic/basic-rtl.css b/widgets/basic/basic-rtl.css
index a9f5de6..0967997 100755
--- a/widgets/basic/basic-rtl.css
+++ b/widgets/basic/basic-rtl.css
@@ -1,5 +1,5 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
-.fivestar-basic div.fivestar-widget-static .star span.on {
+.fivestar-basic .fivestar-widget-static .star span.on {
   background-position: right -32px;
 }
 .fivestar-basic div.fivestar-widget div.on a {
@@ -8,4 +8,4 @@
 .fivestar-basic div.fivestar-widget div.hover a,
 .fivestar-basic div.rating div a:hover {
   background-position: right -32px;
-}
\ No newline at end of file
+}
diff --git a/widgets/basic/basic.css b/widgets/basic/basic.css
index 093e8ae..80d258d 100755
--- a/widgets/basic/basic.css
+++ b/widgets/basic/basic.css
@@ -1,13 +1,13 @@
 /* Static View-only Star Version */
-.fivestar-basic div.fivestar-widget-static .star {
+.fivestar-basic .fivestar-widget-static .star {
   background-image: url(star.png);
 }
 
-.fivestar-basic div.fivestar-widget-static .star span.on {
+.fivestar-basic .fivestar-widget-static .star span.on {
   background-image: url(star.png);
 }
 
-.fivestar-basic div.fivestar-widget-static .star span.off {
+.fivestar-basic .fivestar-widget-static .star span.off {
   background-image: url(star.png);
 }
 
@@ -24,4 +24,4 @@
 .fivestar-basic div.fivestar-widget div.hover a,
 .fivestar-basic div.rating div a:hover {
   background-image: url(star.png);
-}
\ No newline at end of file
+}
diff --git a/widgets/craft/craft-rtl.css b/widgets/craft/craft-rtl.css
index 0bf70db..aafdfd5 100755
--- a/widgets/craft/craft-rtl.css
+++ b/widgets/craft/craft-rtl.css
@@ -1,14 +1,14 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
 .fivestar-craft div.fivestar-widget .star,
 .fivestar-craft div.fivestar-widget .star a,
-.fivestar-craft div.fivestar-widget-static .star,
-.fivestar-craft div.fivestar-widget-static .star span.on {
+.fivestar-craft .fivestar-widget-static .star,
+.fivestar-craft .fivestar-widget-static .star span.on {
   background-position: right -62px;
 }
-.fivestar-craft div.fivestar-widget-static .star span.off {
+.fivestar-craft .fivestar-widget-static .star span.off {
   background-position: right -62px;
 }
-.fivestar-craft div.fivestar-widget-static .star span.on {
+.fivestar-craft .fivestar-widget-static .star span.on {
   background-position: right 0;
 }
 .fivestar-craft div.fivestar-widget div.on a {
diff --git a/widgets/craft/craft.css b/widgets/craft/craft.css
index 3204d92..14cf9de 100644
--- a/widgets/craft/craft.css
+++ b/widgets/craft/craft.css
@@ -1,7 +1,7 @@
 /**
  * Settings for all stars.
  */
-.fivestar-craft div.fivestar-widget-static .star,
+.fivestar-craft .fivestar-widget-static .star,
 .fivestar-craft div.fivestar-widget .star,
 .fivestar-craft div.fivestar-widget div.on a {
   height: 31px;
@@ -9,8 +9,8 @@
 
 .fivestar-craft div.fivestar-widget .star,
 .fivestar-craft div.fivestar-widget .star a,
-.fivestar-craft div.fivestar-widget-static .star,
-.fivestar-craft div.fivestar-widget-static .star span.on {
+.fivestar-craft .fivestar-widget-static .star,
+.fivestar-craft .fivestar-widget-static .star span.on {
   background: no-repeat 0 -62px;
 }
 
@@ -19,71 +19,71 @@
  */
 .fivestar-craft div.fivestar-widget .star-1,
 .fivestar-craft div.fivestar-widget .star-1 a,
-.fivestar-craft div.fivestar-widget-static .star-1,
-.fivestar-craft div.fivestar-widget-static .star-1 span.on {
+.fivestar-craft .fivestar-widget-static .star-1,
+.fivestar-craft .fivestar-widget-static .star-1 span.on {
   width: 8px;
   background-image: url(craft-01.png);
 }
 .fivestar-craft div.fivestar-widget .star-2,
 .fivestar-craft div.fivestar-widget .star-2 a,
-.fivestar-craft div.fivestar-widget-static .star-2,
-.fivestar-craft div.fivestar-widget-static .star-2 span.on {
+.fivestar-craft .fivestar-widget-static .star-2,
+.fivestar-craft .fivestar-widget-static .star-2 span.on {
   width: 9px;
   background-image: url(craft-02.png);
 }
 .fivestar-craft div.fivestar-widget .star-3,
 .fivestar-craft div.fivestar-widget .star-3 a,
-.fivestar-craft div.fivestar-widget-static .star-3,
-.fivestar-craft div.fivestar-widget-static .star-3 span.on {
+.fivestar-craft .fivestar-widget-static .star-3,
+.fivestar-craft .fivestar-widget-static .star-3 span.on {
   width: 9px;
   background-image: url(craft-03.png);
 }
 .fivestar-craft div.fivestar-widget .star-4,
 .fivestar-craft div.fivestar-widget .star-4 a,
-.fivestar-craft div.fivestar-widget-static .star-4,
-.fivestar-craft div.fivestar-widget-static .star-4 span.on {
+.fivestar-craft .fivestar-widget-static .star-4,
+.fivestar-craft .fivestar-widget-static .star-4 span.on {
   width: 10px;
   background-image: url(craft-04.png);
 }
 .fivestar-craft div.fivestar-widget .star-5,
 .fivestar-craft div.fivestar-widget .star-5 a,
-.fivestar-craft div.fivestar-widget-static .star-5,
-.fivestar-craft div.fivestar-widget-static .star-5 span.on {
+.fivestar-craft .fivestar-widget-static .star-5,
+.fivestar-craft .fivestar-widget-static .star-5 span.on {
   width: 10px;
   background-image: url(craft-05.png);
 }
 .fivestar-craft div.fivestar-widget .star-6,
 .fivestar-craft div.fivestar-widget .star-6 a,
-.fivestar-craft div.fivestar-widget-static .star-6,
-.fivestar-craft div.fivestar-widget-static .star-6 span.on {
+.fivestar-craft .fivestar-widget-static .star-6,
+.fivestar-craft .fivestar-widget-static .star-6 span.on {
   width: 12px;
   background-image: url(craft-06.png);
 }
 .fivestar-craft div.fivestar-widget .star-7,
 .fivestar-craft div.fivestar-widget .star-7 a,
-.fivestar-craft div.fivestar-widget-static .star-7,
-.fivestar-craft div.fivestar-widget-static .star-7 span.on {
+.fivestar-craft .fivestar-widget-static .star-7,
+.fivestar-craft .fivestar-widget-static .star-7 span.on {
   width: 15px;
   background-image: url(craft-07.png);
 }
 .fivestar-craft div.fivestar-widget .star-8,
 .fivestar-craft div.fivestar-widget .star-8 a,
-.fivestar-craft div.fivestar-widget-static .star-8,
-.fivestar-craft div.fivestar-widget-static .star-8 span.on {
+.fivestar-craft .fivestar-widget-static .star-8,
+.fivestar-craft .fivestar-widget-static .star-8 span.on {
   width: 16px;
   background-image: url(craft-08.png);
 }
 .fivestar-craft div.fivestar-widget .star-9,
 .fivestar-craft div.fivestar-widget .star-9 a,
-.fivestar-craft div.fivestar-widget-static .star-9,
-.fivestar-craft div.fivestar-widget-static .star-9 span.on {
+.fivestar-craft .fivestar-widget-static .star-9,
+.fivestar-craft .fivestar-widget-static .star-9 span.on {
   width: 22px;
   background-image: url(craft-09.png);
 }
 .fivestar-craft div.fivestar-widget .star-10,
 .fivestar-craft div.fivestar-widget .star-10 a,
-.fivestar-craft div.fivestar-widget-static .star-10,
-.fivestar-craft div.fivestar-widget-static .star-10 span.on {
+.fivestar-craft .fivestar-widget-static .star-10,
+.fivestar-craft .fivestar-widget-static .star-10 span.on {
   width: 27px;
   background-image: url(craft-10.png);
 }
@@ -93,29 +93,29 @@
  */
 .fivestar-craft div.fivestar-widget-5 .star-2,
 .fivestar-craft div.fivestar-widget-5 .star-2 a,
-.fivestar-craft div.fivestar-widget-static-5 .star-2,
-.fivestar-craft div.fivestar-widget-static-5 .star-2 span.on {
+.fivestar-craft .fivestar-widget-static-5 .star-2,
+.fivestar-craft .fivestar-widget-static-5 .star-2 span.on {
   width: 9px;
   background-image: url(craft-03.png);
 }
 .fivestar-craft div.fivestar-widget-5 .star-3,
 .fivestar-craft div.fivestar-widget-5 .star-3 a,
-.fivestar-craft div.fivestar-widget-static-5 .star-3,
-.fivestar-craft div.fivestar-widget-static-5 .star-3 span.on {
+.fivestar-craft .fivestar-widget-static-5 .star-3,
+.fivestar-craft .fivestar-widget-static-5 .star-3 span.on {
   width: 15px;
   background-image: url(craft-07.png);
 }
 .fivestar-craft div.fivestar-widget-5 .star-4,
 .fivestar-craft div.fivestar-widget-5 .star-4 a,
-.fivestar-craft div.fivestar-widget-static-5 .star-4,
-.fivestar-craft div.fivestar-widget-static-5 .star-4 span.on {
+.fivestar-craft .fivestar-widget-static-5 .star-4,
+.fivestar-craft .fivestar-widget-static-5 .star-4 span.on {
   width: 16px;
   background-image: url(craft-08.png);
 }
 .fivestar-craft div.fivestar-widget-5 .star-5,
 .fivestar-craft div.fivestar-widget-5 .star-5 a,
-.fivestar-craft div.fivestar-widget-static-5 .star-5,
-.fivestar-craft div.fivestar-widget-static-5 .star-5 span.on {
+.fivestar-craft .fivestar-widget-static-5 .star-5,
+.fivestar-craft .fivestar-widget-static-5 .star-5 span.on {
   width: 27px;
   background-image: url(craft-10.png);
 }
@@ -124,8 +124,8 @@
 /**
  * Dynamic rollovers.
  */
-.fivestar-craft div.fivestar-widget-static .star span.on,
-.fivestar-craft div.fivestar-widget-static .star span.on a,
+.fivestar-craft .fivestar-widget-static .star span.on,
+.fivestar-craft .fivestar-widget-static .star span.on a,
 .fivestar-craft div.fivestar-widget div.on a {
   background-position: 0 0;
 }
@@ -133,7 +133,7 @@
 div.rating div a:hover {
   background-position: 0 -31px;
 }
-.fivestar-craft div.fivestar-widget-static .star span.off {
+.fivestar-craft .fivestar-widget-static .star span.off {
   background-position: 0 -62px;
 }
 
@@ -150,4 +150,4 @@ div.rating div a:hover {
   width: 9px;
   height: 31px;
   background-position: 0 -31px;
-}
\ No newline at end of file
+}
diff --git a/widgets/drupal/drupal.txt b/widgets/drupal/drupal.txt
index ed1dbdd..f67e589 100644
--- a/widgets/drupal/drupal.txt
+++ b/widgets/drupal/drupal.txt
@@ -1,15 +1,15 @@
 /* Static View-only Star Version */
-div.fivestar-widget-static .star {
+.fivestar-widget-static .star {
   width: 17px;
   height: 16px;
   background: url(druplicon.gif) no-repeat 0 0px;
 }
 
-div.fivestar-widget-static .star span.on {
+.fivestar-widget-static .star span.on {
   background: url(druplicon.gif) no-repeat 0 -32px;
 }
 
-div.fivestar-widget-static .star span.off {
+.fivestar-widget-static .star span.off {
   background: url(druplicon.gif) no-repeat 0 0px;
 }
 
@@ -28,4 +28,4 @@ div.fivestar-widget div.on a {
 }
 div.fivestar-widget div.hover a, div.rating div a:hover {
   background-position: 0 -32px;
-}
\ No newline at end of file
+}
diff --git a/widgets/flames/flames-rtl.css b/widgets/flames/flames-rtl.css
index 22297a8..82e6acd 100755
--- a/widgets/flames/flames-rtl.css
+++ b/widgets/flames/flames-rtl.css
@@ -1,13 +1,13 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
-.fivestar-flames div.fivestar-widget-static .star span.off,
-.fivestar-flames div.fivestar-widget-static .star,
+.fivestar-flames .fivestar-widget-static .star span.off,
+.fivestar-flames .fivestar-widget-static .star,
 .fivestar-flames div.fivestar-widget .star,
 .fivestar-flames div.fivestar-widget .star a,
 .fivestar-flames div.fivestar-widget .cancel,
 .fivestar-flames div.fivestar-widget .cancel a {
   background-position: right 0;
 }
-.fivestar-flames div.fivestar-widget-static .star span.on {
+.fivestar-flames .fivestar-widget-static .star span.on {
   background-position: right -26px;
 }
 .fivestar-flames div.fivestar-widget div.on a {
@@ -16,4 +16,4 @@
 .fivestar-flames div.fivestar-widget div.hover a,
 .fivestar-flames div.rating div a:hover {
   background-position: right -52px;
-}
\ No newline at end of file
+}
diff --git a/widgets/flames/flames.css b/widgets/flames/flames.css
index ab52da1..d67c87c 100644
--- a/widgets/flames/flames.css
+++ b/widgets/flames/flames.css
@@ -1,15 +1,15 @@
 /* Static View-only Star Version */
-.fivestar-flames div.fivestar-widget-static .star {
+.fivestar-flames .fivestar-widget-static .star {
   width: 20px;
   height: 26px;
   background: url(flame.png) no-repeat 0 0;
 }
 
-.fivestar-flames div.fivestar-widget-static .star span.on {
+.fivestar-flames .fivestar-widget-static .star span.on {
   background: url(flame.png) no-repeat 0 -52px;
 }
 
-.fivestar-flames div.fivestar-widget-static .star span.off {
+.fivestar-flames .fivestar-widget-static .star span.off {
   background: url(flame.png) no-repeat 0 0;
 }
 
@@ -35,4 +35,4 @@
 .fivestar-flames div.fivestar-widget div.hover a,
 .fivestar-flames div.rating div a:hover {
   background-position: 0 -52px;
-}
\ No newline at end of file
+}
diff --git a/widgets/hearts/hearts-rtl.css b/widgets/hearts/hearts-rtl.css
index 6439e27..84397ea 100755
--- a/widgets/hearts/hearts-rtl.css
+++ b/widgets/hearts/hearts-rtl.css
@@ -1,5 +1,5 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
-.fivestar-hearts div.fivestar-widget-static .star span.on {
+.fivestar-hearts .fivestar-widget-static .star span.on {
   background-position: right -32px;
 }
 .fivestar-hearts div.fivestar-widget div.on a {
diff --git a/widgets/hearts/hearts.css b/widgets/hearts/hearts.css
index d24161c..a249d36 100644
--- a/widgets/hearts/hearts.css
+++ b/widgets/hearts/hearts.css
@@ -1,15 +1,15 @@
 /* Static View-only Star Version */
-.fivestar-hearts div.fivestar-widget-static .star {
+.fivestar-hearts .fivestar-widget-static .star {
   width: 17px;
   height: 15px;
   background: url(heart.png) no-repeat 0 0px;
 }
 
-.fivestar-hearts div.fivestar-widget-static .star span.on {
+.fivestar-hearts .fivestar-widget-static .star span.on {
   background: url(heart.png) no-repeat 0 -32px;
 }
 
-.fivestar-hearts div.fivestar-widget-static .star span.off {
+.fivestar-hearts .fivestar-widget-static .star span.off {
   background: url(heart.png) no-repeat 0 0;
 }
 
@@ -35,4 +35,4 @@
 .fivestar-hearts div.fivestar-widget div.hover a,
 .fivestar-hearts div.rating div a:hover {
   background-position: 0 -32px;
-}
\ No newline at end of file
+}
diff --git a/widgets/lullabot/lullabot.txt b/widgets/lullabot/lullabot.txt
index 21767db..a6c90ef 100644
--- a/widgets/lullabot/lullabot.txt
+++ b/widgets/lullabot/lullabot.txt
@@ -1,15 +1,15 @@
 /* Static View-only Star Version */
-div.fivestar-widget-static .star {
+.fivestar-widget-static .star {
   width: 17px;
   height: 16px;
   background: url(lullabot.gif) no-repeat 0 0px;
 }
 
-div.fivestar-widget-static .star span.on {
+.fivestar-widget-static .star span.on {
   background: url(lullabot.gif) no-repeat 0 -32px;
 }
 
-div.fivestar-widget-static .star span.off {
+.fivestar-widget-static .star span.off {
   background: url(lullabot.gif) no-repeat 0 0px;
 }
 
@@ -28,4 +28,4 @@ div.fivestar-widget div.on a {
 }
 div.fivestar-widget div.hover a, div.rating div a:hover {
   background-position: 0 -32px;
-}
\ No newline at end of file
+}
diff --git a/widgets/minimal/minimal-rtl.css b/widgets/minimal/minimal-rtl.css
index 8a9b276..273b5a9 100755
--- a/widgets/minimal/minimal-rtl.css
+++ b/widgets/minimal/minimal-rtl.css
@@ -1,5 +1,5 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
-.fivestar-minimal div.fivestar-widget-static .star span.on {
+.fivestar-minimal .fivestar-widget-static .star span.on {
   background-position: right -32px;
 }
 .fivestar-minimal div.fivestar-widget div.on a {
diff --git a/widgets/minimal/minimal.css b/widgets/minimal/minimal.css
index 5850995..321759e 100644
--- a/widgets/minimal/minimal.css
+++ b/widgets/minimal/minimal.css
@@ -1,15 +1,15 @@
 /* Static View-only Star Version */
-.fivestar-minimal div.fivestar-widget-static .star {
+.fivestar-minimal .fivestar-widget-static .star {
   width: 8px;
   height: 18px;
   background: url(min_star.png) no-repeat 0 0;
 }
 
-.fivestar-minimal div.fivestar-widget-static .star span.on {
+.fivestar-minimal .fivestar-widget-static .star span.on {
   background: url(min_star.png) no-repeat 0 -32px;
 }
 
-.fivestar-minimal div.fivestar-widget-static .star span.off {
+.fivestar-minimal .fivestar-widget-static .star span.off {
   background: url(min_star.png) no-repeat 0 0;
 }
 
@@ -35,4 +35,4 @@
 .fivestar-minimal div.fivestar-widget div.hover a,
 .fivestar-minimal div.rating div a:hover {
   background-position: 0 -32px;
-}
\ No newline at end of file
+}
diff --git a/widgets/outline/outline-rtl.css b/widgets/outline/outline-rtl.css
index b08c511..b025196 100755
--- a/widgets/outline/outline-rtl.css
+++ b/widgets/outline/outline-rtl.css
@@ -1,5 +1,5 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
-.fivestar-outline div.fivestar-widget-static .star span.on {
+.fivestar-outline .fivestar-widget-static .star span.on {
   background-position: right -28px;
 }
 .fivestar-outline div.fivestar-widget div.on a {
@@ -8,4 +8,4 @@
 .fivestar-outline div.fivestar-widget div.hover a,
 .fivestar-outline div.rating div a:hover {
   background-position: right -28px;
-}
\ No newline at end of file
+}
diff --git a/widgets/outline/outline.css b/widgets/outline/outline.css
index f8bda7e..ec31a4d 100755
--- a/widgets/outline/outline.css
+++ b/widgets/outline/outline.css
@@ -1,15 +1,15 @@
 /* Static View-only Star Version */
-.fivestar-outline div.fivestar-widget-static .star {
+.fivestar-outline .fivestar-widget-static .star {
   width: 16px;
   height: 14px;
   background: url(star.png) no-repeat 0 0px;
 }
 
-.fivestar-outline div.fivestar-widget-static .star span.on {
+.fivestar-outline .fivestar-widget-static .star span.on {
   background: url(star.png) no-repeat 0 -28px;
 }
 
-.fivestar-outline div.fivestar-widget-static .star span.off {
+.fivestar-outline .fivestar-widget-static .star span.off {
   background: url(star.png) no-repeat 0 0px;
 }
 
@@ -35,4 +35,4 @@
 .fivestar-outline div.fivestar-widget div.hover a,
 .fivestar-outlinediv.rating div a:hover {
   background-position: 0 -28px;
-}
\ No newline at end of file
+}
diff --git a/widgets/oxygen/oxygen-rtl.css b/widgets/oxygen/oxygen-rtl.css
index 8b51f93..f6f1e13 100755
--- a/widgets/oxygen/oxygen-rtl.css
+++ b/widgets/oxygen/oxygen-rtl.css
@@ -1,5 +1,5 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
-.fivestar-oxygen div.fivestar-widget-static .star span.on {
+.fivestar-oxygen .fivestar-widget-static .star span.on {
   background-position: right -32px;
 }
 .fivestar-oxygen div.fivestar-widget div.on a {
diff --git a/widgets/oxygen/oxygen.css b/widgets/oxygen/oxygen.css
index 16aed42..c9e7ba7 100755
--- a/widgets/oxygen/oxygen.css
+++ b/widgets/oxygen/oxygen.css
@@ -1,13 +1,13 @@
 /* Static View-only Star Version */
-.fivestar-oxygen div.fivestar-widget-static .star {
+.fivestar-oxygen .fivestar-widget-static .star {
   background-image: url(star.png);
 }
 
-.fivestar-oxygen div.fivestar-widget-static .star span.on {
+.fivestar-oxygen .fivestar-widget-static .star span.on {
   background-image: url(star.png);
 }
 
-.fivestar-oxygen div.fivestar-widget-static .star span.off {
+.fivestar-oxygen .fivestar-widget-static .star span.off {
   background-image: url(star.png);
 }
 
diff --git a/widgets/small/small-rtl.css b/widgets/small/small-rtl.css
index 4a24721..f509da2 100755
--- a/widgets/small/small-rtl.css
+++ b/widgets/small/small-rtl.css
@@ -1,13 +1,13 @@
 /* Adjust the background position when using this widget with a RTL langauge. */
-.fivestar-small div.fivestar-widget-static .star span.off,
-.fivestar-small div.fivestar-widget-static .star,
+.fivestar-small .fivestar-widget-static .star span.off,
+.fivestar-small .fivestar-widget-static .star,
 .fivestar-small div.fivestar-widget .star,
 .fivestar-small div.fivestar-widget .star a,
 .fivestar-small div.fivestar-widget .cancel,
 .fivestar-small div.fivestar-widget .cancel a {
   background-position: right 0;
 }
-.fivestar-small div.fivestar-widget-static .star span.on {
+.fivestar-small .fivestar-widget-static .star span.on {
   background-position: right -32px;
 }
 .fivestar-small div.fivestar-widget div.on a {
diff --git a/widgets/small/small.css b/widgets/small/small.css
index 127eb3a..7d1bd3e 100644
--- a/widgets/small/small.css
+++ b/widgets/small/small.css
@@ -1,15 +1,15 @@
 /* Static View-only Star Version */
-.fivestar-small div.fivestar-widget-static .star {
+.fivestar-small .fivestar-widget-static .star {
   width: 17px;
   height: 15px;
   background: url(small_star.png) no-repeat 0 0px;
 }
 
-.fivestar-small div.fivestar-widget-static .star span.on {
+.fivestar-small .fivestar-widget-static .star span.on {
   background: url(small_star.png) no-repeat 0 -32px;
 }
 
-.fivestar-small div.fivestar-widget-static .star span.off {
+.fivestar-small .fivestar-widget-static .star span.off {
   background: url(small_star.png) no-repeat 0 0px;
 }
 
@@ -35,4 +35,4 @@
 .fivestar-small div.fivestar-widget div.hover a,
 .fivestar-small div.rating div a:hover {
   background-position: 0 -32px;
-}
\ No newline at end of file
+}
-- 
1.7.11.1


From 44bb1119dafd93dba642987c23a1a690c79516c4 Mon Sep 17 00:00:00 2001
From: Andrew Berry <deviantintegral@gmail.com>
Date: Mon, 2 Jul 2012 09:51:03 -0400
Subject: [PATCH 3/4] Issue #660772: Fix tests referencing divs instead of
 spans.

---
 test/fivestar.field.test | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/fivestar.field.test b/test/fivestar.field.test
index 45fe780..8098fe8 100644
--- a/test/fivestar.field.test
+++ b/test/fivestar.field.test
@@ -28,7 +28,7 @@ class FivestarTestCase extends FivestarBaseTestCase {
     );
     $this->drupalPost('node/add/test_node_type', $edit, t('Save'));
     // Make sure the two-star rating shows on the node view.
-    $result = $this->xpath("//div[contains(@class, 'field-name-fivestar-test')]//div[contains(@class,'star-first')]/span");
+    $result = $this->xpath("//div[contains(@class, 'field-name-fivestar-test')]//span[contains(@class,'star-first')]/span");
     $this->assertEqual($result[0][0], '2', 'Content authors can rate their own content using the stars widget.');
   }
 
@@ -67,7 +67,7 @@ class FivestarTestCase extends FivestarBaseTestCase {
     $this->drupalGet('node/' . $node->nid);
     $this->assertFalse($this->xpath("//form[contains(@class, 'fivestar-widget')]"));
     // Make sure the three-star rating still shows on the node view.
-    $result = $this->xpath("//div[contains(@class, 'field-name-fivestar-test')]//div[contains(@class,'star-first')]/span");
+    $result = $this->xpath("//div[contains(@class, 'field-name-fivestar-test')]//span[contains(@class,'star-first')]/span");
     $this->assertEqual($result[0][0], '3', 'The static display still shows three stars.');
   }
 
@@ -147,7 +147,7 @@ class FivestarTestCase extends FivestarBaseTestCase {
 
     // Test the Default Widget.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertTrue($this->xpath("//div[contains(@class, 'fivestar-default')]//div[contains(@class,'star-first')]/span"));
+    $this->assertTrue($this->xpath("//span[contains(@class, 'fivestar-default')]//span[contains(@class,'star-first')]/span"));
 
     $widgets = module_invoke_all('fivestar_widgets');
     foreach ($widgets as $path => $name) {
@@ -155,7 +155,7 @@ class FivestarTestCase extends FivestarBaseTestCase {
       field_update_instance($instance);
       $widget_class = 'fivestar-' . drupal_strtolower($name);
       $this->drupalGet('node/' . $node->nid);
-      $result = $this->xpath("//div[contains(@class, '" . $widget_class . "')]//div[contains(@class,'star-first')]/span");
+      $result = $this->xpath("//span[contains(@class, '" . $widget_class . "')]//span[contains(@class,'star-first')]/span");
       $this->assertEqual($result[0][0], '0', t('The @name fivestar widget is properly display.', array('@name' => $name)));
     }
   }
-- 
1.7.11.1


From 4ff04c2d2c850978563c8907b192692d54408020 Mon Sep 17 00:00:00 2001
From: Andrew Berry <deviantintegral@gmail.com>
Date: Mon, 2 Jul 2012 09:52:09 -0400
Subject: [PATCH 4/4] Issue #660772: Fix text typos.

---
 test/fivestar.field.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/fivestar.field.test b/test/fivestar.field.test
index 8098fe8..136f086 100644
--- a/test/fivestar.field.test
+++ b/test/fivestar.field.test
@@ -21,7 +21,7 @@ class FivestarTestCase extends FivestarBaseTestCase {
     $this->drupalLogin($this->admin_user);
     // Add an author-rated fivestar field to the test_node_type content type.
     $this->createFivestarField(array('widget_type' => 'stars'));
-    // Save an test_node_typee node with a two-star rating.
+    // Save a test_node_type node with a two-star rating.
     $edit = array(
       'title' => $this->randomString(),
       'fivestar_test[und][0][rating]' => '40' // Equals a rating of 2 stars.
@@ -156,7 +156,7 @@ class FivestarTestCase extends FivestarBaseTestCase {
       $widget_class = 'fivestar-' . drupal_strtolower($name);
       $this->drupalGet('node/' . $node->nid);
       $result = $this->xpath("//span[contains(@class, '" . $widget_class . "')]//span[contains(@class,'star-first')]/span");
-      $this->assertEqual($result[0][0], '0', t('The @name fivestar widget is properly display.', array('@name' => $name)));
+      $this->assertEqual($result[0][0], '0', t('The @name fivestar widget is properly displayed.', array('@name' => $name)));
     }
   }
 }
-- 
1.7.11.1