Merge branch 'develop' into Page-Press

This commit is contained in:
Tam Tran 2018-03-02 10:40:07 -06:00 committed by GitHub
commit 1c527e6437
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 36 additions and 19 deletions

View File

@ -39,7 +39,6 @@
<link rel="manifest" href="favicons/manifest.json">
<title localization-tag="page-title">Bitcoin Private</title>
<link href="css/main.css?cachebreaker=627550" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="dependencies/jquery/dist/jquery.min.js"></script>

View File

@ -8722,13 +8722,14 @@ html, body {
justify-content: center; }
.block-details-inner-btc {
float: right; }
.block-details-inner-zlc {
.block-details-inner-zcl {
float: left; }
.block-details-message {
font-size: 30px;
font-weight: bold;
margin: 0 10px;
color: #272D63; }
font-size: 15px; }
.block-details-message-btc, .block-details-message-zcl {
font-size: 30px;
font-weight: bold;
color: #272D63; }
.block-details img {
margin: 0 0 0 0 !important; }

View File

@ -48,6 +48,7 @@
<script type="text/javascript" src="javascript/Localizations.js?cachbreaker=557253"></script>
<script type="text/javascript" src="javascript/Main.js?cachbreaker=303871"></script>
<script type="text/javascript" src="javascript/Countdown.js?cachbreaker=741011" defer></script>
</head>
<body>
<canvas class="confetti-canvas" id="confetti"></canvas>
@ -151,14 +152,19 @@
<div class="block-details block-details-btc col-sm-6 col-xs-12">
<div class="block-details-inner block-details-inner-btc">
<img class="block-details-icon block-details-icon-btc" src="images/icons/bitcoin.png" />
<span class="block-details-message block-details-message-btc" id="awaitingContainerBitcoin">511346</span>
<div class="block-details-message col-xs-6">
<span class="block-details-message-block col-xs-12">block</span>
<span class="block-details-message-btc col-xs-12" id="awaitingContainerBitcoin">511346</span>
</div>
</div>
</div>
<div class="block-details block-details-zcl col-sm-6 col-xs-12">
<div class="block-details-inner block-details-inner-zlc">
<div class="block-details-inner block-details-inner-zcl">
<img class="block-details-icon block-details-icon-zcl" src="images/icons/zclassic.png" />
<span class="block-details-message block-details-message-zcl" id="awaitingContainerZclassic">272991</span>
<div class="block-details-message col-xs-6">
<span class="block-details-message-block col-xs-12">block</span>
<span class="block-details-message-zcl col-xs-12" id="awaitingContainerZclassic">272991</span>
</div>
</div>
</div>
</div>

View File

@ -40,6 +40,7 @@
<title localization-tag="page-title">Bitcoin Private</title>
<link href="css/main.css?cachebreaker=440436" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="dependencies/jquery/dist/jquery.min.js"></script>

View File

@ -40,6 +40,7 @@
<title localization-tag="page-title">Bitcoin Private</title>
<link href="css/main.css?cachebreaker=544007" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="dependencies/jquery/dist/jquery.min.js"></script>

View File

@ -138,16 +138,20 @@
float: right;
}
&-zlc {
&-zcl {
float: left;
}
}
&-message {
font-size: 30px;
font-weight: bold;
margin: 0 10px;
color: $color-primary;
font-size: 15px;
&-btc,
&-zcl {
font-size: 30px;
font-weight: bold;
color: $color-primary;
}
}
img {

View File

@ -99,14 +99,19 @@
<div class="block-details block-details-btc col-sm-6 col-xs-12">
<div class="block-details-inner block-details-inner-btc">
<img class="block-details-icon block-details-icon-btc" src="images/icons/bitcoin.png" />
<span class="block-details-message block-details-message-btc" id="awaitingContainerBitcoin">511346</span>
<div class="block-details-message col-xs-6">
<span class="block-details-message-block col-xs-12">block</span>
<span class="block-details-message-btc col-xs-12" id="awaitingContainerBitcoin">511346</span>
</div>
</div>
</div>
<div class="block-details block-details-zcl col-sm-6 col-xs-12">
<div class="block-details-inner block-details-inner-zlc">
<div class="block-details-inner block-details-inner-zcl">
<img class="block-details-icon block-details-icon-zcl" src="images/icons/zclassic.png" />
<span class="block-details-message block-details-message-zcl" id="awaitingContainerZclassic">272991</span>
<div class="block-details-message col-xs-6">
<span class="block-details-message-block col-xs-12">block</span>
<span class="block-details-message-zcl col-xs-12" id="awaitingContainerZclassic">272991</span>
</div>
</div>
</div>
</div>