Skip to content

Commit

Permalink
buttonStyle
Browse files Browse the repository at this point in the history
  • Loading branch information
bari committed Aug 20, 2021
1 parent a5b0194 commit 0c7ccac
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 33 deletions.
2 changes: 1 addition & 1 deletion public/rpc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
window.NODE_CONFIG = {
protocol: "wss",
url: "testnet.uniarts.me",
url: "testnet.uniarts.network",
port: "",
dappName: "Uni-Arts",
currencyId: {
Expand Down
32 changes: 18 additions & 14 deletions src/views/Account/Order.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{{ getOrganizationName(v) }}
</div>
<div class="price" v-if="type !== 'signature'">
{{ getArtPrice(v) || 0 }}
<span>{{ getArtPrice(v) || 0 }}</span>
{{ $store.state.global.chain.tokenSymbol }}
</div>
<div class="date" v-if="type == 'sold' || type == 'bought'">
Expand All @@ -46,27 +46,24 @@
getArtAasmState(v) == 'prepare' ? '' : `/art/${getArtId(v)}`
"
class="action"
:class="{ disabled: getArtAasmState(v) != 'online' }"
v-if="type == 'all' && getArtAasmState(v) != 'prepare'"
>
Auction Now
</router-link>
<!-- :class="{ disabled: getArtAasmState(v) != 'online' }"-->

<!-- <router-link
:to="`/account/edit/${v.id}`"
class="action"
v-else-if="type == 'all' && getArtAasmState(v) == 'prepare'"
>
Edit
</router-link> -->
:to="`/account/edit/${v.id}`"
class="action"
v-else-if="type == 'all' && getArtAasmState(v) == 'prepare'"
>
Edit
</router-link> -->
<div class="action" v-if="type == 'signature'" @click="show(v)">
Check
</div>
<div
class="action"
v-if="type == 'all'"
:class="{ disabled: getArtAasmState(v) != 'online' }"
@click="show(v)"
>
<div class="action" v-if="type == 'all'" @click="show(v)">
<!-- :class="{ disabled: getArtAasmState(v) != 'online' }"-->
Transfer
</div>
</div>
Expand Down Expand Up @@ -306,6 +303,10 @@ export default {
min-height: 18px;
}
.action {
@media screen and (max-width: 970px) {
float: left;
margin-top: 5px;
}
border: 2px solid #020202;
font-size: 16px;
margin-top: 20px;
Expand Down Expand Up @@ -345,6 +346,9 @@ export default {
}
.price {
span {
color: red;
}
font-size: 17px;
font-weight: 600;
text-align: left;
Expand Down
14 changes: 12 additions & 2 deletions src/views/Art/Buttons/BidAuction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,25 @@ export default {
</script>
<style lang="scss" scoped>
.bid-auction {
@media screen and (max-width: 970px) {
margin-right: 5px;
}
> button {
@media screen and (max-width: 970px) {
font-size: 15px;
padding: 4px;
border: 2px solid #020202;
margin-bottom: 5px;
width: 100%;
}
cursor: pointer;
border: 3px solid #020202;
font-size: 20px;
font-weight: bold;
text-align: center;
color: #020202;
letter-spacing: 0px;
padding: 17px 0px;
letter-spacing: 0;
padding: 17px 0;
width: 260px;
background: transparent;
}
Expand Down
14 changes: 12 additions & 2 deletions src/views/Art/Buttons/Buy.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,25 @@ export default {
</script>
<style lang="scss" scoped>
.buy {
@media screen and (max-width: 970px) {
margin-right: 5px;
}
> button {
@media screen and (max-width: 970px) {
font-size: 15px;
padding: 4px;
border: 2px solid #020202;
margin-bottom: 5px;
width: 100%;
}
cursor: pointer;
border: 3px solid #020202;
font-size: 20px;
font-weight: bold;
text-align: center;
color: #020202;
letter-spacing: 0px;
padding: 17px 0px;
letter-spacing: 0;
padding: 17px 0;
width: 260px;
background: transparent;
}
Expand Down
7 changes: 5 additions & 2 deletions src/views/Art/Buttons/CancelSell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,16 @@ export default {
</script>
<style lang="scss" scoped>
.cancel-sell {
@media screen and (max-width: 970px) {
margin-right: 5px;
}
> button {
@media screen and (max-width: 970px) {
font-size: 15px;
padding: 4px 0;
padding: 4px;
border: 2px solid #020202;
margin-bottom: 5px;
width: 40%;
width: 100%;
}
cursor: pointer;
border: 3px solid #020202;
Expand Down
7 changes: 5 additions & 2 deletions src/views/Art/Buttons/CreateAuction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,16 @@ export default {
</script>
<style lang="scss" scoped>
.create-auction {
@media screen and (max-width: 970px) {
margin-right: 5px;
}
> button {
@media screen and (max-width: 970px) {
font-size: 15px;
padding: 4px 0;
padding: 4px;
border: 2px solid #020202;
margin-bottom: 5px;
width: 40%;
width: 100%;
}
cursor: pointer;
border: 3px solid #020202;
Expand Down
7 changes: 5 additions & 2 deletions src/views/Art/Buttons/CreateSell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,16 @@ export default {
</script>
<style lang="scss" scoped>
.create-sell {
@media screen and (max-width: 970px) {
margin-right: 5px;
}
> button {
@media screen and (max-width: 970px) {
font-size: 15px;
padding: 4px 0;
padding: 4px;
border: 2px solid #020202;
margin-bottom: 5px;
width: 40%;
width: 100%;
}
cursor: pointer;
border: 3px solid #020202;
Expand Down
9 changes: 6 additions & 3 deletions src/views/Auction/Apply.vue
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,12 @@ export default {
}
.action {
@media screen and (max-width: 970px) {
margin-top: 0px;
width: 100%;
height: 37px;
font-size: 15px;
padding: 4px;
border: 2px solid #020202;
height: unset;
width: 50%;
margin-top: 3px;
}
width: 100%;
border: 2px solid #020202;
Expand Down
7 changes: 4 additions & 3 deletions src/views/Certificate/ApplyOrg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,10 @@ export default {
}
button {
@media screen and (max-width: 970px) {
width: 70%;
height: 55px;
font-size: 20px;
width: unset;
height: unset;
font-size: 18px;
padding: 5px 15px;
}
width: 307px;
height: 75px;
Expand Down
5 changes: 4 additions & 1 deletion src/views/Certificate/Organization.vue
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@ export default {
}
.desc {
@media screen and (max-width: 970px) {
margin-top: 10px;
margin-top: 0px;
height: auto;
font-size: 16px;
line-height: 20px;
}
height: 112px;
overflow: hidden;
Expand Down
2 changes: 1 addition & 1 deletion vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ module.exports = {
},
},
"/api": {
target: "https://app.uniarts.me", // 接口的域名 测试
target: "https://app.uniarts.network", // 接口的域名 测试
pathRewrite: {
"^api": "/api",
},
Expand Down

0 comments on commit 0c7ccac

Please sign in to comment.