Skip to content

Commit

Permalink
Merge pull request #369 from bimoe/master
Browse files Browse the repository at this point in the history
update hyper theme
  • Loading branch information
assimon authored Apr 5, 2022
2 parents ab7d319 + 0fc534a commit ca6ec3e
Show file tree
Hide file tree
Showing 20 changed files with 1,259 additions and 886 deletions.
494 changes: 494 additions & 0 deletions public/assets/hyper/css/hyper.css

Large diffs are not rendered by default.

Binary file added public/assets/hyper/images/check.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/hyper/images/loading.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 104 additions & 0 deletions public/assets/hyper/js/hyper.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions public/assets/hyper/js/jquery-3.4.1.min.js

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions resources/lang/zh_CN/hyper.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'error_back_btn' => '返回',
'error_error' => '错误',
'order_search' => '查询订单',
'global_currency' => '',
'global_currency' => '¥',

# home.blade.php

Expand All @@ -23,7 +23,10 @@
'home_automatic_delivery' => '自动发货',
'home_charge' => '人工发货',
'home_buy' => '购买',
'home_sell_out' => '售罄',
'home_out_of_stock' => '缺货',
'home_whole' => '全部',
'home_tip' =>'提示',
'home_sell_out_tip' =>'商品缺货',

# buy.blade.php
'buy_title' => '产品详细信息',
Expand Down Expand Up @@ -108,7 +111,7 @@
'qrpay_expiration_date' => '分钟',
'qrpay_actual_payment' => '商品总价',
'qrpay_open_app_to_pay' => '打开app支付',
'qrpay_notice' => '通知',
'qrpay_notice' => '通知',
'payment_successful' => '支付成功!',
'order_pay_timeout' => '支付超时!',

Expand Down
6 changes: 3 additions & 3 deletions resources/views/hyper/errors/error.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
</div>
</div>
<div class="row justify-content-center">
<div class="col-lg-4">
<div class="col-lg-6">
<div class="text-center">
<h1 class="text-error mt-4">error</h1>
<h4 class="text-uppercase text-danger mt-3">{{ $content }}</h4>
<div class="text-error mt-4">error</div>
<h1 class="text-uppercase text-danger mt-3">{{ $content }}</h1>
@if(!$url)
<a class="btn btn-info mt-3" href="javascript:history.back(-1);"><i class="mdi mdi-reply"></i> {{ __('hyper.error_back_btn') }}</a>
@else
Expand Down
33 changes: 7 additions & 26 deletions resources/views/hyper/layouts/_footer.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<!-- Footer Start -->
</div>
<footer class="footer" style="background-color: #fafbfe;">
<div class="container-fluid">
<footer class="hyper-footer">
<div class="container">
<div class="row">
<div class="col-md-6">
<div class="footer-links">
Expand All @@ -15,28 +14,10 @@
</div>
</div>
</div>
<div class="back-to-top">
<button class=" btn btn-primary" id="back-to-top">
<i class="dripicons-chevron-up"></i>
</button>
</div>
</footer>
<div id="loading">
<div id="loading-center">
<div id="loading-center-absolute">
<div class="object" id="object_one"></div>
<div class="object" id="object_two"></div>
<div class="object" id="object_three"></div>
</div>
</div>
</div>
</div>
<!-- end Footer -->
<!-- bundle -->

