merge from dev

This commit is contained in:
Luke Pulverenti
2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
+8 -6
View File
@@ -22,12 +22,14 @@
<br />
<div class="supporterPromotionContainer" style="display:none;">
<div class="customSupporterPromotion supporterPromotion">
<a class="btn btnActionAccent" href="http://emby.media/premiere" target="_blank" style="font-size:14px;">
<div class="mainText">
</div>
<div class="btnLearnMore" style="font-weight:normal;font-size:90%;margin-top:5px;">
${ButtonLearnMore}
</div>
<a class="clearLink" href="http://emby.media/premiere" target="_blank" style="font-size:14px;">
<paper-button raised class="block" style="text-transform:none;background-color:#52B54B;color:#fff;">
<div class="mainText">
</div>
<div class="btnLearnMore" style="font-weight: normal; margin-top: 5px;">
${ButtonLearnMore}
</div>
</paper-button>
</a>
</div>
</div>