Skip to content

Commit adfcd77

Browse files
authored
Coloured coins - Merge pull request #190 from Chia-Network/beta_cc_copy
Coloured coins
2 parents 81ef225 + ec8f7f1 commit adfcd77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+5479
-184
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,6 @@ src/wallet/electron/node_modules/
7272

7373
# Node modules
7474
**/node_modules
75+
76+
# Offer Files
77+
*.offer

electron-ui/assets/css/style.css

Lines changed: 184 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,11 @@ tbody.ob-heading {
13441344
border-bottom-left-radius: 5px;
13451345
}
13461346

1347+
.wallet .field-with-top-border {
1348+
border-top: 1px solid #2a2e39;
1349+
padding: 15px;
1350+
}
1351+
13471352
.wallet .nav-pills,
13481353
.wallet .tab-content {
13491354
-webkit-box-shadow: 0 2px 16px 0 rgba(0, 0, 0, 0.04);
@@ -1405,6 +1410,20 @@ tbody.ob-heading {
14051410
box-shadow: 0px 0px 15px 0px #26de81ad;
14061411
}
14071412

1413+
.wallet .tab-content button.blue {
1414+
background: #007bff;
1415+
color: #ffffff;
1416+
-webkit-box-shadow: 0px 0px 15px 0px #007bffad;
1417+
box-shadow: 0px 0px 15px 0px #007bffad;
1418+
}
1419+
1420+
.wallet .tab-content button.cool {
1421+
background: #00000000;
1422+
color: #ffffff;
1423+
-webkit-box-shadow: 0px 0px 15px 0px #007bffad;
1424+
box-shadow: 0px 0px 15px 0px #007bffad;
1425+
}
1426+
14081427
.wallet .tab-content button.red {
14091428
background: #ff231f;
14101429
-webkit-box-shadow: 0px 0px 15px 0px #ff231fad;
@@ -1830,7 +1849,8 @@ tbody.ob-heading {
18301849

18311850
#dark .wallet .nav-pills a,
18321851
#dark .wallet-address,
1833-
#dark .wallet-history {
1852+
#dark .wallet-history,
1853+
#dark .cc-offer {
18341854
border-top: 1px solid #2a2e39;
18351855
}
18361856

@@ -1871,6 +1891,15 @@ tbody.ob-heading {
18711891
color: #ffffff;
18721892
}
18731893

1894+
#dark .cc-offer input,
1895+
#dark .cc-offer input:focus {
1896+
border: 1px solid #2a2e39;
1897+
background: #2a2e39;
1898+
-webkit-box-shadow: none;
1899+
box-shadow: none;
1900+
color: #ffffff;
1901+
}
1902+
18741903
#dark .depth-chart-inner {
18751904
border: 1px solid #2a2e39;
18761905
}
@@ -1959,6 +1988,10 @@ tbody.ob-heading {
19591988
margin-top: 40px;
19601989
}
19611990

