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

Upstream

Browse Source
This commit is contained in:
Dev-JamesR
2019-10-20 21:11:38 -07:00
parent 057402d2f8
commit 294f46dd59
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
assets/templates/uploads.html
View File

@@ -1,20 +1,14 @@
<head> <head>
<<<<<<< HEAD
<!-- Google Fonts --> <!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet"
type="text/css"> 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"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<link href="assets/dashboard/plugins/node-waves/waves.css" rel="stylesheet" /> <link href="assets/dashboard/plugins/node-waves/waves.css" rel="stylesheet" />
<link href="assets/dashboard/plugins/animate-css/animate.css" rel="stylesheet" /> <link href="assets/dashboard/plugins/animate-css/animate.css" rel="stylesheet" />
<link href="assets/dashboard/css/style.css" rel="stylesheet"> <link href="assets/dashboard/css/style.css" rel="stylesheet">
<<<<<<< HEAD
<link rel="stylesheet" <link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css"> 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 --> <!-- 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"> <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 >>>>>>> 3e3eca1b3fe4254614dadc63f41fe2e72405e83f
<link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" /> <link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
@@ -511,12 +505,7 @@
<!-- end analyze data modal --> <!-- end analyze data modal -->
<!-- begin mined block checking 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"> <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-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">
@@ -557,12 +546,7 @@
<!-- end mined block checking modal --> <!-- end mined block checking modal -->
<!-- begin preparing upload 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"> <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-dialog" role="document">
<div class="modal-content" style="background-color: #840032;"> <div class="modal-content" style="background-color: #840032;">
<div class="modal-header"> <div class="modal-header">