update android campaign image and remove duplicated paragraph

svn path=/trunk/; revision=28278

campaigns/android/liberate.en.xhtml

@@ -75,29 +75,27 @@
       </div>
 
       <p>
-
         <a href="http://www.cyanogenmod.com/">CyanogenMod</a> is a version of
         Android which you can use without a Google account. Even though it is
-          usually more free than the software your device comes with, freedom
-            is not its main objective. While CyanogenMod works on <a
-              href="http://www.cyanogenmod.com/devices">most Android
-            devices</a>, it makes use of <a
-          href="https://github.com/CyanogenMod/android_device_semc_iyokan/blob/gingerbread/proprietary-files.txt">non-free
+        usually more free than the software your device comes with, freedom
+        is not its main objective. While CyanogenMod works on <a
+        href="http://www.cyanogenmod.com/devices">most Android
+        devices</a>, it makes use of <a
+        href="https://github.com/CyanogenMod/android_device_semc_iyokan/blob/gingerbread/proprietary-files.txt">non-free
         device drivers and firmware</a> which are <a
-      href="https://github.com/CyanogenMod/android_device_semc_iyokan/blob/gingerbread/extract-files.sh">fetched
-    from a device</a> and are included in the ROM. Newer versions also include
-  the proprietary Google Play services.  </p> <p> We collected some information
-  about how you can help to ensure that CyanogenMod becomes free again and how
-  to identify and remove non-free parts. If you know about other non-free
-  software applications added to CyanogenMod, please inform us about it!
-  </p>
+        href="https://github.com/CyanogenMod/android_device_semc_iyokan/blob/gingerbread/extract-files.sh">fetched
+        from a device</a> and are included in the ROM. Newer versions also include
+        the proprietary Google Play services.
+	  </p> 
 
-      <p> We collected <a
+      <p>
+	    We collected <a
         href="https://fsfe.org/campaigns/android/help.en.html#OS">information</a>
-      about how you can help to ensure that CyanogenMod becomes free again, and
-      how to identify and remove non-free parts. If you know about other
-      non-free software applications added to CyanogenMod, please <a
-      href="mailto:android&#64;lists.fsfe.org">let us know</a> about it!  </p>
+        about how you can help to ensure that CyanogenMod becomes free again, and
+        how to identify and remove non-free parts. If you know about other
+        non-free software applications added to CyanogenMod, please <a
+        href="mailto:android&#64;lists.fsfe.org">let us know</a> about it!
+	  </p>
 
       <h2 id="Apps">The Apps</h2>
       
@@ -114,7 +112,7 @@
 
       <h3 id="F-Droid">F-Droid</h3>
 
-      <div class="image">
+      <div class="image left">
         <img alt="F-Droid" src="/campaigns/android/f-droid.png" />
       </div>
 

look/fsfe.less