1991+
.cc-offer img {
1992+
margin-top: 40px;
1993+
}
1994+
19621995
#dark header button.navbar-toggler i {
19631996
color: #c5cbce;
19641997
}
@@ -2130,3 +2163,153 @@ table td {
21302163
color: #a2a2a2 !important;
21312164
text-decoration: underline !important;
21322165
}
2166+
2167+
2168+
.colour-input input {
2169+
padding: 25px 15px;
2170+
font-size: 14px;
2171+
}
2172+
2173+
.header-custom-icon .nav-link {
2174+
line-height: 0;
2175+
margin-top: 6px;
2176+
}
2177+
2178+
.colour-input .input-group-prepend button {
2179+
padding: 13px 20px;
2180+
border-top-right-radius: 5px !important;
2181+
border-bottom-right-radius: 5px !important;
2182+
}
2183+
2184+
.colour-input .input-group-go button {
2185+
padding: 13px 20px;
2186+
margin-top: 10px;
2187+
}
2188+
2189+
.colour-input input {
2190+
border: 1px solid #e0e3eb;
2191+
}
2192+
2193+
.colour-input h4 {
2194+
margin-bottom: 20px;
2195+
}
2196+
2197+
.colour-input .input-group {
2198+
padding-top: 30px;
2199+
}
2200+
2201+
#dark .colour-input input,
2202+
#dark .colour-input input:focus {
2203+
border: 1px solid #2a2e39;
2204+
background: #2a2e39;
2205+
box-shadow: none;
2206+
color: #ffffff;
2207+
}
2208+
2209+
#colour-input-label {
2210+
padding-top: 15px !important;
2211+
padding-right: 10px !important;
2212+
}
2213+
2214+
2215+
.cc-offer {
2216+
border-top: 1px solid #e0e3eb;
2217+
padding-top: 25px;
2218+
margin-top: 35px;
2219+
}
2220+
2221+
.cc-offer input {
2222+
padding: 25px 15px;
2223+
font-size: 14px;
2224+
}
2225+
2226+
.cc-offer .input-group-prepend button {
2227+
padding: 13px 20px;
2228+
border-top-right-radius: 5px !important;
2229+
border-bottom-right-radius: 5px !important;
2230+
}
2231+
2232+
.cc-offer input {
2233+
border: 1px solid #e0e3eb;
2234+
}
2235+
2236+
.cc-offer h4 {
2237+
margin-bottom: 20px;
2238+
}
2239+
2240+
.cc-offer .input-group {
2241+
padding-top: 30px;
2242+
}
2243+
2244+
/*the container must be positioned relative:*/
2245+
.custom-select-s {
2246+
position: relative;
2247+
font-family: Arial;
2248+
border-radius: 2px;
2249+
}
2250+
2251+
.custom-select-s select {
2252+
display: none; /*hide original SELECT element:*/
2253+
}
2254+
2255+
.select-selected {
2256+
background-color: rgb(35, 40, 52);
2257+
}
2258+
2259+
/*style the arrow inside the select element:*/
2260+
.select-selected:after {
2261+
position: absolute;
2262+
content: "";
2263+
top: 14px;
2264+
right: 10px;
2265+
width: 0;
2266+
height: 0;
2267+
border: 6px solid transparent;
2268+
border-color: #fff transparent transparent transparent;
2269+
}
2270+
2271+
/*point the arrow upwards when the select box is open (active):*/
2272+
.select-selected.select-arrow-active:after {
2273+
border-color: transparent transparent #fff transparent;
2274+
top: 7px;
2275+
}
2276+
2277+
/*style the items (options), including the selected item:*/
2278+
.select-items div,.select-selected {
2279+
color: #ffffff;
2280+
padding: 8px 16px;
2281+
border: 2px solid transparent;
2282+
border-color: transparent transparent rgba(0, 0, 0, 0.1) transparent;
2283+
cursor: pointer;
2284+
user-select: none;
2285+
border-radius: 2px;
2286+
height: 45px;
2287+
}
2288+
2289+
/*style items (options):*/
2290+
.select-items {
2291+
position: absolute;
2292+
background-color: rgb(35, 40, 52);
2293+
top: 100%;
2294+
left: 0;
2295+
right: 0;
2296+
z-index: 99;
2297+
border-radius: 2px;
2298+
}
2299+
2300+
/*hide the items when the select box is closed:*/
2301+
.select-hide {
2302+
display: none;
2303+
}
2304+
2305+
.select-items div:hover, .same-as-selected {
2306+
background-color: rgba(0, 0, 0, 0.1);
2307+
}
2308+
2309+
.wrap {
2310+
white-space: pre-wrap; /* CSS3 */
2311+
white-space: -moz-pre-wrap; /* Firefox */
2312+
white-space: -pre-wrap; /* Opera <7 */
2313+
white-space: -o-pre-wrap; /* Opera 7 */
2314+
word-wrap: break-word; /* IE */
2315+
}

0 commit comments

Comments
 (0)