diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index d1ba58208..761d97eff 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -62,10 +62,7 @@ - - - - + @@ -113,6 +110,7 @@ + diff --git a/BTCPayServer/bundleconfig.json b/BTCPayServer/bundleconfig.json index b1c6e8a83..d1569015a 100644 --- a/BTCPayServer/bundleconfig.json +++ b/BTCPayServer/bundleconfig.json @@ -4,8 +4,7 @@ "inputFiles": [ "wwwroot/vendor/bootstrap4/css/bootstrap.css", "wwwroot/vendor/magnific-popup/magnific-popup.css", - "wwwroot/css/creative.css", - "wwwroot/css/site.css", + "wwwroot/main/**/*.css", "wwwroot/vendor/animatecss/animate.css" ] }, @@ -18,7 +17,7 @@ "wwwroot/vendor/jquery-easing/jquery.easing.js", "wwwroot/vendor/scrollreveal/scrollreveal.min.js", "wwwroot/vendor/magnific-popup/jquery.magnific-popup.js", - "wwwroot/js/creative.js" + "wwwroot/main/**/js/*.js" ] }, { diff --git a/BTCPayServer/wwwroot/css/creative.min.css b/BTCPayServer/wwwroot/css/creative.min.css deleted file mode 100644 index ad514d126..000000000 --- a/BTCPayServer/wwwroot/css/creative.min.css +++ /dev/null @@ -1,452 +0,0 @@ -/*! - * Start Bootstrap - Createive v4.0.0-beta (http://startbootstrap.com/template-overviews/creative) - * Copyright 2013-2017 Start Bootstrap - * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-creative/blob/master/LICENSE) - */ - -body, html { - width: 100%; - height: 100% -} - -body { - font-family: Merriweather,'Helvetica Neue',Arial,sans-serif -} - -hr { - max-width: 50px; - border-width: 3px; - border-color: #f05f40 -} - - hr.light { - border-color: #fff - } - -a { - color: #f05f40; - -webkit-transition: all .2s; - -moz-transition: all .2s; - transition: all .2s -} - - a:focus, a:hover { - color: #f05f40 - } - -h1, h2, h3, h4, h5, h6 { - font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif -} - -p { - font-size: 16px; - line-height: 1.5; - margin-bottom: 20px -} - -.bg-primary { - background-color: #f05f40 !important -} - -.bg-dark { - color: #fff; - background-color: #222 !important -} - -.text-faded { - color: rgba(255,255,255,.7) -} - -section { - padding: 100px 0 -} - -.section-heading { - margin-top: 0 -} - -::-moz-selection { - color: #fff; - background: #222; - text-shadow: none -} - -::selection { - color: #fff; - background: #222; - text-shadow: none -} - -img::selection { - color: #fff; - background: 0 0 -} - -img::-moz-selection { - color: #fff; - background: 0 0 -} - -body { - -webkit-tap-highlight-color: #222 -} - -#mainNav { - border-color: rgba(34,34,34,.05); - background-color: #fff; - font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; - -webkit-transition: all .2s; - -moz-transition: all .2s; - transition: all .2s -} - - #mainNav .navbar-brand { - font-weight: 700; - text-transform: uppercase; - color: #f05f40; - font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif - } - - #mainNav .navbar-brand:focus, #mainNav .navbar-brand:hover { - color: #f05f40 - } - - #mainNav .navbar-toggle { - font-size: 12px; - font-weight: 700; - text-transform: uppercase; - color: #222 - } - - #mainNav .navbar-nav > li.nav-item > a.nav-link, #mainNav .navbar-nav > li.nav-item > a.nav-link:focus { - font-size: 13px; - font-weight: 700; - text-transform: uppercase; - color: #222 - } - - #mainNav .navbar-nav > li.nav-item > a.nav-link:focus:hover, #mainNav .navbar-nav > li.nav-item > a.nav-link:hover { - color: #f05f40 - } - - #mainNav .navbar-nav > li.nav-item > a.nav-link.active, #mainNav .navbar-nav > li.nav-item > a.nav-link:focus.active { - color: #f05f40 !important; - background-color: transparent - } - - #mainNav .navbar-nav > li.nav-item > a.nav-link.active:hover, #mainNav .navbar-nav > li.nav-item > a.nav-link:focus.active:hover { - background-color: transparent - } - -@media (min-width:992px) { - #mainNav { - border-color: rgba(255,255,255,.3); - background-color: transparent - } - - #mainNav .navbar-brand { - color: rgba(255,255,255,.7) - } - - #mainNav .navbar-brand:focus, #mainNav .navbar-brand:hover { - color: #fff - } - - #mainNav .navbar-nav > li.nav-item > a.nav-link, #mainNav .navbar-nav > li.nav-item > a.nav-link:focus { - color: rgba(255,255,255,.7) - } - - #mainNav .navbar-nav > li.nav-item > a.nav-link:focus:hover, #mainNav .navbar-nav > li.nav-item > a.nav-link:hover { - color: #fff - } - - #mainNav.navbar-shrink { - border-color: rgba(34,34,34,.05); - background-color: #fff - } - - #mainNav.navbar-shrink .navbar-brand { - font-size: 16px; - color: #f05f40 - } - - #mainNav.navbar-shrink .navbar-brand:focus, #mainNav.navbar-shrink .navbar-brand:hover { - color: #f05f40 - } - - #mainNav.navbar-shrink .navbar-nav > li.nav-item > a.nav-link, #mainNav.navbar-shrink .navbar-nav > li.nav-item > a.nav-link:focus { - color: #222 - } - - #mainNav.navbar-shrink .navbar-nav > li.nav-item > a.nav-link:focus:hover, #mainNav.navbar-shrink .navbar-nav > li.nav-item > a.nav-link:hover { - color: #f05f40 - } -} - -header.masthead { - position: relative; - width: 100%; - min-height: auto; - text-align: center; - color: #fff; - background-image: url(../img/header.jpg); - background-position: center; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover -} - - header.masthead .header-content { - position: relative; - width: 100%; - padding: 150px 15px 100px; - text-align: center - } - - header.masthead .header-content .header-content-inner h1 { - font-size: 30px; - font-weight: 700; - margin-top: 0; - margin-bottom: 0; - text-transform: uppercase - } - - header.masthead .header-content .header-content-inner hr { - margin: 30px auto - } - - header.masthead .header-content .header-content-inner p { - font-size: 16px; - font-weight: 300; - margin-bottom: 50px; - color: rgba(255,255,255,.7) - } - -@media (min-width:768px) { - header.masthead { - height: 100%; - min-height: 600px - } - - header.masthead .header-content { - position: absolute; - top: 50%; - padding: 0 50px; - -webkit-transform: translateY(-50%); - -ms-transform: translateY(-50%); - transform: translateY(-50%) - } - - header.masthead .header-content .header-content-inner { - max-width: 1000px; - margin-right: auto; - margin-left: auto - } - - header.masthead .header-content .header-content-inner h1 { - font-size: 50px - } - - header.masthead .header-content .header-content-inner p { - font-size: 18px; - max-width: 80%; - margin-right: auto; - margin-left: auto - } -} - -.service-box { - max-width: 400px; - margin: 50px auto 0 -} - -@media (min-width:992px) { - .service-box { - margin: 20px auto 0 - } -} - -.service-box p { - margin-bottom: 0 -} - -.portfolio-box { - position: relative; - display: block; - max-width: 650px; - margin: 0 auto -} - - .portfolio-box .portfolio-box-caption { - position: absolute; - bottom: 0; - display: block; - width: 100%; - height: 100%; - text-align: center; - opacity: 0; - color: #fff; - background: rgba(240,95,64,.9); - -webkit-transition: all .2s; - -moz-transition: all .2s; - transition: all .2s - } - - .portfolio-box .portfolio-box-caption .portfolio-box-caption-content { - position: absolute; - top: 50%; - width: 100%; - transform: translateY(-50%); - text-align: center - } - - .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category, .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name { - padding: 0 15px; - font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif - } - - .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category { - font-size: 14px; - font-weight: 600; - text-transform: uppercase - } - - .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name { - font-size: 18px - } - - .portfolio-box:hover .portfolio-box-caption { - opacity: 1 - } - - .portfolio-box:focus { - outline: 0 - } - -@media (min-width:768px) { - .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category { - font-size: 16px - } - - .portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name { - font-size: 22px - } -} - -.call-to-action { - padding: 50px 0 -} - - .call-to-action h2 { - margin: 0 auto 20px - } - -.text-primary { - color: #f05f40 !important -} - -.no-gutter > [class*=col-] { - padding-right: 0; - padding-left: 0 -} - -.btn-default { - color: #222; - border-color: #fff; - background-color: #fff -} - - .btn-default.focus, .btn-default:focus { - color: #222; - border-color: #bfbfbf; - background-color: #e6e6e6 - } - - .btn-default:hover { - color: #222; - border-color: #e0e0e0; - background-color: #e6e6e6 - } - - .btn-default.active, .btn-default:active, .open > .btn-default.dropdown-toggle { - color: #222; - border-color: #e0e0e0; - background-color: #e6e6e6 - } - - .btn-default.active.focus, .btn-default.active:focus, .btn-default.active:hover, .btn-default:active.focus, .btn-default:active:focus, .btn-default:active:hover, .open > .btn-default.dropdown-toggle.focus, .open > .btn-default.dropdown-toggle:focus, .open > .btn-default.dropdown-toggle:hover { - color: #222; - border-color: #bfbfbf; - background-color: #d4d4d4 - } - - .btn-default.active, .btn-default:active, .open > .btn-default.dropdown-toggle { - background-image: none - } - - .btn-default.disabled.focus, .btn-default.disabled:focus, .btn-default.disabled:hover, .btn-default[disabled].focus, .btn-default[disabled]:focus, .btn-default[disabled]:hover, fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:hover { - border-color: #fff; - background-color: #fff - } - - .btn-default .badge { - color: #fff; - background-color: #222 - } - -.btn-primary { - color: #fff; - border-color: #f05f40; - background-color: #f05f40 -} - - .btn-primary.focus, .btn-primary:focus { - color: #fff; - border-color: #a4270d; - background-color: #eb3812 - } - - .btn-primary:hover { - color: #fff; - border-color: #e13612; - background-color: #eb3812 - } - - .btn-primary.active, .btn-primary:active, .open > .btn-primary.dropdown-toggle { - color: #fff; - border-color: #e13612; - background-color: #eb3812 - } - - .btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover, .btn-primary:active.focus, .btn-primary:active:focus, .btn-primary:active:hover, .open > .btn-primary.dropdown-toggle.focus, .open > .btn-primary.dropdown-toggle:focus, .open > .btn-primary.dropdown-toggle:hover { - color: #fff; - border-color: #a4270d; - background-color: #c93110 - } - - .btn-primary.active, .btn-primary:active, .open > .btn-primary.dropdown-toggle { - background-image: none - } - - .btn-primary.disabled.focus, .btn-primary.disabled:focus, .btn-primary.disabled:hover, .btn-primary[disabled].focus, .btn-primary[disabled]:focus, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:hover { - border-color: #f05f40; - background-color: #f05f40 - } - - .btn-primary .badge { - color: #f05f40; - background-color: #fff - } - -.btn { - font-weight: 700; - text-transform: uppercase; - border: none; - border-radius: 300px; - font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif -} - -.btn-xl { - padding: 15px 30px -} diff --git a/BTCPayServer/wwwroot/css/site.min.css b/BTCPayServer/wwwroot/css/site.min.css deleted file mode 100644 index ee28be335..000000000 --- a/BTCPayServer/wwwroot/css/site.min.css +++ /dev/null @@ -1,28 +0,0 @@ -body { - padding-top: 50px; - padding-bottom: 20px -} - -.body-content { - padding-left: 15px; - padding-right: 15px -} - -.carousel-caption p { - font-size: 20px; - line-height: 1.4 -} - -.carousel-inner .item img[src$=".svg"] { - width: 100% -} - -#qrCode { - margin: 15px -} - -@media screen and (max-width:767px) { - .carousel-caption { - display: none - } -} diff --git a/BTCPayServer/wwwroot/js/creative.min.js b/BTCPayServer/wwwroot/js/creative.min.js deleted file mode 100644 index 5e2df0994..000000000 --- a/BTCPayServer/wwwroot/js/creative.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! - * Start Bootstrap - Createive v4.0.0-beta (http://startbootstrap.com/template-overviews/creative) - * Copyright 2013-2017 Start Bootstrap - * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-creative/blob/master/LICENSE) - */ -!function(a){"use strict";a('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function(){if(location.pathname.replace(/^\//,"")==this.pathname.replace(/^\//,"")&&location.hostname==this.hostname){var e=a(this.hash);if((e=e.length?e:a("[name="+this.hash.slice(1)+"]")).length)return a("html, body").animate({scrollTop:e.offset().top-48},1e3,"easeInOutExpo"),!1}}),a(".js-scroll-trigger").click(function(){a(".navbar-collapse").collapse("hide")}),a("body").scrollspy({target:"#mainNav",offset:48}),a(window).scroll(function(){a("#mainNav").offset().top>100?a("#mainNav").addClass("navbar-shrink"):a("#mainNav").removeClass("navbar-shrink")}),window.sr=ScrollReveal(),sr.reveal(".sr-icons",{duration:600,scale:.3,distance:"0px"},200),sr.reveal(".sr-button",{duration:1e3,delay:200}),sr.reveal(".sr-contact",{duration:600,scale:.3,distance:"0px"},300),a(".popup-gallery").magnificPopup({delegate:"a",type:"image",tLoading:"Loading image #%curr%...",mainClass:"mfp-img-mobile",gallery:{enabled:!0,navigateByImgClick:!0,preload:[0,1]},image:{tError:'The image #%curr% could not be loaded.'}})}(jQuery); \ No newline at end of file diff --git a/BTCPayServer/wwwroot/js/site.js b/BTCPayServer/wwwroot/js/site.js deleted file mode 100644 index 0f3411a45..000000000 --- a/BTCPayServer/wwwroot/js/site.js +++ /dev/null @@ -1 +0,0 @@ -// Write your JavaScript code. diff --git a/BTCPayServer/wwwroot/js/site.min.js b/BTCPayServer/wwwroot/js/site.min.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/BTCPayServer/wwwroot/css/creative.css b/BTCPayServer/wwwroot/main/css/creative.css similarity index 99% rename from BTCPayServer/wwwroot/css/creative.css rename to BTCPayServer/wwwroot/main/css/creative.css index 0ac9802b9..9959e0204 100644 --- a/BTCPayServer/wwwroot/css/creative.css +++ b/BTCPayServer/wwwroot/main/css/creative.css @@ -196,7 +196,7 @@ header.masthead { min-height: auto; text-align: center; color: white; - background-image: url("../img/bg.png"); + background-image: url("../../img/bg.png"); background-position: center; -webkit-background-size: cover; -moz-background-size: cover; diff --git a/BTCPayServer/wwwroot/css/site.css b/BTCPayServer/wwwroot/main/css/site.css similarity index 100% rename from BTCPayServer/wwwroot/css/site.css rename to BTCPayServer/wwwroot/main/css/site.css diff --git a/BTCPayServer/wwwroot/js/creative.js b/BTCPayServer/wwwroot/main/js/creative.js similarity index 100% rename from BTCPayServer/wwwroot/js/creative.js rename to BTCPayServer/wwwroot/main/js/creative.js