Browse Source

update android campaign image and remove duplicated paragraph

svn path=/trunk/; revision=28278
tags/stw2018
Torsten.Grote 5 years ago
parent
commit
077fab2ff4
5 changed files with 21 additions and 23 deletions
  1. 17
    19
      campaigns/android/liberate.en.xhtml
  2. BIN
      campaigns/android/robot.png
  3. 2
    2
      look/fsfe.less
  4. 1
    1
      look/fsfe.min.css
  5. 1
    1
      look/valentine.min.css

+ 17
- 19
campaigns/android/liberate.en.xhtml View File

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

BIN
campaigns/android/robot.png View File


+ 2
- 2
look/fsfe.less View File

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

+ 1
- 1
look/fsfe.min.css View File

@@ -1439,7 +1439,7 @@ textarea#donate-fsfe form .form-group input{height:auto}
1439 1439
 #donate-fsfe form #donate-validate:active,#donate-fsfe form #donate-validate.active,.open .dropdown-toggle#donate-fsfe form #donate-validate{background-image:none}
1440 1440
 #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}
1441 1441
 #donate-fsfe form #donate-validate .badge{color:#5cb85c;background-color:#fff}
1442
-#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}
1442
+#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}
1443 1443
 .valentine-ilovefs #logo{background:url(/graphics/logov.png) top left no-repeat}
1444 1444
 .valentine-ilovefs .svg #logo{background:url(/graphics/logov.svg) top left no-repeat}
1445 1445
 .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}}

+ 1
- 1
look/valentine.min.css View File

@@ -1439,7 +1439,7 @@ textarea#donate-fsfe form .form-group input{height:auto}
1439 1439
 #donate-fsfe form #donate-validate:active,#donate-fsfe form #donate-validate.active,.open .dropdown-toggle#donate-fsfe form #donate-validate{background-image:none}
1440 1440
 #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}
1441 1441
 #donate-fsfe form #donate-validate .badge{color:#5cb85c;background-color:#fff}
1442
-#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}
1442
+#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}
1443 1443
 .valentine-ilovefs #logo{background:url(/graphics/logov.png) top left no-repeat}
1444 1444
 .valentine-ilovefs .svg #logo{background:url(/graphics/logov.svg) top left no-repeat}
1445 1445
 .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}}

Loading…
Cancel
Save