Commit cd127f3b authored by Jason's avatar Jason

Merge branch 'master' of https://gitlab.taipay.com.tw/jasonwai/tokenvaultmanagement

# Conflicts:
#	Merchant Token Vault Management/backstage/wwwroot/css/style.css
parents 23719a21 d9f5d5d3
......@@ -19275,6 +19275,7 @@ tbody {
}
<<<<<<<<< Temporary merge branch 1
/*版本號樣式*/
......@@ -19284,9 +19285,7 @@ tbody {
padding: 20px 16px 10px 16px
}
}
=========
.floating-msg {
position: fixed;
top: 80px;
......@@ -19308,4 +19307,11 @@ tbody {
.dashboard-card .card-content .number {
font-size: 5rem;
color: #35A9E1;
}
.versionNo {
color: #f2f2f2;
font-size: 0.825rem;
padding: 20px 16px 10px 16px
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment