fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit ce24836c5491224a03f697d23e2bfa915447ea38 2 parents 13f9eb79 189f3f3c

Merge branch 'develop' into feature/home

Inline Side-by-side
Showing 15 changed files with 154 additions and 124 deletions
... ... @@ -8,7 +8,6 @@
line-height: 1;
text-align: center;
white-space: nowrap;
background-color: $blue;
color: $white;
}
... ...
@use postcss-clearfix;
@use postcss-clearfix ;
.clearfix {
clear: fix;
... ...
... ... @@ -7,6 +7,7 @@
}
.icon {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: "iconfont" !important;
speak: none;
... ... @@ -15,6 +16,7 @@
font-variant: normal;
text-transform: none;
line-height: 1;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
... ...
... ... @@ -32,10 +32,8 @@
&:nth-child($i) {
animation: loading-scale 0.75s $(init)s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
}
$init: calc(($i + 1) * 0.12);
}
display: inline-block;
margin: 4px;
width: 30px;
... ...
... ... @@ -53,6 +53,7 @@
}
/* stylelint-disable */
/* Generated with Bounce.js. Edit at http://goo.gl/W7f9he */
@keyframes animation {
0% {
... ... @@ -95,4 +96,5 @@
transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
}
/* stylelint-enable */
... ...
/* stylelint-disable */
/*! normalize.css v4.1.1 | MIT License | github.com/necolas/normalize.css */
/**
* 1. Change the default font family in all browsers (opinionated).
* 2. Prevent adjustments of font size after orientation changes in IE and iOS.
*/
html {
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
font-family: sans-serif; /* 1 */
-ms-text-size-adjust: 100%; /* 2 */
-webkit-text-size-adjust: 100%; /* 2 */
}
/**
* Remove the margin in all browsers (opinionated).
*/
body {
margin: 0;
margin: 0;
}
/* HTML5 display definitions
... ... @@ -28,58 +27,55 @@ body {
* 1. Add the correct display in Edge, IE, and Firefox.
* 2. Add the correct display in IE.
*/
article,
aside,
details, /* 1 */
details,
figcaption,
figure,
footer,
header,
main, /* 2 */
main,
menu,
nav,
section,
summary { /* 1 */
display: block;
summary {
/* 1 */
display: block;
}
/**
* Add the correct display in IE 9-.
*/
audio,
canvas,
progress,
video {
display: inline-block;
display: inline-block;
}
/**
* Add the correct display in iOS 4-7.
*/
audio:not([controls]) {
display: none;
height: 0;
display: none;
height: 0;
}
/**
* Add the correct vertical alignment in Chrome, Firefox, and Opera.
*/
progress {
vertical-align: baseline;
vertical-align: baseline;
}
/**
* Add the correct display in IE 10-.
* 1. Add the correct display in IE.
*/
template, /* 1 */
template,
[hidden] {
display: none;
display: none;
}
/* Links
... ... @@ -89,20 +85,18 @@ template, /* 1 */
* 1. Remove the gray background on active links in IE 10.
* 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
*/
a {
background-color: transparent; /* 1 */
-webkit-text-decoration-skip: objects; /* 2 */
background-color: transparent; /* 1 */
-webkit-text-decoration-skip: objects; /* 2 */
}
/**
* Remove the outline on focused links when they are also active or hovered
* in all browsers (opinionated).
*/
a:active,
a:hover {
outline-width: 0;
outline-width: 0;
}
/* Text-level semantics
... ... @@ -112,85 +106,77 @@ a:hover {
* 1. Remove the bottom border in Firefox 39-.
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/
abbr[title] {
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
border-bottom: none; /* 1 */
text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
}
/**
* Prevent the duplicate application of `bolder` by the next rule in Safari 6.
*/
b,
strong {
font-weight: inherit;
font-weight: inherit;
}
/**
* Add the correct font weight in Chrome, Edge, and Safari.
*/
b,
strong {
font-weight: bolder;
font-weight: bolder;
}
/**
* Add the correct font style in Android 4.3-.
*/
dfn {
font-style: italic;
font-style: italic;
}
/**
* Correct the font size and margin on `h1` elements within `section` and
* `article` contexts in Chrome, Firefox, and Safari.
*/
h1 {
font-size: 2em;
margin: 0.67em 0;
font-size: 2em;
margin: 0.67em 0;
}
/**
* Add the correct background and color in IE 9-.
*/
mark {
background-color: #ff0;
color: #000;
background-color: #ff0;
color: #000;
}
/**
* Add the correct font size in all browsers.
*/
small {
font-size: 80%;
font-size: 80%;
}
/**
* Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
bottom: -0.25em;
}
sup {
top: -0.5em;
top: -0.5em;
}
/* Embedded content
... ... @@ -199,17 +185,15 @@ sup {
/**
* Remove the border on images inside links in IE 10-.
*/
img {
border-style: none;
border-style: none;
}
/**
* Hide the overflow in IE.
*/
svg:not(:root) {
overflow: hidden;
overflow: hidden;
}
/* Grouping content
... ... @@ -219,32 +203,29 @@ svg:not(:root) {
* 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
pre,
samp {
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
font-family: monospace, monospace; /* 1 */
font-size: 1em; /* 2 */
}
/**
* Add the correct margin in IE 8.
*/
figure {
margin: 1em 40px;
margin: 1em 40px;
}
/**
* 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/
hr {
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
}
/* Forms
... ... @@ -254,41 +235,41 @@ hr {
* 1. Change font properties to `inherit` in all browsers (opinionated).
* 2. Remove the margin in Firefox and Safari.
*/
button,
input,
select,
textarea {
font: inherit; /* 1 */
margin: 0; /* 2 */
font: inherit; /* 1 */
margin: 0; /* 2 */
}
/**
* Restore the font weight unset by the previous rule.
*/
optgroup {
font-weight: bold;
font-weight: bold;
}
/**
* Show the overflow in IE.
* 1. Show the overflow in Edge.
*/
button,
input { /* 1 */
overflow: visible;
input {
/* 1 */
overflow: visible;
}
/**
* Remove the inheritance of text transform in Edge, Firefox, and IE.
* 1. Remove the inheritance of text transform in Firefox.
*/
button,
select { /* 1 */
text-transform: none;
select {
/* 1 */
text-transform: none;
}
/**
... ... @@ -296,45 +277,41 @@ select { /* 1 */
* controls in Android 4.
* 2. Correct the inability to style clickable types in iOS and Safari.
*/
button,
html [type="button"], /* 1 */
html [type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button; /* 2 */
-webkit-appearance: button; /* 2 */
}
/**
* Remove the inner border and padding in Firefox.
*/
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
border-style: none;
padding: 0;
}
/**
* Restore the focus styles unset by the previous rule.
*/
button:-moz-focusring,
[type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
outline: 1px dotted ButtonText;
}
/**
* Change the border, margin, and padding in all browsers (opinionated).
*/
fieldset {
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
border: 1px solid #c0c0c0;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
}
/**
... ... @@ -343,79 +320,72 @@ fieldset {
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/
legend {
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
box-sizing: border-box; /* 1 */
color: inherit; /* 2 */
display: table; /* 1 */
max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
}
/**
* Remove the default vertical scrollbar in IE.
*/
textarea {
overflow: auto;
overflow: auto;
}
/**
* 1. Add the correct box sizing in IE 10-.
* 2. Remove the padding in IE 10-.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
}
/**
* Correct the cursor style of increment and decrement buttons in Chrome.
*/
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
height: auto;
}
/**
* 1. Correct the odd appearance in Chrome and Safari.
* 2. Correct the outline style in Safari.
*/
[type="search"] {
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
-webkit-appearance: textfield; /* 1 */
outline-offset: -2px; /* 2 */
}
/**
* Remove the inner padding and cancel buttons in Chrome and Safari on OS X.
*/
[type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
-webkit-appearance: none;
}
/**
* Correct the text style of placeholders in Chrome, Edge, and Safari.
*/
::-webkit-input-placeholder {
color: inherit;
opacity: 0.54;
color: inherit;
opacity: 0.54;
}
/**
* 1. Correct the inability to style clickable types in iOS and Safari.
* 2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
-webkit-appearance: button; /* 1 */
font: inherit; /* 2 */
}
/* stylelint-enable */
\ No newline at end of file
... ...
... ... @@ -18,7 +18,7 @@
.item-del {
margin-top: 10px;
border-top: 1px solid #e0e0e0;
color: #5c99e4
color: #5c99e4;
}
}
}
... ...
... ... @@ -33,7 +33,6 @@
right: 0;
margin-left: auto;
margin-right: auto;
}
.icon-label {
... ...
... ... @@ -22,6 +22,7 @@
font-size: 28px;
}
}
.coin-detail {
margin-top: 40px;
... ... @@ -69,6 +70,7 @@
color: #b0b0b0;
}
}
.coin-num {
font-size: 34px;
line-height: 92px;
... ...
... ... @@ -16,7 +16,6 @@
height: 130px;
line-height: 130px;
}
height: 90px;
border-bottom: 1px solid #e0e0e0;
... ...
... ... @@ -6,17 +6,20 @@
padding: 0 30px;
background: #fff;
}
.status-desc {
display: flex;
height: 80px;
line-height: 80px;
color: $white;
background: $black;
p:first-of-type {
flex: 1;
font-size: 34px;
}
}
.exchange-progress {
border-bottom: 1px solid #eee;
... ... @@ -67,9 +70,11 @@
color: #b0b0b0;
}
}
.progress-todo {
padding: 25px 0;
text-align: center;
p:first-of-type {
font-size: 34px;
... ... @@ -83,6 +88,7 @@
}
}
}
.exchange-details {
margin-top: 20px;
border-top: 1px solid #eee;
... ... @@ -101,8 +107,8 @@
color: #b0b0b0;
}
}
}
.exchange-product {
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
... ... @@ -116,6 +122,7 @@
border-bottom: 0 none;
}
}
.img-box {
position: relative;
width: 98px;
... ... @@ -133,11 +140,13 @@
color: $white;
text-align: center;
}
img {
width: 100%;
height: 100%;
}
}
.goods-detail {
flex: 1;
margin: 0 20px;
... ... @@ -146,6 +155,7 @@
span {
margin-right: 40px;
}
.name {
display: -webkit-box;
-webkit-line-clamp: 2;
... ... @@ -156,30 +166,36 @@
overflow: hidden;
font-size: 28px;
}
.size {
color: #b0b0b0;
}
}
.goods-price {
text-align: right;
p:first-of-type {
font-size: 28px;
}
p:last-of-type {
font-size: 30px;
color: #b0b0b0;
}
}
}
.exchange-reason {
padding: 20px 0;
font-size: 28px;
blockquote {
margin-top: 20px;
color: #b0b0b0;
}
}
.exchange-img {
display: flex;
margin-top: 25px;
... ... @@ -196,6 +212,7 @@
}
}
}
.exchange-address {
position: relative;
padding: 20px 30px 27px;
... ... @@ -211,14 +228,17 @@
margin-right: 40px;
}
}
p:last-of-type {
font-size: 28px;
color: #b0b0b0;
}
}
.exchange-express {
margin-top: 20px;
}
.exchange-order,
.exchange-type {
display: flex;
... ... @@ -233,8 +253,10 @@
.primary {
flex: 1;
}
.cell-ft {
color: #b0b0b0;
&:after {
content: "\e607";
display: inline-block;
... ... @@ -248,6 +270,7 @@
}
}
}
.exchange-options {
position: fixed;
left: 0;
... ... @@ -275,16 +298,19 @@
color: $white;
background: $black;
}
&.countdown {
color: $white;
background: $black;
}
&.normal {
width: 188px;
padding: 0;
border: 1px solid $black;
color: $black;
}
&:focus {
outline: none;
}
... ...
... ... @@ -10,7 +10,7 @@
background: resolve("home/header-bg.png");
background-size: cover;
.setting {
.setting {
float: left;
margin-top: 30px;
margin-left: 15px;
... ...
... ... @@ -94,11 +94,15 @@
border: none;
}
input::-webkit-input-placeholder { /* WebKit browsers */
input::-webkit-input-placeholder {
/* WebKit browsers */
text-align: center;
}
input:-ms-input-placeholder { /* Internet Explorer 10+ */
input:-ms-input-placeholder {
/* Internet Explorer 10+ */
text-align: center;
}
}
... ...
... ... @@ -42,6 +42,7 @@ body {
font-size: 34px;
font-weight: 700;
}
p:last-of-type {
font-size: 28px;
color: #b0b0b0;
... ... @@ -63,10 +64,12 @@ body {
margin-right: 40px;
}
}
p:last-of-type {
font-size: 28px;
color: #b0b0b0;
}
&:after {
content: "";
position: absolute;
... ... @@ -78,6 +81,7 @@ body {
border-bottom: 1px solid #eee;
}
}
.order-goods {
padding-top: 20px;
border-top: 1px solid #eee;
... ... @@ -92,6 +96,7 @@ body {
border-bottom: 0 none;
}
}
.img-box {
position: relative;
width: 98px;
... ... @@ -109,11 +114,13 @@ body {
color: $white;
text-align: center;
}
img {
width: 100%;
height: 100%;
}
}
.goods-detail {
flex: 1;
margin: 0 20px;
... ... @@ -122,6 +129,7 @@ body {
span {
margin-right: 40px;
}
.name {
display: -webkit-box;
-webkit-line-clamp: 2;
... ... @@ -132,22 +140,26 @@ body {
overflow: hidden;
font-size: 28px;
}
.size {
color: #b0b0b0;
}
}
.goods-price {
text-align: right;
p:first-of-type {
font-size: 28px;
}
p:last-of-type {
font-size: 30px;
color: #b0b0b0;
}
}
}
.order-amount {
padding: 30px 20px;
margin-bottom: 20px;
... ... @@ -163,11 +175,13 @@ body {
text-align: left;
color: #b0b0b0;
}
span {
display: inline-block;
width: 200px;
text-align: left;
}
&:last-of-type {
font-size: 34px;
... ... @@ -175,9 +189,9 @@ body {
color: $black;
}
}
}
}
.order-button {
position: fixed;
left: 0;
... ... @@ -204,16 +218,19 @@ body {
color: $white;
background: $black;
}
&.countdown {
color: $white;
background: $black;
}
&.normal {
width: 188px;
padding: 0;
border: 1px solid $black;
color: $black;
}
&:focus {
outline: none;
}
... ...
... ... @@ -15,6 +15,7 @@ $white: #fff;
margin-top: 0;
}
}
.order-detail {
padding: 0 30px;
... ... @@ -28,6 +29,7 @@ $white: #fff;
}
}
}
.order-code {
height: 88px;
font-size: 34px;
... ... @@ -38,6 +40,7 @@ $white: #fff;
flex: 1;
}
}
.order-goods {
.goods-info {
position: relative;
... ... @@ -58,6 +61,7 @@ $white: #fff;
opacity: 0;
}
}
.img-box {
position: relative;
width: 98px;
... ... @@ -81,6 +85,7 @@ $white: #fff;
height: 100%;
}
}
.goods-detail {
flex: 1;
margin: 0 20px;
... ... @@ -101,10 +106,12 @@ $white: #fff;
overflow: hidden;
font-size: 28px;
}
.size {
color: #b0b0b0;
}
}
.goods-price {
text-align: right;
... ... @@ -118,6 +125,7 @@ $white: #fff;
}
}
}
.order-option {
padding: 30px 0;
border-top: 1px solid #eee;
... ... @@ -145,16 +153,19 @@ $white: #fff;
color: $white;
background: $black;
}
&.countdown {
color: $white;
background: $black;
}
&.normal {
width: 188px;
padding: 0;
border: 1px solid $black;
color: $black;
}
&:focus {
outline: none;
}
... ... @@ -174,6 +185,7 @@ $white: #fff;
margin-top: 8px;
line-height: 60px;
}
p:nth-child(2) {
font-size: 28px;
line-height: 30px;
... ...