<script src="/assets/hyper/js/vendor.min.js"></script>
<script src="/assets/hyper/js/app.min.js"></script>
<script>
document.addEventListener('DOMContentLoaded',function () {
$("#loading").fadeOut(1000);
});
</script>
<script>console.group("Faka");console.log("Name: 独角数卡");console.log("Github: https://github.com/assimon/dujiaoka");console.groupEnd();</script>
<script>console.group("Theme");console.log("Name: Hyper Theme");console.log("Author: Bimoes");console.groupEnd();</script>
</body>
</html>
283 changes: 15 additions & 268 deletions resources/views/hyper/layouts/_header.blade.php
Original file line number Diff line number Diff line change
@@ -1,268 +1,15 @@
<!DOCTYPE html>
<html lang="{{ str_replace('_','-',strtolower(app()->getLocale())) }}">
<head>
<meta charset="utf-8" />
<title>{{ isset($page_title) ? $page_title : '' }} | {{ dujiaoka_config_get('title') }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="Keywords" content="{{ dujiaoka_config_get('keywords') }}">
<meta name="Description" content="{{ dujiaoka_config_get('description') }}">
@if(\request()->getScheme() == "https")
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
@endif
<!-- App favicon -->
<link rel="shortcut icon" href="/favicon.ico">
<!-- third party css -->
<link href="/assets/hyper/css/vendor/jquery-jvectormap-1.2.2.css" rel="stylesheet" type="text/css" />
<link href="/assets/hyper/css/hyper-loading.css" rel="stylesheet" type="text/css" />
<!-- third party css end -->
<!-- App css -->
<link href="/assets/hyper/css/icons.min.css" rel="stylesheet" type="text/css" />
<link href="/assets/hyper/css/app-creative.min.css" rel="stylesheet" type="text/css" id="light-style" />
<style>
body {
background-color: #fafafa;
}
.home-page-title-right {
float: right;
margin-top: 20px;
}
.close-jq-toast-single {
background: #3b5d52!important;
}
.row-list .row {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
flex-wrap: wrap;
}
.row-list .row > [class*='col-'] {
display: flex;
flex-direction: column;
}
.box {
display: block;
padding-top: 32px;
color: #3c4655;
background-color: #fff;
border-radius: .25rem;
box-shadow: 0 0 35px 0 rgb(154 161 171 / 15%);
margin-bottom: 24px;
transition: all .5s;
}
.box:hover {
color: #3c4655;
background-color: #f5f5f5;
box-shadow: 0 3px 6px 0 rgb(0 0 0 / 12%);
-webkit-box-shadow: 0 3px 6px 0 rgb(0 0 0 / 12%);
}
@media (max-width: 767px) {
.box {
padding-top: 32px;
padding-bottom: 14px;
padding-left: 12px;
padding-right: 12px;
}
.img-box {
margin-bottom: 12px;
}
.shop-img {
max-width: 88px;
}
}
@media (min-width: 768px) {
.box {
padding-top: 32px;
padding-bottom: 14px;
padding-left: 24px;
padding-right: 24px;
}
.img-box {
margin-bottom: 12px;
}
.shop-img {
max-width: 100px;
}
}
@media (min-width: 1200px) {
.box {
padding-top: 32px;
padding-bottom: 14px;
padding-left: 20px;
padding-right: 20px;
}
.img-box {
margin-bottom: 24px;
}
.shop-img {
max-width: 120px;
}
}
.custom-control-label {
line-height: 24px;
}
@media screen and (min-width: 767px) {
.sp-height {
position: relative;
overflow: hidden;
width: 100%;
}
.scrollbar {
overflow-x: hidden;
overflow-y: auto;
scrollbar-width: none; /* Firefox */
-ms-overflow-style: none; /* IE 10+ */
}
.scrollbar::-webkit-scrollbar {
display: none; /* Chrome Safari */
}
}
.info {
font-size: 16px;
font-weight: 700;
display: inline-block;
color: #000;
margin-left: 10px;
vertical-align: middle;
}
.kami-info{
height: 170px;
overflow-wrap: break-word;
overflow: auto;
border: 1px solid #ccc;
margin-bottom: 2px;
font-size: 14px;
}
.img-box {
width: 100%;
text-align: center;
}
.img-badge {
position: absolute;
top: 6px;
right: 18px;
}
.shop-name {
font-size: 14px;
}
.shop-price {
font-size: 16px;
font-weight: 500;
color: #d0021b;
}
.hyper-badge {
font-size: 12px;
color: #fff;
background-color: #f9bc0d;
padding-left: 6px;
padding-right: 6px;
padding-top: 3px;
padding-bottom: 3px;
border-radius: 2px;
margin-left: 4px;
}
.shop-center {
display: flex;
align-items: center;
}
/* buy.blade.php */
@media (max-width: 767px) {
.buy-img img {
max-width: 150px;
}
.buy-img {
margin-bottom: 12px;
}
}
@media (min-width: 768px) {
.buy-form {
display: grid;
grid-template-rows: auto auto;
grid-template-columns: 225px auto;
}
.buy-img img {
max-width: 180px;
}
.buy-type {
max-width: 90%;
}
}
@media (min-width: 1200px) {
.buy-form {
display: grid;
grid-template-rows: auto auto;
grid-template-columns: 375px auto;
}
.buy-img img {
max-width: 200px;
}
.buy-type {
max-width: 70%;
}
}
.buy-img {
display: flex;
grid-row-start: 1;
grid-column-end: 2;
grid-row-end: 3;
justify-content: center;
align-items: center;
}
.buy-type {
grid-row-start: 2;
grid-column-end: 3;
}
.buy-group {
position: relative;
line-height: 36px;
padding-left: 94px;
}
.buy-title {
position: absolute;
left: 0;
font-weight: 600;
}
.buy-product img {
max-width:100%;
height: auto;
border-radius: 5px;
cursor: pointer;
}
.geetest_holder.geetest_wind {
width: 100%!important;
min-width: 100%!important;
}
</style>
</head>

<body class="loading" data-layout="topnav">
<!-- Begin page -->
<div class="wrapper">
<!-- ============================================================== -->
<!-- Start Page Content here -->
<!-- ============================================================== -->
<div class="content-page">
<div class="content">
<!-- Topbar Start -->
<div class="navbar-custom topnav-navbar">
<div class="container">
<!-- LOGO -->
<a href="/" class="topnav-logo" style="float: none;">
<img src="{{ picture_ulr(dujiaoka_config_get('img_logo')) }}" height="48">
<div class="info">{{ dujiaoka_config_get('text_logo') }}</div>
</a>
<ul class="list-unstyled topbar-right-menu float-right mb-0">
<li class="notification-list">
<a class="nav-link right-bar-toggle" href="{{ url('order-search') }}">
<i class="noti-icon mdi mdi-magnify search-icon"></i>
{{ __('hyper.order_search') }}
</a>
</li>
</ul>
</div>
</div>
<!-- end Topbar -->
<head>
<meta charset="utf-8" />
<title>{{ isset($page_title) ? $page_title : '' }} | {{ dujiaoka_config_get('title') }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="Keywords" content="{{ dujiaoka_config_get('keywords') }}">
<meta name="Description" content="{{ dujiaoka_config_get('description') }}">
@if(\request()->getScheme() == "https")
<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
@endif
<link rel="shortcut icon" href="/favicon.ico">
<link href="/assets/hyper/css/vendor/jquery-jvectormap-1.2.2.css" rel="stylesheet" type="text/css">
<link href="/assets/hyper/css/icons.min.css" rel="stylesheet" type="text/css">
<link href="/assets/hyper/css/app-creative.min.css" rel="stylesheet" type="text/css" id="light-style">
<link href="/assets/hyper/css/hyper.css?v=045256" rel="stylesheet" type="text/css">
</head>
13 changes: 13 additions & 0 deletions resources/views/hyper/layouts/_nav.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<div class="header-navbar">
<div class="container header-flex">
<!-- LOGO -->
<a href="/" class="topnav-logo" style="float: none;">
<img src="{{ picture_ulr(dujiaoka_config_get('img_logo')) }}" height="36">
<div class="logo-title">{{ dujiaoka_config_get('text_logo') }}</div>
</a>
<a class="btn btn-outline-primary" href="{{ url('order-search') }}">
<i class="noti-icon uil-file-search-alt search-icon"></i>
查询订单
</a>
</div>
</div>
10 changes: 0 additions & 10 deletions resources/views/hyper/layouts/_notice.blade.php

This file was deleted.

Loading

0 comments on commit ca6ec3e

Please sign in to comment.