@@ -274,8 +274,8 @@ a.the-fellowship {
 
 #hello-free-droid {
     background: url('/campaigns/android/robot.png') no-repeat top left transparent;
-    height: 209px;
-    width: 200px;
+    height: 200px;
+    width: 230px;
     float: left;
     margin-left: -6em;
     margin-right: 1.5em;

look/fsfe.min.css

@@ -1439,7 +1439,7 @@ textarea#donate-fsfe form .form-group input{height:auto}
 #donate-fsfe form #donate-validate:active,#donate-fsfe form #donate-validate.active,.open .dropdown-toggle#donate-fsfe form #donate-validate{background-image:none}
 #donate-fsfe form #donate-validate.disabled,#donate-fsfe form #donate-validate[disabled],fieldset[disabled] #donate-fsfe form #donate-validate,#donate-fsfe form #donate-validate.disabled:hover,#donate-fsfe form #donate-validate[disabled]:hover,fieldset[disabled] #donate-fsfe form #donate-validate:hover,#donate-fsfe form #donate-validate.disabled:focus,#donate-fsfe form #donate-validate[disabled]:focus,fieldset[disabled] #donate-fsfe form #donate-validate:focus,#donate-fsfe form #donate-validate.disabled:active,#donate-fsfe form #donate-validate[disabled]:active,fieldset[disabled] #donate-fsfe form #donate-validate:active,#donate-fsfe form #donate-validate.disabled.active,#donate-fsfe form #donate-validate[disabled].active,fieldset[disabled] #donate-fsfe form #donate-validate.active{background-color:#5cb85c;border-color:#4cae4c}
 #donate-fsfe form #donate-validate .badge{color:#5cb85c;background-color:#fff}
-#hello-free-droid{background:url('/campaigns/android/robot.png') no-repeat top left transparent;height:209px;width:200px;float:left;margin-left:-6em;margin-right:1.5em}@media (min-width:992px){#hello-free-droid{position:absolute;margin-left:-200px;margin-top:-10em}}#hello-free-droid img{display:none}
+#hello-free-droid{background:url('/campaigns/android/robot.png') no-repeat top left transparent;height:200px;width:230px;float:left;margin-left:-6em;margin-right:1.5em}@media (min-width:992px){#hello-free-droid{position:absolute;margin-left:-200px;margin-top:-10em}}#hello-free-droid img{display:none}
 .valentine-ilovefs #logo{background:url(/graphics/logov.png) top left no-repeat}
 .valentine-ilovefs .svg #logo{background:url(/graphics/logov.svg) top left no-repeat}
 .valentine-ilovefs #followup{background:url(/graphics/ribbonv.png) no-repeat 100% -40px #fff}@media (min-width:768px){.valentine-ilovefs #followup{background:url(/graphics/ribbonv.png) no-repeat 100% -70px #fff}}

look/valentine.min.css

@@ -1439,7 +1439,7 @@ textarea#donate-fsfe form .form-group input{height:auto}
 #donate-fsfe form #donate-validate:active,#donate-fsfe form #donate-validate.active,.open .dropdown-toggle#donate-fsfe form #donate-validate{background-image:none}
 #donate-fsfe form #donate-validate.disabled,#donate-fsfe form #donate-validate[disabled],fieldset[disabled] #donate-fsfe form #donate-validate,#donate-fsfe form #donate-validate.disabled:hover,#donate-fsfe form #donate-validate[disabled]:hover,fieldset[disabled] #donate-fsfe form #donate-validate:hover,#donate-fsfe form #donate-validate.disabled:focus,#donate-fsfe form #donate-validate[disabled]:focus,fieldset[disabled] #donate-fsfe form #donate-validate:focus,#donate-fsfe form #donate-validate.disabled:active,#donate-fsfe form #donate-validate[disabled]:active,fieldset[disabled] #donate-fsfe form #donate-validate:active,#donate-fsfe form #donate-validate.disabled.active,#donate-fsfe form #donate-validate[disabled].active,fieldset[disabled] #donate-fsfe form #donate-validate.active{background-color:#5cb85c;border-color:#4cae4c}
 #donate-fsfe form #donate-validate .badge{color:#5cb85c;background-color:#fff}
-#hello-free-droid{background:url('/campaigns/android/robot.png') no-repeat top left transparent;height:209px;width:200px;float:left;margin-left:-6em;margin-right:1.5em}@media (min-width:992px){#hello-free-droid{position:absolute;margin-left:-200px;margin-top:-10em}}#hello-free-droid img{display:none}
+#hello-free-droid{background:url('/campaigns/android/robot.png') no-repeat top left transparent;height:200px;width:230px;float:left;margin-left:-6em;margin-right:1.5em}@media (min-width:992px){#hello-free-droid{position:absolute;margin-left:-200px;margin-top:-10em}}#hello-free-droid img{display:none}
 .valentine-ilovefs #logo{background:url(/graphics/logov.png) top left no-repeat}
 .valentine-ilovefs .svg #logo{background:url(/graphics/logov.svg) top left no-repeat}
 .valentine-ilovefs #followup{background:url(/graphics/ribbonv.png) no-repeat 100% -40px #fff}@media (min-width:768px){.valentine-ilovefs #followup{background:url(/graphics/ribbonv.png) no-repeat 100% -70px #fff}}