matt/paperclip-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upstream Updates

Browse Source
This commit is contained in:
Dev-JamesR
2019-10-20 20:58:04 -07:00
parent f69ab25e0b 3e3eca1b3f
commit 12b169f591
3252 changed files with 18992 additions and 349761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
assets/templates/uploads.html
View File

@@ -1,24 +1,24 @@
<head>
<<<<<<< HEAD
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet"
type="text/css">
=======
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<!-- Bootstrap Core Css -->
<!--<link href="assets/dashboard/plugins/bootstrap/css/bootstrap.css" rel="stylesheet">-->
<!-- Waves Effect Css -->
<link href="assets/dashboard/plugins/node-waves/waves.css" rel="stylesheet" />
<!-- Animation Css -->
<link href="assets/dashboard/plugins/animate-css/animate.css" rel="stylesheet" />
<!-- Morris Chart Css
<link href="assets/dashboard/plugins/morrisjs/morris.css" rel="stylesheet" />-->
<!-- Custom Css -->
<link href="assets/dashboard/css/style.css" rel="stylesheet">
<<<<<<< HEAD
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
<!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
=======
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
<link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
<script src="https://medium-widget.pixelpoint.io/widget.js"></script>
</head>
<div class="marketStats">
@@ -179,7 +179,7 @@
<!-- #END# Hash Tables -->
<!-- Login Modal -->
<div class="modal fade" id="ethofsLoginModal" tabindex="-1" role="dialog">
<div class="modal fade" id="ethofsLoginModal" tabindex="-1" role="dialog" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032; padding-top:150px;">
<div class="modal-header">
@@ -234,7 +234,7 @@
</div>
<!-- Registration Modal -->
<div class="modal fade" id="ethofsRegistrationModal" tabindex="-1" role="dialog">
<div class="modal fade" id="ethofsRegistrationModal" tabindex="-1" role="dialog" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032; padding-top:150px;">
<div class="modal-header">
@@ -268,7 +268,7 @@
</div>
<!-- Default Size Modal -->
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog">
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -315,7 +315,7 @@
</div>
<!--Upload Modal -->
<div class="modal fade" id="defaultModal2" tabindex="-1" role="dialog">
<div class="modal fade" id="defaultModal2" tabindex="-1" role="dialog" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -359,7 +359,7 @@
</div>
</div>
<div class="modal fade" id="defaultModal3" tabindex="-1" role="dialog">
<div class="modal fade" id="defaultModal3" tabindex="-1" role="dialog" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -428,7 +428,7 @@
</div>
</div>
<div class="modal fade" id="uploadTrackerModal" tabindex="-1" role="dialog">
<div class="modal fade" id="uploadTrackerModal" tabindex="-1" role="dialog" style="background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -511,8 +511,12 @@
<!-- end analyze data modal -->
<!-- begin mined block checking modal -->
<<<<<<< HEAD
<div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static">
=======
<div class="modal fade" id="minedBlockTrackerModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static" style="background-color: #840032">
>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -553,8 +557,12 @@
<!-- end mined block checking modal -->
<!-- begin preparing upload modal -->
<<<<<<< HEAD
<div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel"
aria-hidden="true" data-backdrop="static">
=======
<div class="modal fade" id="preparingUploadModal" tabindex="-1" role="dialog" aria-labelledby="staticModalLabel" aria-hidden="true" data-backdrop="static" style="background-color: #840032">
>>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">
@@ -586,7 +594,7 @@
<!-- end preparing upload modal -->
<!-- begin contract detail modal -->
<div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog" style="padding-top:0px">
<div class="modal fade" id="contractDetailModal" tabindex="-1" role="dialog" style="padding-top:0px;background-color: #840032">
<div class="modal-dialog" role="document">
<div class="modal-content" style="background-color: #840032;">
<div class="modal-header">