Apply various syntax consistency improvements

This commit is contained in:
Saivann 2013-10-21 14:59:09 -04:00
parent 55bd72c8e0
commit 2f79df8dcd
7 changed files with 112 additions and 86 deletions

View file

@ -2,7 +2,6 @@
layout: base layout: base
lang: en lang: en
--- ---
{% if page.canonical != nil %} {% if page.canonical != nil %}
<script>window.location.href='{{ page.canonical }}';</script> <script>window.location.href='{{ page.canonical }}';</script>
<link rel="canonical" href="http://bitcoin.org{{ page.canonical }}"/> <link rel="canonical" href="http://bitcoin.org{{ page.canonical }}"/>

View file

@ -1,7 +1,6 @@
--- ---
layout: base layout: base
--- ---
<meta name="robots" content="noindex"> <meta name="robots" content="noindex">
<script>window.location.href='{{ page.redirect }}';</script> <script>window.location.href='{{ page.redirect }}';</script>

View file

@ -2,7 +2,7 @@
body{ body{
font-family:"Helvetica Neue", "Helvetica", Arial, sans-serif; font-family:"Helvetica Neue", "Helvetica", Arial, sans-serif;
font-size: 16px; font-size:16px;
margin:0; margin:0;
padding:0; padding:0;
color:#646464; color:#646464;
@ -39,7 +39,10 @@ a:visited:hover,
a:active:hover{ a:active:hover{
color:#63a4e1; color:#63a4e1;
} }
a img,a:link img,a:visited img,a:active img{ a img,
a:link img,
a:visited img,
a:active img{
border:0; border:0;
} }
blockquote{ blockquote{
@ -127,7 +130,11 @@ li p{
width:850px; width:850px;
padding:10px; padding:10px;
} }
.alert-message,.alert-message a,.alert-message a:link,.alert-message a:active,.alert-message a:visited{ .alert-message,
.alert-message a,
.alert-message a:link,
.alert-message a:active,
.alert-message a:visited{
color:#fff; color:#fff;
} }
.alert-message a:hover{ .alert-message a:hover{
@ -143,11 +150,11 @@ li p{
position:relative; position:relative;
z-index:100; z-index:100;
} }
#head.home { #head.home{
text-align:center; text-align:center;
} }
#head.home #logo { #head.home #logo{
text-align: center; text-align:center;
} }
#body{ #body{
max-width:940px; max-width:940px;
@ -158,7 +165,9 @@ li p{
#langselect{ #langselect{
display:none; display:none;
} }
#lang,#lang li,#lang ul{ #lang,
#lang li,
#lang ul{
display:block; display:block;
list-style:none; list-style:none;
padding:0px; padding:0px;
@ -196,7 +205,10 @@ li p{
#lang:hover li ul{ #lang:hover li ul{
display:block; display:block;
} }
#lang li a,#lang li a:link,#lang li a:visited,#lang li a:active{ #lang li a,
#lang li a:link,
#lang li a:visited,
#lang li a:active{
text-decoration:none; text-decoration:none;
font-size:115%; font-size:115%;
width:100px; width:100px;
@ -204,7 +216,10 @@ li p{
color:#b8b8b8; color:#b8b8b8;
padding:4px 8px; padding:4px 8px;
} }
#lang li ul li a,#lang li ul li a:link,#lang li ul li a:visited,#lang li ul li a:active{ #lang li ul li a,
#lang li ul li a:link,
#lang li ul li a:visited,
#lang li ul li a:active{
padding:2px 8px; padding:2px 8px;
} }
@ -246,7 +261,8 @@ li p{
border-radius:5px; border-radius:5px;
-webkit-border-radius:5px; -webkit-border-radius:5px;
} }
#menusimple li:first-child,#menusimple li:first-child+li{ #menusimple li:first-child,
#menusimple li:first-child+li{
border-bottom-left-radius:0px; border-bottom-left-radius:0px;
border-bottom-right-radius:0px; border-bottom-right-radius:0px;
-webkit-border-bottom-left-radius:0px; -webkit-border-bottom-left-radius:0px;
@ -309,14 +325,14 @@ li p{
#content{ #content{
position:relative; position:relative;
padding:30px 40px 40px 40px; padding:30px 40px 40px 40px;
margin: 0px 5px; margin:0px 5px;
text-align:justify; text-align:justify;
background-color:#fff; background-color:#fff;
min-height:400px; min-height:400px;
border:2px solid #ebebeb; border:2px solid #ebebeb;
border-radius: 6px; border-radius:6px;
-webkit-border-radius: 6px; -webkit-border-radius:6px;
-moz-border-radius: 6px; -moz-border-radius:6px;
} }
#content p,#content li{ #content p,#content li{
line-height:1.5em; line-height:1.5em;
@ -344,7 +360,9 @@ li p{
/*Styles specific to elements in pages*/ /*Styles specific to elements in pages*/
.mainsummary, .mainvideo, .mainlist{ .mainsummary,
.mainvideo,
.mainlist{
text-align:center; text-align:center;
} }
.mainsummary{ .mainsummary{
@ -528,7 +546,9 @@ li p{
top:-2px; top:-2px;
} }
.index,.index ul,.index li{ .index,
.index ul,
.index li{
list-style:none; list-style:none;
padding:0px; padding:0px;
margin:0px; margin:0px;
@ -702,7 +722,8 @@ li p{
margin-bottom:12px; margin-bottom:12px;
vertical-align:top; vertical-align:top;
} }
.previewrow>div:first-child+div+div,.previewrow>div:first-child+div+div+div+div+div{ .previewrow>div:first-child+div+div,
.previewrow>div:first-child+div+div+div+div+div{
margin-right:0px; margin-right:0px;
} }
.previewrow>div>a>img{ .previewrow>div>a>img{
@ -710,7 +731,10 @@ li p{
margin:auto; margin:auto;
margin-bottom:10px; margin-bottom:10px;
} }
.previewrow>div>a,.previewrow>div>a:visited,.previewrow>div>a:link,.previewrow>div>a:active{ .previewrow>div>a,
.previewrow>div>a:visited,
.previewrow>div>a:link,
.previewrow>div>a:active{
font-size:94%; font-size:94%;
text-align:center; text-align:center;
text-decoration:none; text-decoration:none;
@ -753,7 +777,7 @@ li p{
background:url(/img/bubblebottom.svg) bottom center no-repeat; background:url(/img/bubblebottom.svg) bottom center no-repeat;
height:64px; height:64px;
} }
.previewrow>div>div>div>span { .previewrow>div>div>div>span{
position:absolute; position:absolute;
top:24px; top:24px;
right:30px; right:30px;
@ -772,7 +796,7 @@ li p{
padding:10px 0px; padding:10px 0px;
} }
.previewrow>div>div>div>h2:first-child+span+p+p{ .previewrow>div>div>div>h2:first-child+span+p+p{
text-align: center; text-align:center;
margin:0px; margin:0px;
padding:0px; padding:0px;
position:relative; position:relative;
@ -781,7 +805,7 @@ li p{
.previewrow>div>div>div>h2:first-child+span+p+p>a, .previewrow>div>div>div>h2:first-child+span+p+p>a,
.previewrow>div>div>div>h2:first-child+span+p+p>a:visited, .previewrow>div>div>div>h2:first-child+span+p+p>a:visited,
.previewrow>div>div>div>h2:first-child+span+p+p>a:link, .previewrow>div>div>div>h2:first-child+span+p+p>a:link,
.previewrow>div>div>div>h2:first-child+span+p+p>a:active { .previewrow>div>div>div>h2:first-child+span+p+p>a:active{
font-weight:bold; font-weight:bold;
text-decoration:none; text-decoration:none;
color:#fff; color:#fff;
@ -811,7 +835,7 @@ li p{
.previewrow .walletwarning>div>h2:first-child+span+p+p a, .previewrow .walletwarning>div>h2:first-child+span+p+p a,
.previewrow .walletwarning>div>h2:first-child+span+p+p a:link, .previewrow .walletwarning>div>h2:first-child+span+p+p a:link,
.previewrow .walletwarning>div>h2:first-child+span+p+p a:visited, .previewrow .walletwarning>div>h2:first-child+span+p+p a:visited,
.previewrow .walletwarning>div>h2:first-child+span+p+p a:active { .previewrow .walletwarning>div>h2:first-child+span+p+p a:active{
background-color:#b95357; background-color:#b95357;
background-image:linear-gradient(bottom, #a04246 14%, #b95357 70%); background-image:linear-gradient(bottom, #a04246 14%, #b95357 70%);
background-image:-o-linear-gradient(bottom, #a04246 14%, #b95357 70%); background-image:-o-linear-gradient(bottom, #a04246 14%, #b95357 70%);
@ -835,7 +859,7 @@ li p{
.previewrow .walletinfo>div>h2:first-child+span+p+p a, .previewrow .walletinfo>div>h2:first-child+span+p+p a,
.previewrow .walletinfo>div>h2:first-child+span+p+p a:link, .previewrow .walletinfo>div>h2:first-child+span+p+p a:link,
.previewrow .walletinfo>div>h2:first-child+span+p+p a:visited, .previewrow .walletinfo>div>h2:first-child+span+p+p a:visited,
.previewrow .walletinfo>div>h2:first-child+span+p+p a:active { .previewrow .walletinfo>div>h2:first-child+span+p+p a:active{
background-color:#ee9209; background-color:#ee9209;
background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%); background-image:linear-gradient(bottom, #e28700 14%, #ee9209 70%);
background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%); background-image:-o-linear-gradient(bottom, #e28700 14%, #ee9209 70%);
@ -911,7 +935,8 @@ h2 .rssicon{
.download{ .download{
text-align:center; text-align:center;
} }
.download h1,.download h2{ .download h1,
.download h2{
text-align:center; text-align:center;
} }
.download .mainbutton a{ .download .mainbutton a{
@ -969,9 +994,9 @@ h2 .rssicon{
.press-volunteer{ .press-volunteer{
text-align:left; text-align:left;
-webkit-border-radius: 8px; -webkit-border-radius:8px;
-moz-border-radius: 8px; -moz-border-radius:8px;
border-radius: 8px; border-radius:8px;
} }
.press-volunteer>div>div{ .press-volunteer>div>div{
width:400px; width:400px;
@ -1020,9 +1045,9 @@ h2 .rssicon{
.press-faq{ .press-faq{
text-align:left; text-align:left;
-webkit-border-radius: 8px; -webkit-border-radius:8px;
-moz-border-radius: 8px; -moz-border-radius:8px;
border-radius: 8px; border-radius:8px;
} }
.press-faq>div{ .press-faq>div{
width:380px; width:380px;
@ -1041,9 +1066,9 @@ h2 .rssicon{
height:0px; height:0px;
overflow:hidden; overflow:hidden;
text-align:justify; text-align:justify;
transition: height 400ms ease-out; transition:height 400ms ease-out;
-moz-transition: height 400ms ease-out; -moz-transition:height 400ms ease-out;
-webkit-transition: height 400ms ease-out; -webkit-transition:height 400ms ease-out;
} }
.press-faq li{ .press-faq li{
text-align:justify; text-align:justify;
@ -1055,14 +1080,14 @@ h2 .rssicon{
.press-materials{ .press-materials{
text-align:left; text-align:left;
-webkit-border-radius: 8px; -webkit-border-radius:8px;
-moz-border-radius: 8px; -moz-border-radius:8px;
border-radius: 8px; border-radius:8px;
} }
.press-materials>div>a{ .press-materials>div>a{
font-weight: bold; font-weight:bold;
font-size: 110%; font-size:110%;
} }
.press-materials>div{ .press-materials>div{
display:inline-block; display:inline-block;
@ -1073,18 +1098,18 @@ h2 .rssicon{
.press-materials>div>div{ .press-materials>div>div{
height:270px; height:270px;
overflow:hidden; overflow:hidden;
transition: height 400ms ease-out; transition:height 400ms ease-out;
-moz-transition: height 400ms ease-out; -moz-transition:height 400ms ease-out;
-webkit-transition: height 400ms ease-out; -webkit-transition:height 400ms ease-out;
} }
.press-materials>div:first-child+div>div img{ .press-materials>div:first-child+div>div img{
margin-right: 14px; margin-right:14px;
margin-bottom: 14px; margin-bottom:14px;
height:120px; height:120px;
width:120px; width:120px;
-webkit-border-radius: 10px; -webkit-border-radius:10px;
-moz-border-radius: 10px; -moz-border-radius:10px;
border-radius: 10px; border-radius:10px;
} }
.press-materials>div:first-child>div>p>a{ .press-materials>div:first-child>div>p>a{
margin-right:10px; margin-right:10px;
@ -1102,9 +1127,9 @@ h2 .rssicon{
.press-news{ .press-news{
text-align:left; text-align:left;
-webkit-border-radius: 8px; -webkit-border-radius:8px;
-moz-border-radius: 8px; -moz-border-radius:8px;
border-radius: 8px; border-radius:8px;
} }
.press-news>div{ .press-news>div{
height:125px; height:125px;
@ -1267,7 +1292,7 @@ h2 .rssicon{
.press-news>div>a>img{ .press-news>div>a>img{
float:none; float:none;
margin-right:0px; margin-right:0px;
margin-bottom: 20px; margin-bottom:20px;
} }
.mainvideo{ .mainvideo{
position:relative; position:relative;
@ -1290,7 +1315,9 @@ h2 .rssicon{
.mainlist>div>div{ .mainlist>div>div{
margin:10px; margin:10px;
} }
.mainlist>div:first-child,.mainlist>div:first-child+div,.mainlist>div:first-child+div+div{ .mainlist>div:first-child,
.mainlist>div:first-child+div,
.mainlist>div:first-child+div+div{
text-align:left; text-align:left;
} }
.start>div{ .start>div{

View file

@ -22,12 +22,11 @@ id: community
<li><strong>#bitcoin-otc</strong> {% translate chanotc %}</li> <li><strong>#bitcoin-otc</strong> {% translate chanotc %}</li>
<li><strong>#bitcoin-market</strong> {% translate chanmarket %}</li> <li><strong>#bitcoin-market</strong> {% translate chanmarket %}</li>
<li><strong>#bitcoin-mining</strong> {% translate chanmining %}</li> <li><strong>#bitcoin-mining</strong> {% translate chanmining %}</li>
{% case page.lang %} {% if page.lang == 'es' %}
{% when 'es' %}
<li><strong>#bitcoin-ar</strong> (Comunidad Bitcoin Argentina)</li> <li><strong>#bitcoin-ar</strong> (Comunidad Bitcoin Argentina)</li>
<li><strong>#bitcoin-es</strong> (Comunidad Bitcoin en español)</li> <li><strong>#bitcoin-es</strong> (Comunidad Bitcoin en español)</li>
<li><strong>#bitcoin-otc-ar</strong> (Mercado OTC de Bitcoin en Argentina)</li> <li><strong>#bitcoin-otc-ar</strong> (Mercado OTC de Bitcoin en Argentina)</li>
{% endcase %} {% endif %}
</ul> </ul>
</li> </li>
{% case page.lang %} {% case page.lang %}
@ -43,12 +42,12 @@ id: community
{% else %} {% else %}
<li>{% translate linkmeetup %}</li> <li>{% translate linkmeetup %}</li>
{% endcase %} {% endcase %}
{% case page.lang %} {% if page.lang == 'es' %}
{% when 'es' %}
<li><a href="http://www.forobtc.com/">Foro Bitcoin en Español</a></li> <li><a href="http://www.forobtc.com/">Foro Bitcoin en Español</a></li>
{% when 'pl' %} {% endif %}
{% if page.lang == 'pl' %}
<li><a href="https://forum.bitcoin.pl/">Polski portal bitcoin.pl</a></li> <li><a href="https://forum.bitcoin.pl/">Polski portal bitcoin.pl</a></li>
{% endcase %} {% endif %}
</ul> </ul>
{% else %} {% else %}
@ -86,14 +85,14 @@ id: community
<p>#bitcoin-otc {% translate chanotc %}</li> <p>#bitcoin-otc {% translate chanotc %}</li>
<p>#bitcoin-market {% translate chanmarket %}</li> <p>#bitcoin-market {% translate chanmarket %}</li>
<p>#bitcoin-mining {% translate chanmining %}</li> <p>#bitcoin-mining {% translate chanmining %}</li>
{% case page.lang %} {% if page.lang == 'fr' %}
{% when 'fr' %}
<p>#bitcoin-fr (Le Bitcoin en général, français)</li> <p>#bitcoin-fr (Le Bitcoin en général, français)</li>
{% when 'es' %} {% endif %}
{% if page.lang == 'es' %}
<p>#bitcoin-ar (Comunidad Bitcoin Argentina)</li> <p>#bitcoin-ar (Comunidad Bitcoin Argentina)</li>
<p>#bitcoin-es (Comunidad Bitcoin en español)</li> <p>#bitcoin-es (Comunidad Bitcoin en español)</li>
<p>#bitcoin-otc-ar (Mercado OTC de Bitcoin en Argentina)</li> <p>#bitcoin-otc-ar (Mercado OTC de Bitcoin en Argentina)</li>
{% endcase %} {% endif %}
</div> </div>
</div> </div>
</div> </div>

View file

@ -67,7 +67,9 @@ id: you-need-to-know
<h2><img class="titleicon" src="/img/ico_anon.svg" alt="Icon" />{% translate anonymous %}</h2> <h2><img class="titleicon" src="/img/ico_anon.svg" alt="Icon" />{% translate anonymous %}</h2>
<p>{% translate anonymoustxt %}</p> <p>{% translate anonymoustxt %}</p>
{% case page.lang %}{% when 'ar' or 'es' or 'fa' or 'ru' %}{% else %} {% case page.lang %}
{% when 'ar' or 'es' or 'fa' or 'ru' %}
{% else %}
<h2><img class="titleicon" src="/img/ico_fast.svg" alt="Icon" />{% translate instant %}</h2> <h2><img class="titleicon" src="/img/ico_fast.svg" alt="Icon" />{% translate instant %}</h2>
<p>{% translate instanttxt %}</p> <p>{% translate instanttxt %}</p>
{% endcase %} {% endcase %}

View file

@ -70,10 +70,10 @@ body{
.mainlist div div{ .mainlist div div{
text-align:left; text-align:left;
} }
.mainlist div:first-child + div { .mainlist div:first-child + div{
text-align:center; text-align:center;
} }
.mainlist div:first-child + div + div { .mainlist div:first-child + div + div{
text-align:right; text-align:right;
} }
.mainlist .ieimg{ .mainlist .ieimg{
@ -271,7 +271,7 @@ body{
width:280px; width:280px;
position:static; position:static;
} }
.previewrow div:hover div { .previewrow div:hover div{
height:auto; height:auto;
} }
.previewcol .previewrow{ .previewcol .previewrow{
@ -316,7 +316,7 @@ body{
.previewrow div div div span img{ .previewrow div div div span img{
margin-left:4px; margin-left:4px;
} }
.previewrow div div div p { .previewrow div div div p{
font-size:95%; font-size:95%;
line-height:1.2em; line-height:1.2em;
margin:0px; margin:0px;
@ -379,17 +379,17 @@ body{
} }
.press-volunteer div div{ .press-volunteer div div{
width: 400px; width:400px;
height: 150px; height:150px;
display: inline; display:inline;
zoom:1; zoom:1;
margin-right: 20px; margin-right:20px;
margin-bottom: 30px; margin-bottom:30px;
vertical-align: top; vertical-align:top;
} }
.press-volunteer div div img{ .press-volunteer div div img{
float: left; float:left;
margin-right: 30px; margin-right:30px;
} }
.press-volunteer div div p{ .press-volunteer div div p{
font-weight:expression((this.parentNode.getElementsByTagName('P')[0]==this)?'bold':''); font-weight:expression((this.parentNode.getElementsByTagName('P')[0]==this)?'bold':'');
@ -398,7 +398,7 @@ body{
font-size:expression((this.parentNode.getElementsByTagName('P')[2]==this)?'80%':''); font-size:expression((this.parentNode.getElementsByTagName('P')[2]==this)?'80%':'');
} }
.press-volunteer div p img{ .press-volunteer div p img{
vertical-align: bottom; vertical-align:bottom;
} }
.press-volunteer div p{ .press-volunteer div p{
height:expression((this.parentNode.getElementsByTagName('P')[1]==this&&this.parentNode.parentNode.getElementsByTagName('DIV')[0]==this.parentNode&&this.parentNode.parentNode.parentNode.getElementsByTagName('DIV')[0]==this.parentNode.parentNode)?'0px':''); height:expression((this.parentNode.getElementsByTagName('P')[1]==this&&this.parentNode.parentNode.getElementsByTagName('DIV')[0]==this.parentNode&&this.parentNode.parentNode.parentNode.getElementsByTagName('DIV')[0]==this.parentNode.parentNode)?'0px':'');
@ -436,11 +436,11 @@ body{
margin-bottom:0px; margin-bottom:0px;
} }
.press-materials div a { .press-materials div a{
font-weight:bold; font-weight:bold;
font-size:110%; font-size:110%;
} }
.press-materials div { .press-materials div{
display:inline; display:inline;
zoom:1; zoom:1;
width:278px; width:278px;
@ -451,7 +451,7 @@ body{
height:250px; height:250px;
overflow:hidden; overflow:hidden;
} }
.press-materials p a { .press-materials p a{
font-weight:normal; font-weight:normal;
font-size:100%; font-size:100%;
margin-right:10px; margin-right:10px;
@ -496,9 +496,9 @@ body.old #menu li a:link{
} }
body.old #menu li:hover a, body.old #menu li:hover a,
body.old #menu li.active a{ body.old #menu li.active a{
color: #000; color:#000;
background-color: #fff; background-color:#fff;
border: 2px solid #ebebeb; border:2px solid #ebebeb;
} }
body.old #menufor li a, body.old #menufor li a,
@ -518,7 +518,7 @@ body.old #support a{
} }
body.old #choose .ieimg, body.old #choose .ieimg,
body.old #before .ieimg, body.old #before .ieimg,
body.old #support .ieimg { body.old #support .ieimg{
vertical-align:middle; vertical-align:middle;
margin-right:8px; margin-right:8px;
margin-left:-40px; margin-left:-40px;

View file

@ -99,7 +99,7 @@ h2 .rssicon{
.previewrow>div:first-child+div+div+div+div+div{ .previewrow>div:first-child+div+div+div+div+div{
margin-left:0px; margin-left:0px;
} }
.previewrow>div>div>div>span { .previewrow>div>div>div>span{
right:auto; right:auto;
left:30px; left:30px;
} }