summaryrefslogtreecommitdiffstats
path: root/wiki
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-04-01 11:44:35 +0200
committerTails developers <amnesia@boum.org>2014-04-01 11:46:35 +0200
commitabfa5c75c8fc5643440897bbce92dd80d54fe22a (patch)
tree24d883ef385ea1b17fae5114562da38f0b254419 /wiki
parent4dabcad8cd2efec9d72983c0aa490337e4305373 (diff)
Add margin to logo proposals
Diffstat (limited to 'wiki')
-rw-r--r--wiki/src/blueprint/logo.mdwn86
-rw-r--r--wiki/src/local.css4
2 files changed, 46 insertions, 44 deletions
diff --git a/wiki/src/blueprint/logo.mdwn b/wiki/src/blueprint/logo.mdwn
index 637dc8e..ea4ba44 100644
--- a/wiki/src/blueprint/logo.mdwn
+++ b/wiki/src/blueprint/logo.mdwn
@@ -1,7 +1,5 @@
[[!meta title="Logo contest"]]
-<style>img.img { margin-right: 5em; }</style>
-
We are running a contest for designers to create a new logo for Tails. See the
full description of the content in our [[blog post|news/logo_contest]].
@@ -16,7 +14,7 @@ requirements.
Andrew
======
-[[!img andrew.png link="no"]]
+[[!img andrew.png link="no" class="margin"]]
- [Complete concept with other proposals](https://labs.riseup.net/code/attachments/download/362/andrew-concept.pdf)
@@ -25,7 +23,7 @@ Andrew
Carmie
======
-[[!img carmie.png link="no"]]
+[[!img carmie.png link="no" class="margin"]]
- [SVG source](https://labs.riseup.net/code/attachments/download/364/carmie-1.svg)
@@ -35,10 +33,10 @@ Carmie
Gareth
======
-[[!img gareth-red.png link="no"]]
+[[!img gareth-red.png link="no" class="margin"]]
-[[!img gareth-purple.png link="no"]]
-[[!img gareth-yellow.png link="no"]]
+[[!img gareth-purple.png link="no" class="margin"]]
+[[!img gareth-yellow.png link="no" class="margin"]]
- [PDF source](https://labs.riseup.net/code/attachments/download/390/gareth.pdf)
- License: any license we choose
@@ -46,7 +44,7 @@ Gareth
Edu
===
-[[!img edu.png link="no"]]
+[[!img edu.png link="no" class="margin"]]
- [Original JPEG image](https://labs.riseup.net/code/attachments/download/402/edake.jpg)
@@ -57,8 +55,8 @@ Edu
Constantin
==========
-[[!img constantin-1.png link="no"]]
-[[!img constantin-2.png link="no"]]
+[[!img constantin-1.png link="no" class="margin"]]
+[[!img constantin-2.png link="no" class="margin"]]
- [Original SVG image with gradient](https://labs.riseup.net/code/attachments/download/423/constantin-1.svg)
- [Original SVG image without gradient](https://labs.riseup.net/code/attachments/download/424/constantin-2.svg)
@@ -67,7 +65,7 @@ Constantin
Leonardo
========
-[[!img leonardo.png link="no"]]
+[[!img leonardo.png link="no" class="margin"]]
- [Original proposal with additional materials](https://mediacru.sh/eccdae994629)
- License: [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/)
@@ -75,7 +73,7 @@ Leonardo
Maurice
=======
-[[!img maurice.png link="no"]]
+[[!img maurice.png link="no" class="margin"]]
- [Original SVG version](https://labs.riseup.net/code/attachments/download/422/maurice.svg)
- Color could be changed but should be a fairly 'sharp' tone.
@@ -84,7 +82,7 @@ Maurice
Jared
=====
-[[!img jared.png link="no"]]
+[[!img jared.png link="no" class="margin"]]
- [Original proposal with sketches](http://protoplanetoid.tumblr.com/post/79465306252/tails-logo-sketches-from-start-to-finish-start-in)
- License: GPLV3
@@ -92,7 +90,7 @@ Jared
Nobody
======
-[[!img nobody.png link="no"]]
+[[!img nobody.png link="no" class="margin"]]
- [Original proposal with additional materials](https://mega.co.nz/#F!ql5jjKwA!3ejwnrsWTumcGA4JPgxg1Q)
- [USB trident logo in public domain according to Wikipedia](https://commons.wikimedia.org/wiki/File:USB_Icon.svg)
@@ -101,7 +99,7 @@ Nobody
Jesse
=====
-[[!img jesse.png link="no"]]
+[[!img jesse.png link="no" class="margin"]]
- [Original proposal](http://s12.postimg.org/k4na2rv0d/Tails_maze.jpg)
@@ -110,8 +108,8 @@ Jesse
DrBit
=====
-[[!img drbit-racoon.png link="no"]]
-[[!img drbit-skunk.png link="no"]]
+[[!img drbit-racoon.png link="no" class="margin"]]
+[[!img drbit-skunk.png link="no" class="margin"]]
- Original proposal
[racoon](https://mega.co.nz/#!1c9VmSqY!SRUFfGHFhl-1xUd9hmZI0fTJ8RwFVfQIrbrF1BbrILE)
@@ -121,11 +119,11 @@ DrBit
Tchou
=====
-[[!img tchou.png link="no"]]
-[[!img tchou-inverted.png link="no"]]
+[[!img tchou.png link="no" class="margin"]]
+[[!img tchou-inverted.png link="no" class="margin"]]
-[[!img tchou-icon.png link="no"]]
-[[!img tchou-t.png link="no"]]
+[[!img tchou-icon.png link="no" class="margin"]]
+[[!img tchou-t.png link="no" class="margin"]]
- [Original proposal with alternative versions](http://tails-logo.nursit.com/the-proposal)
- License: [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/)
@@ -133,7 +131,7 @@ Tchou
Tom
===
-[[!img tom.png link="no"]]
+[[!img tom.png link="no" class="margin"]]
- [Original proposal with alternative versions](https://mega.co.nz/#F!Z4hhlRKL!fp5UKraTi_kzzF3S9CBd6w)
@@ -142,7 +140,7 @@ Tom
David
=====
-[[!img david.png link="no"]]
+[[!img david.png link="no" class="margin"]]
- Original proposal with additional materials:
- [logo only](https://secure.flickr.com/photos/24394019@N00/13449492975/)
@@ -157,7 +155,7 @@ David
John
====
-[[!img john.png link="no"]]
+[[!img john.png link="no" class="margin"]]
- [Original proposal with 55 alternate versions](http://upfile.mobi/422737)
@@ -169,7 +167,7 @@ John
Joe
===
-[[!img joe.png link="no"]]
+[[!img joe.png link="no" class="margin"]]
- [Original proposal with additional materials](https://www.dropbox.com/sh/vldyzpvjsynnnfc/YA1EexwrY)
- [Abstract about the logo](https://mailman.boum.org/pipermail/tails-dev/2014-March/005284.html)
@@ -179,8 +177,8 @@ Joe
Renato
======
-[[!img renato-1.png link="no"]]
-[[!img renato-2.png link="no"]]
+[[!img renato-1.png link="no" class="margin"]]
+[[!img renato-2.png link="no" class="margin"]]
- [Original proposal with alternative versions](https://www.dropbox.com/sh/kq4ghl6010unu0x/KcnDWMUpgW)
- License: [Creative Commons Attribution Share Alike](https://creativecommons.org/licenses/by-sa/4.0/)
@@ -188,7 +186,7 @@ Renato
Sara
====
-[[!img sara.png link="no"]]
+[[!img sara.png link="no" class="margin"]]
- [Original proposal with additional materials](http://imgur.com/3EUElYg)
@@ -199,7 +197,7 @@ Sara
Juan
====
-[[!img juan.png link="no"]]
+[[!img juan.png link="no" class="margin"]]
- [Original proposal](https://mailman.boum.org/pipermail/tails-dev/2014-March/005339.html)
@@ -209,7 +207,7 @@ Juan
Stephanie, fluke
================
-[[!img stephanie-fluke.png link="no"]]
+[[!img stephanie-fluke.png link="no" class="margin"]]
- [Original proposal with additional materials](http://opposight.de/public/tails-logo-sketches.tar.bz2)
- License: [Creative Commons Attribution Non Commercial Share Alike](https://creativecommons.org/licenses/by-nc-sa/4.0/)
@@ -217,8 +215,8 @@ Stephanie, fluke
Stephanie, dolphin
==================
-[[!img stephanie-dolphin-1.png link="no"]]
-[[!img stephanie-dolphin-2.png link="no"]]
+[[!img stephanie-dolphin-1.png link="no" class="margin"]]
+[[!img stephanie-dolphin-2.png link="no" class="margin"]]
- [Original proposal with additional materials](http://opposight.de/public/tails-logo-sketches.tar.bz2)
- License: [Creative Commons Attribution Non Commercial Share Alike](https://creativecommons.org/licenses/by-nc-sa/4.0/)
@@ -226,8 +224,8 @@ Stephanie, dolphin
Micky
=====
-[[!img micky-colorful.png link="no"]]
-[[!img micky-simple.png link="no"]]
+[[!img micky-colorful.png link="no" class="margin"]]
+[[!img micky-simple.png link="no" class="margin"]]
- Original proposals:
- [colorful version](http://crystal-cults.tumblr.com/image/81242203722)
@@ -237,7 +235,7 @@ Micky
Esperal
=======
-[[!img esperal.png link="no"]]
+[[!img esperal.png link="no" class="margin"]]
- [Original proposal with additional materials](https://secure.flickr.com/photos/121865988@N03/)
- The author can create more color variations.
@@ -248,7 +246,7 @@ Esperal
MewChan
=======
-[[!img mewchan.png link="no"]]
+[[!img mewchan.png link="no" class="margin"]]
- Original proposals:
- [without typography](http://fc05.deviantart.net/fs71/f/2014/086/c/9/tails_cat_by_lohumi-d7bt2ra.png)
@@ -262,7 +260,7 @@ MewChan
Anon404
=======
-[[!img anon404.png link="no"]]
+[[!img anon404.png link="no" class="margin"]]
- Original proposals:
- [logo](http://notfoundclub.org/tails/tails-concept1-solo_nmgr.png)
@@ -276,7 +274,7 @@ Anon404
Boishal
=======
-[[!img boishal.png link="no"]]
+[[!img boishal.png link="no" class="margin"]]
- [Original proposal](https://www.dropbox.com/sh/0uye114ry4rilhn/5viqGRdhMR?lst)
- License: GPLV3
@@ -284,11 +282,11 @@ Boishal
Peter
=====
-A: [[!img peter-word.png link="no"]]
+A: [[!img peter-word.png link="no" class="margin"]]
-B: [[!img peter-man.png link="no"]]
+B: [[!img peter-man.png link="no" class="margin"]]
-C: [[!img peter-woman.png link="no"]]
+C: [[!img peter-woman.png link="no" class="margin"]]
- [[Original proposal with alternative versions|FINISHED_WORK.7z]]
- License: GPLV3
@@ -296,7 +294,7 @@ C: [[!img peter-woman.png link="no"]]
Luigi
=====
-[[!img luigi.png link="no"]]
+[[!img luigi.png link="no" class="margin"]]
- [Original proposal](https://www.mediafire.com/?k69ukj76dep70n2)
@@ -306,7 +304,7 @@ Luigi
Christopher
===========
-[[!img christopher.png link="no"]]
+[[!img christopher.png link="no" class="margin"]]
- [Original proposal with alternative materials](http://onegreatthing.com/tails/)
@@ -315,7 +313,7 @@ Christopher
Design007
=========
-[[!img design007.png link="no"]]
+[[!img design007.png link="no" class="margin"]]
- [Original proposal with alternative materials](https://img.bi/#!5TzSQsc!MOWocY4YCQuyLdWzdW4Jbm26ybt1DwBjgo6J1Osd)
diff --git a/wiki/src/local.css b/wiki/src/local.css
index a6cc098..db642b4 100644
--- a/wiki/src/local.css
+++ b/wiki/src/local.css
@@ -121,6 +121,10 @@ img.img { /* overwrite style.css */
margin: 0em;
}
+img.margin { /* overwrite style.css */
+ margin: 2em 4em 2em 0em;
+}
+
/* Forms */
input[type="text"], input[type="password"], input[type="select"],