BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1881 from bechi/input-icon 

New Icons and input style
This commit is contained in:
Matias Alejo Garcia 2014-11-30 22:35:53 -03:00
parent 767aaaa16e e8be5814d4
commit fcb254b39c
17 changed files with 282 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
css/src/icons.css
View File

@ -50,6 +50,78 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-trash:before {
content: "\e626";
}
.icon-history:before {
content: "\e623";
}
.icon-reference:before {
content: "\e621";
}
.icon-bell:before {
content: "\e61c";
}
.icon-receive:before {
content: "\e625";
}
.icon-wrench:before {
content: "\e61d";
}
.icon-download:before {
content: "\e61e";
}
.icon-upload:before {
content: "\e61f";
}
.icon-power:before {
content: "\e620";
}
.icon-forward:before {
content: "\e624";
}
.icon-wallet:before {
content: "\e622";
}
.icon-compose:before {
content: "\e610";
}
.icon-contact:before {
content: "\e611";
}
.icon-email:before {
content: "\e612";
}
.icon-gear:before {
content: "\e613";
}
.icon-home:before {
content: "\e614";
}
.icon-locked:before {
content: "\e615";
}
.icon-paperplane:before {
content: "\e617";
}
.icon-people:before {
content: "\e618";
}
.icon-person:before {
content: "\e619";
}
.icon-pricetag:before {
content: "\e61a";
}
.icon-pricetags:before {
content: "\e61b";
}
.icon-bitcoin:before {
content: "\e60f";
}
.icon-usd:before {
content: "\e616";
}
.icon-arrow-left:before {
content: "\e600";
}

31
css/src/main.css
View File

@ -159,10 +159,12 @@ header .alt-currency {
.head .menu ul li a {
display: block;
padding: 5px 10px;
color: #8597A7;
}
.head .menu ul li a:hover {
background-color: #fff;
background-color: #F8F8FB;
color: #2C3E50;
}
.col1 {
@ -949,6 +951,7 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e
-moz-box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05);
box-shadow: inset 1px 1px 0px 0px rgba(0,0,0,0.05);
border: none;
padding-left: 45px;
}
button.secondary,
@ -1180,13 +1183,22 @@ button.gray:focus,
width: 38px;
height: 28px;
right: 7px;
top: 28px;
top: 7px;
-moz-box-shadow: none;
box-shadow: none;
line-height: 1.7rem;
border-radius: 2px;
}
.postfix.button i, .prefix.button i {
left: 12px;
top: 0;
border: none;
-moz-box-shadow: none;
box-shadow: none;
color: #fff;
}
label.postfix, span.postfix {
height: 40px;
border: none;
@ -1291,6 +1303,21 @@ a:hover .photo-container {
float: left;
}
.input { position: relative;}
.input i {
position: absolute;
top: 10px;
left: 10px;
font-size: 20px;
color: #7A8C9E;
border-right: 1px solid #ccc;
padding-right: 8px;
border-right: 1px solid #E5E8EB;
-moz-box-shadow: 1px 0px 0px 0px #FFFFFF;
box-shadow: 1px 0px 0px 0px #FFFFFF;
}
.icon-input {
font-size: 9px;
color: #fff;

BIN
font/icomoon.eot
View File

Binary file not shown.

24
font/icomoon.svg
View File

@ -22,4 +22,28 @@
<glyph unicode="&#xe60c;" d="M737.229 80.998c13.722-13.875 13.722-36.25 0-50.125s-35.891-13.875-49.613 0l-400.896 404.838c-13.722 13.875-13.722 36.301 0 50.125l400.896 404.89c13.722 13.875 35.891 13.875 49.613 0s13.722-36.25 0-50.125l-365.568-379.802 365.568-379.802z" />
<glyph unicode="&#xe60d;" d="M132.198 686.029c-13.875 13.722-36.301 13.722-50.125 0-13.824-13.67-13.824-35.891 0-49.613l404.89-400.896c13.875-13.722 36.25-13.722 50.125 0l404.89 400.896c13.824 13.722 13.875 35.891 0 49.613s-36.352 13.722-50.125 0.051l-379.853-365.619-379.802 365.568z" />
<glyph unicode="&#xe60e;" d="M891.802 235.571c13.875-13.722 36.301-13.722 50.125 0 13.875 13.722 13.875 35.891 0 49.613l-404.89 400.896c-13.824 13.722-36.25 13.722-50.074 0l-404.89-400.896c-13.824-13.722-13.875-35.891 0-49.613s36.25-13.722 50.125 0l379.802 365.619 379.802-365.619z" />
<glyph unicode="&#xe60f;" d="M608.709 896.169c-247.797 0-448.675-200.878-448.675-448.677 0-247.797 200.878-448.677 448.675-448.677 247.801 0 448.681 200.88 448.681 448.677s-200.88 448.677-448.681 448.677zM774.541 424.301c-4.999 11.495-12.695 21.591-28.087 30.087-8.198 4.496-16.095 7.796-25.391 9.996 5.397 2.498 9.996 5.397 16.294 10.994 7.497 6.599 13.095 15.696 15.594 23.29 2.601 7.497 4.099 17.993 3.5 28.19-1.102 16.794-4.4 33.085-13.196 44.781s-21.191 20.692-37.582 26.992c-12.595 4.797-25.49 7.796-45.482 8.894v63.875h-39.986v-63.973h-31.987v63.973h-40.985v-63.973h-87.065v-47.981h27.892c8.697 0 14.591-0.8 17.591-2.3 3.1-1.498 5.3-3.497 6.499-5.996 1.3-2.498 1.9-8.397 1.9-17.493v-173.131c0-8.995-0.601-14.796-1.9-17.393-1.3-2.601-2.002-4.9-5.098-6.297-3.097-1.401-3.199-1.3-11.796-1.3h-26.39l-8.697-47.981h86.967v-63.973h40.985v63.973h31.987v-63.973h39.984v64.372c25.99 1.3 44.482 4.699 59.375 10.297 19.293 7.197 34.086 17.694 44.683 31.489s14.893 34.885 15.793 51.179c0.701 14.494-0.9 33.187-5.397 43.383v0zM588.115 553.447h31.987v-73.969h-31.987v73.969zM588.115 431.498h31.987v-89.963h-31.987v89.963zM660.086 549.549c5.996-2.498 9.895-7.497 13.794-12.694 4.298-5.697 6.497-13.295 6.497-21.392 0-7.796-2.899-14.494-7.497-20.492-3.799-4.897-6.799-8.297-12.794-11.094v65.673zM688.875 362.925c-7.796-6.896-12.298-10.097-22.091-13.794-2.002-0.8-4.699-1.399-6.697-1.898v82.764c4.999-0.8 7.598-1.797 11.293-3.398 7.798-3.298 15.194-6.896 19.793-13.194s7.997-15.594 7.997-24.69c0-10.896-2.8-19.19-10.297-25.79v0z" horiz-adv-x="1215" />
<glyph unicode="&#xe610;" d="M416 416.6v-64.6h64.399l360.2 360-64.8 64.6zM888.401 799.4l-25 25c-5.4 4.8-12.401 7.601-20 7.601s-14.6-3-19.8-7.601l-24.2-24.399 0.2-0.2 22.4-22.6 42.001-42.001 24.401 24.399c4.8 5.201 7.599 12.2 7.599 19.8 0.2 7.599-2.799 14.6-7.599 20zM511 320h-127v127.2l256 256h-0.6l0.8 0.8h-480.2v-576h608v444.399l0.2 5z" />
<glyph unicode="&#xe611;" d="M512 864c-229.8 0-416-186.2-416-416s186.2-416 416-416c229.8 0 416 186.2 416 416s-186.2 416-416 416zM512 66.6c-117.2 0-222.2 53.2-292.2 136.6 35.6 15.4 124.4 47.4 180.6 63.8 4.4 1.4 5.2 1.6 5.2 21.4 0 21.2-2.4 36.2-7.6 47.2-7 15-15.4 40.4-18.4 63.2-8.4 9.8-19.8 29-27.2 65.8-6.4 32.4-3.4 44.2 0.8 55.2 0.4 1.2 1 2.4 1.2 3.6 1.6 7.4-0.6 47-6.2 77.6-3.8 21 1 65.6 30 102.6 18.2 23.4 53.2 52 116 56h35c63.8-4 98.8-32.6 117-56 29-37 33.8-81.6 29.8-102.6-5.6-30.6-7.8-70-6.2-77.6 0.2-1.2 0.8-2.4 1.2-3.4 4.2-11 7.4-22.8 0.8-55.2-7.4-36.8-18.8-56-27.2-65.8-3-22.8-11.4-48-18.4-63.2-6.6-13.8-13.2-30.2-13.2-46.6 0-19.8 0.8-20 5.4-21.4 53.4-15.8 145.4-47.6 186-64.2-70-83.6-175-137-292.4-137z" />
<glyph unicode="&#xe612;" d="M896 192v484.4l-262.2-199.6 136.2-154.8-4-4-157.8 139.2-96.2-73.2-96.2 73.2-157.8-139.2-4 4 136 154.8-262 199.2v-484zM879.4 704h-735.4l368-279.8z" />
<glyph unicode="&#xe613;" d="M817 527h-30.4c-24.8 0-45.6 21.4-45.6 46.8 0 12.8 5.4 24.4 15 33l19.6 19.2c19.4 19.2 19.4 50.6 0 69.8l-44.6 44.2c-8.8 8.8-21.8 14-35 14s-26-5.2-35-14l-18.8-18.8c-9-10-21-15.4-34-15.4-25.6 0-47 20.8-47 45.4v30.6c0 27-21.8 50.2-49 50.2h-60.8c-27.2 0-48.8-23-48.8-50.2v-30.4c0-24.6-21.4-45.4-47-45.4-12.8 0-24.6 5.4-33.2 14.8l-19.4 19.2c-8.8 9-21.8 14-35 14s-26-5.2-35-14l-45-44c-19.2-19.2-19.2-50.6 0-69.6l18.8-18.8c10-9 15.6-21 15.6-33.8 0-25.6-20.8-46.8-45.6-46.8h-30.4c-27.4 0-50.4-21.4-50.4-48.6v-60.8c0-27 23-48.6 50.4-48.6h30.4c24.8 0 45.6-21.4 45.6-46.8 0-12.8-5.6-24.8-15.6-33.8l-18.8-18.6c-19.2-19.2-19.2-50.6 0-69.6l44.6-44.4c8.8-9 21.8-14 35-14s26 5.2 35 14l19.4 19.2c8.4 9.4 20.4 14.8 33.2 14.8 25.6 0 47-20.8 47-45.4v-30.4c0-27 21.6-50.2 49-50.2h60.8c27.2 0 48.8 23 48.8 50.2v30.4c0 24.6 21.4 45.4 47 45.4 12.8 0 24.8-5.6 34-15.4l18.8-18.8c9-8.8 21.8-14 35-14s26 5.2 35 14l44.6 44.4c19.2 19.2 19.2 50.6 0 69.8l-19.6 19.2c-9.6 8.6-15 20.4-15 33 0 25.6 20.8 46.8 45.6 46.8h30.4c27.2 0 46.6 21.4 46.6 48.6v61c0.4 27.2-19 48.6-46.2 48.6zM641.6 448v0c0-88.2-71.4-160-160-160s-160 71.8-160 160v0 0c0 88.2 71.4 160 160 160s160-71.8 160-160v0z" horiz-adv-x="960" />
<glyph unicode="&#xe614;" d="M480 736l-320-256v-416h224v256h192v-256h224v416l-320 256zM480 832l-192-153.6v89.6h-128v-191.998l-64-51.2v-40.982l384 307.2 384-307.2v40.982l-384 307.198z" horiz-adv-x="960" />
<glyph unicode="&#xe615;" d="M448 352c-17.6 0-32-14.4-32-32s14.4-32 32-32 32 14.4 32 32-14.4 32-32 32zM656 512v144c0 114.8-93.2 208-208 208-115 0-208-93.2-208-208v-144h-112v-480h640v480h-112zM464 258v-82c0-8.8-7.2-16-16-16s-16 7.2-16 16v82c-27.6 7.2-48 32.2-48 62 0 35.4 28.6 64 64 64s64-28.6 64-64c0-29.8-20.4-54.8-48-62zM624 512h-352v144c0 97 79 176 176 176s176-79 176-176v-144z" horiz-adv-x="896" />
<glyph unicode="&#xe616;" d="M543.838 574.891c-4.544-6.103-6.807-13.725-6.807-22.88 0-12.883 4.26-22.965 12.794-30.248 8.193-7.011 18.847-12.35 31.914-16.065v90.843c-7.513-1.551-14.45-3.912-20.752-7.162-6.897-3.559-12.613-8.387-17.15-14.487zM670.987 422.366c-8.255 2.837-17.335 5.577-27.207 8.237v-106.354c5.488 0.791 10.578 1.884 15.221 3.305 10.523 3.219 19.057 7.372 25.592 12.454s11.25 10.93 14.154 17.541c2.902 6.608 4.353 13.299 4.353 20.086 0 13.894-3.362 24.146-10.068 30.758-6.72 6.604-14.077 11.258-22.047 13.976zM608.184 896.431c-248.055 0-449.145-201.090-449.145-449.145s201.090-449.145 449.145-449.145c248.055 0 449.145 201.090 449.145 449.145s-201.090 449.145-449.145 449.145v0zM757.83 332.62c-8.9-14.415-20.604-26.202-35.122-35.354-14.522-9.151-31.034-15.878-49.547-20.111-9.691-2.221-19.487-3.857-29.379-4.937v-31.808h-62.043v32.505c-9.54 1.23-18.821 2.975-27.822 5.311-19.606 5.083-36.678 12.61-51.189 23.122-14.525 10.503-26.139 23.45-34.846 39.89-8.342 15.721-12.849 37.041-13.539 54.276h68.023c0.332-10.341 2.855-22.514 7.585-31.655 5.078-9.835 12.154-16.832 21.233-23.095 8.865-6.135 19.066-10.622 30.548-13.507v118.425c-8.396 2.072-17.289 4.29-26.74 6.68-16.704 4.068-30.582 9.405-41.654 16.013-11.078 6.611-19.875 13.983-26.406 22.118-6.535 8.131-11.162 16.775-13.884 25.926-2.725 9.156-4.086 18.469-4.086 27.964 0 18.302 4.086 34.141 12.257 47.535 8.161 13.384 18.963 24.486 32.392 33.303 13.425 8.811 28.674 15.331 45.737 19.573 7.425 1.841 14.888 3.259 22.384 4.303v32.498h62.043v-32.739c8.479-1.217 16.736-2.888 24.746-5.077 17.976-4.918 33.767-12.281 47.372-22.107 13.614-9.838 24.414-21.936 32.402-36.337 7.267-13.136 11.227-27.822 11.872-45.056h-68.474c-2.596 20.679-10.943 35.591-25.071 44.542-6.777 4.296-14.43 7.571-22.848 9.952v-104.671c8.922-2.202 17.749-4.371 26.38-6.473 11.792-2.882 20.232-5.008 25.321-6.354 12.705-3.734 23.772-8.818 33.216-15.251 9.434-6.443 17.331-13.816 23.69-22.118 6.346-8.31 11.064-17.207 14.156-26.692 3.078-9.489 4.628-18.993 4.628-28.478 0.005-20.332-4.45-37.713-13.338-52.115v0z" horiz-adv-x="1215" />
<glyph unicode="&#xe617;" d="M107.021 461.639l225.898-99.523 456.058 426.862zM788.979 788.979l-422.174-459.681 110.604-222.275z" horiz-adv-x="896" />
<glyph unicode="&#xe618;" d="M704.413 285.316c23.329-8.052-23.123 8.052 0 0v0zM704.413 285.316c-27.871 9.703-58.013 10.323-85.884 20.026-8.465 2.89-25.187 6.4-28.697 16.103-3.303 9.497-3.303 20.645-3.923 30.555-0.413 7.845-0.619 15.69-0.619 23.535 0 5.161 13.213 16.103 16.103 20.852 11.148 18.581 12.181 43.561 14.245 64.619 17.961-4.955 20.232 28.284 23.329 38.4 2.271 7.019 16.103 55.329-5.368 48.723 5.161 9.084 7.226 20.232 8.671 30.348 4.129 26.426 5.781 55.329-2.271 81.135-16.723 53.677-68.129 83.819-122.426 85.471-55.123 1.858-110.452-24.568-131.097-78.039-9.91-26.013-9.084-54.297-5.781-81.548 1.445-12.387 3.51-26.219 9.703-37.368-20.026 5.987-9.29-36.542-7.019-43.974 3.303-10.529 6.194-48.31 24.981-43.148 1.652-16.723 3.51-33.858 8.052-50.168 3.097-10.942 9.497-20.232 16.929-28.697 3.716-4.129 5.574-4.542 5.368-9.91-0.206-16.103 0.206-33.445-3.923-49.135s-38.606-22.297-52.439-25.187c-37.161-7.639-71.432-11.148-102.4-34.271-36.129-26.632-54.916-68.129-54.916-112.929 171.974 0 343.948 0 515.923 0 19.406 0 38.606 0 58.013 0 0 60.903-36.748 114.581-94.555 134.606zM279.329 310.71c1.239 0.619 2.477 1.239 3.303 1.652-0.619-0.206-1.239-0.619-1.652-0.826-0.619-0.206-1.032-0.413-1.652-0.826zM279.329 310.71c-7.019-3.51-15.484-7.845 1.652 0.826 6.194 3.097 4.955 2.477 1.652 0.826 14.039 6.606 29.11 8.258 44.181 9.703 5.781 0.619 8.465 4.542 4.129 10.116-8.258 10.529-36.748 12.594-48.723 17.342-7.432 2.89-9.497 5.574-10.116 13.832-0.206 3.716-2.271 20.232 0.619 22.916 2.065 2.065 15.071 1.239 17.961 1.652 11.768 1.445 23.742 3.923 34.89 8.258 4.748 1.858 9.29 4.129 13.419 7.019 4.955 3.716-3.716 12.8-5.987 17.755-7.019 15.484-10.116 32.413-11.148 49.342-2.065 33.239 3.097 66.684-3.097 99.716-9.29 50.581-48.31 75.974-98.065 75.974-30.761 0-61.11-10.529-78.245-37.368-18.994-29.523-17.961-66.271-16.929-99.923 0.619-19.2 1.445-38.606-1.239-57.806-1.239-8.258-3.097-16.31-5.987-24.155-2.271-5.987-13.832-20.852-9.29-23.948 17.135-12.181 46.039-16.31 66.684-14.658 0.619-10.116 2.477-23.123-1.239-32.619-5.781-14.865-48.929-18.787-61.935-23.123-36.129-11.974-62.968-41.29-62.968-82.581 37.781 0 75.355 0 113.135 0 16.929 0 33.858 0 50.994 0 2.684 0 13.006 19.2 15.897 22.297 14.039 15.484 31.174 28.903 49.755 38.606zM911.071 332.594c-16.723 5.368-48.929 7.019-60.903 21.471-5.987 7.226-2.684 25.6-2.065 34.271 9.084-0.826 18.994 0.619 28.284 1.858 8.465 1.239 16.723 2.89 24.774 5.781 3.716 1.445 7.432 2.89 10.942 4.955 8.052 4.748 4.335 5.574 0.206 12.594-22.503 37.781-12.387 85.677-13.419 127.174-0.826 34.477-9.91 72.258-41.29 91.665-28.284 17.548-70.194 18.168-100.542 5.781-87.535-35.097-35.923-151.123-65.858-217.6-5.161-11.148-12.594-15.071 0.413-21.677 7.226-3.716 15.071-6.194 22.916-8.052 11.974-2.89 24.361-4.542 36.748-4.955 2.065 0 0.619-26.013 0-28.697-2.271-10.116-24.361-13.006-32.619-15.277-8.465-2.271-22.503-2.89-26.632-11.768-6.194-13.213 20.439-9.91 27.045-11.148 21.265-3.923 40.052-15.69 56.568-29.11 12.387-10.116 29.11-23.742 33.652-40.258 55.123 0 110.452 0 165.574 0-0.413 41.497-27.458 71.019-63.794 82.994z" />
<glyph unicode="&#xe619;" d="M676.669 218.053c-27.491 9.803-66.917 13.213-92.064 18.754-14.492 3.197-35.589 11.295-42.622 19.607-7.033 8.524-2.771 87.163-2.771 87.163s13 20.458 20.032 38.36 14.705 66.917 14.705 66.917 14.492 0 19.607 25.361c5.541 27.705 14.066 39.212 13 59.884-1.065 19.18-11.081 20.246-12.148 20.246v0c0 0 10.442 28.983 11.934 90.359 1.705 72.671-53.917 144.277-158.342 144.277s-159.834-71.392-158.342-144.063c1.279-61.163 11.934-90.359 11.934-90.359v0c-1.065 0-11.081-1.065-12.148-20.246-1.065-20.672 7.672-31.753 13-59.458 5.115-25.361 19.607-25.573 19.607-25.573s7.672-49.228 14.705-67.13c7.033-18.114 20.032-38.36 20.032-38.36s4.262-78.638-2.771-87.163c-7.033-8.524-28.131-16.41-42.622-19.607-25.361-5.541-64.573-9.163-92.064-18.967s-112.31-42.836-112.31-111.031h681.956c0 68.196-84.819 101.228-112.31 111.031z" horiz-adv-x="896" />
<glyph unicode="&#xe61a;" d="M384 640c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 35.346 28.654 64 64 64s64-28.654 64-64zM877.6 381.2l-408 427.6c-15.2 15.2-35.2 23-55 23.2h-223c-35.2 0-63.6-28.4-63.6-63.6v-216.2c0-21.6 8.6-41 22.6-55.4l428-414.4c12.2-12.2 28.6-18.4 45-18.4 16.2 0 32.6 6 45 18.4l209 208.8c12.4 12.4 18.4 28.6 18.4 45s-6.2 32.8-18.4 45zM320 544c-53 0-96 43-96 96s43 96 96 96 96-43 96-96-43-96-96-96z" />
<glyph unicode="&#xe61b;" d="M928 832v-274.754l-473.694-532.206 25.694-25.040 480 544v288zM576 896l-512-576 320-320 46.942 47.808 22.696 22.75 442.362 505.442v320h-320zM704 640c-35.29 0-64 28.71-64 64s28.71 64 64 64 64-28.71 64-64-28.71-64-64-64zM736 704c0-17.673-14.327-32-32-32s-32 14.327-32 32c0 17.673 14.327 32 32 32s32-14.327 32-32z" />
<glyph unicode="&#xe61c;" d="M963.318 194.875c0 253.125-225 196.875-225 393.75 0 16.313-1.571 30.252-4.437 42.125-14.792 99.332-80.996 179.051-166.792 203.344 0.761 3.47 1.161 7.059 1.161 10.732 0 29.248-25.313 53.176-56.25 53.176s-56.25-23.927-56.25-53.174c0-3.674 0.401-7.264 1.16-10.732-96.214-27.245-167.796-124.188-169.852-240.33-0.036-1.688-0.058-3.397-0.058-5.138 0-196.877-225-140.627-225-393.752 0-66.996 149.933-123.043 350.657-137.18 18.918-35.512 56.3-59.695 99.343-59.695s80.427 24.184 99.343 59.695c200.724 14.137 350.657 70.184 350.657 137.18 0 0.201-0.023 0.401-0.024 0.599l1.343-0.599zM788.193 147.33c-47.663-12.718-103.85-21.863-164.152-26.936-5.013 57.496-53.246 102.607-112.042 102.607s-107.028-45.111-112.042-102.607c-60.3 5.073-116.488 14.219-164.152 26.936-65.593 17.502-96.952 37.081-108.428 47.545 11.477 10.464 42.836 30.043 108.428 47.545 76.265 20.348 174.351 31.556 276.193 31.556s199.928-11.208 276.193-31.556c65.593-17.502 96.952-37.081 108.428-47.545-11.477-10.464-42.836-30.043-108.428-47.545z" />
<glyph unicode="&#xe61d;" d="M916.517 195.965l-379.483 325.272c17.672 33.204 27.7 71.093 27.7 111.332 0 131.060-106.245 237.305-237.305 237.305-23.973 0-47.108-3.569-68.922-10.179l137.102-137.102c20.509-20.509 20.509-54.069 0-74.578l-83.625-83.625c-20.509-20.509-54.069-20.509-74.578 0l-137.102 137.102c-6.61-21.814-10.179-44.95-10.179-68.922 0-131.060 106.245-237.305 237.305-237.305 40.238 0 78.127 10.028 111.332 27.702l325.272-379.483c18.876-22.020 51.099-23.258 71.607-2.75l83.627 83.627c20.507 20.508 19.269 52.729-2.75 71.605z" />
<glyph unicode="&#xe61e;" d="M849.5 448h-140.625l-196.875-196.875-196.875 196.875h-140.625l-112.5-225v-56.25h900v56.25l-112.5 225zM62 110.5h900v-56.25h-900v56.25zM568.25 616.75v225h-112.5v-225h-196.875l253.125-253.125 253.125 253.125h-196.875z" />
<glyph unicode="&#xe61f;" d="M62 110.5h900v-56.25h-900zM962 223v-56.25h-900v56.25l112.5 225h225v-112.5h225v112.5h225zM258.875 616.75l253.125 253.125 253.125-253.125h-196.875v-225h-112.5v225z" />
<glyph unicode="&#xe620;" d="M905.75 448c0-217.463-176.287-393.75-393.75-393.75s-393.75 176.287-393.75 393.75c0 95.85 34.481 183.459 91.406 251.719 4.331 7.987 10.35 14.934 17.859 19.969 1.266 1.322 2.391 2.813 3.684 4.106 0.028-0.647 0.309-1.266 0.366-1.913 8.128 4.556 17.353 7.369 27.309 7.369 31.050 0 56.25-25.2 56.25-56.25 0-19.575-9.984-36.788-25.172-46.856 0.984-0.731 1.688-1.631 2.7-2.362-38.672-48.15-61.903-109.209-61.903-175.781 0-155.334 125.916-281.25 281.25-281.25s281.25 125.916 281.25 281.25c0 66.572-23.231 127.631-61.903 175.781 1.013 0.731 1.744 1.631 2.7 2.362-15.188 10.069-25.172 27.281-25.172 46.856 0 31.050 25.2 56.25 56.25 56.25 9.956 0 19.181-2.813 27.309-7.369 0.056 0.647 0.337 1.266 0.394 1.912 1.266-1.294 2.391-2.784 3.684-4.106 7.509-5.034 13.5-11.981 17.859-19.969 56.869-68.259 91.378-155.869 91.378-251.719zM540.125 391.75h-56.25c-15.553 0-28.125 12.572-28.125 28.125v393.75c0 15.525 12.572 28.125 28.125 28.125h56.25c15.553 0 28.125-12.6 28.125-28.125v-393.75c0-15.553-12.572-28.125-28.125-28.125z" />
<glyph unicode="&#xe621;" d="M967.426 817.194h-708.675c-49.276 0-89.219-28.363-89.219-63.353v-612.388c0-34.988 39.944-63.354 89.219-63.354h708.675c49.274 0 89.22 28.366 89.22 63.354v612.388c0 34.99-39.946 63.353-89.22 63.353v0zM366.915 360.308h337.68v-47.123h-337.68v47.123zM366.915 468.077h517.298v-47.123h-517.298v47.123zM366.915 575.849h517.298v-47.123h-517.298v47.123z" horiz-adv-x="1226" />
<glyph unicode="&#xe622;" d="M974.43 671.263h-17.742v104.383c0 24.103-19.539 43.643-43.645 43.643h-701.727c-24.104 0-43.645-19.539-43.645-43.643v-558.921c0-0.852 0.079-1.68 0.129-2.52-0.065-0.804-0.129-1.606-0.129-2.427v-100.461c0-19.666 15.941-35.608 35.608-35.608h669.771c19.665 0 35.606 15.941 35.606 35.608v31.445h-656.747c-8.273 0-14.977 6.705-14.977 14.977s6.705 14.977 14.977 14.977l661.131 0.363c24.104 0 43.645 19.537 43.645 43.644v68.961h6.393c49.225 0 89.271 40.047 89.271 89.271v218.382c0 42.965-34.955 77.92-77.923 77.92v0zM302.319 268.944c0-5.916-4.796-10.711-10.711-10.711s-10.711 4.793-10.711 10.711v482.019c0 5.913 4.796 10.711 10.711 10.711s10.711-4.796 10.711-10.711v-482.019zM1011.653 374.959c0-26.781-21.789-48.572-48.572-48.572h-6.393v51.273c0 23.366-18.943 42.309-42.309 42.309h-149.381c-46.556 0-84.299 37.743-84.299 84.299v42.042c0 46.556 37.743 84.299 84.299 84.299l209.432-0.046c20.525 0 37.223-16.697 37.223-37.221v-218.382z" horiz-adv-x="1218" />
<glyph unicode="&#xe623;" d="M825.441 494.573l-32.207 121.065c-0.048 1.094-0.157 2.169-0.288 3.236v43.967c0 14.829-7.431 27.95-18.754 35.865v35.201c0 14.79-7.673 27.809-19.23 35.333v30.457c0 23.248-18.914 42.164-42.161 42.164h-489.073c-23.248 0-42.164-18.914-42.164-42.164v-30.253c-11.738-7.495-19.557-20.604-19.557-35.534v-33.671c-12.626-7.676-21.076-21.562-21.076-37.389v-34.732l-34.334-133.535c-0.205-1.21-0.336-2.446-0.336-3.713v-414.179c0-12.258 10.031-22.285 22.285-22.285h674.942c12.257 0 22.285 10.029 22.285 22.285v414.179c0 1.267-0.133 2.505-0.336 3.713v0zM221.319 799.687c0 1.282 1.127 2.414 2.411 2.414h489.073c1.282 0 2.411-1.127 2.411-2.414v-23.625h-493.893v23.625zM201.757 733.899c0 1.287 1.127 2.414 2.414 2.414h527.858c1.286 0 2.411-1.127 2.411-2.414v-27.339h-532.685v27.339zM690.197 391.773c0-17.721-14.497-32.221-32.221-32.221h-383.914c-17.721 0-32.221 14.501-32.221 32.221s14.501 32.218 32.221 32.218h383.914c17.723 0 32.221-14.497 32.221-32.218v0zM179.745 667.202h573.732v-159.040h-573.732v159.040z" horiz-adv-x="934" />
<glyph unicode="&#xe624;" d="M449.248 577.472v318.528l-449.248-448 449.248-448v321.344c228.32 0 453.664-39.744 574.752-228.352-12.608 343.712-269.76 425.536-574.752 484.48z" />
<glyph unicode="&#xe625;" d="M680.75 729.25h-337.5l-281.25-337.5v-225.001c0-31.066 25.184-56.25 56.25-56.25h787.5c31.068 0 56.25 25.184 56.25 56.25v225.001l-281.25 337.5zM737.001 391.75l-112.5-112.5h-225.001l-112.5 112.5h-151.778l234.374 281.25h284.807l234.374-281.25h-151.778z" />
<glyph unicode="&#xe626;" d="M362.451 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.614q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.614q7.572 0 12.44 4.868t4.868 12.44zM500.913 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.615q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.615q7.572 0 12.44 4.868t4.868 12.44zM639.374 188.385v380.769q0 7.572-4.868 12.44t-12.44 4.868h-34.615q-7.572 0-12.44-4.868t-4.868-12.44v-380.769q0-7.572 4.868-12.44t12.44-4.868h34.615q7.572 0 12.44 4.868t4.868 12.44zM345.143 724.923h242.307l-25.962 63.281q-3.787 4.868-9.194 5.95h-171.455q-5.408-1.082-9.194-5.95zM847.067 707.615v-34.615q0-7.572-4.868-12.44t-12.44-4.868h-51.923v-512.739q0-44.892-25.42-77.615t-61.117-32.722h-450q-35.697 0-61.117 31.641t-25.42 76.533v514.904h-51.923q-7.572 0-12.44 4.868t-4.868 12.44v34.615q0 7.572 4.868 12.44t12.44 4.868h167.126l37.861 90.325q8.112 20.012 29.207 34.074t42.728 14.063h173.077q21.635 0 42.728-14.063t29.207-34.074l37.861-90.325h167.126q7.572 0 12.44-4.868t4.868-12.44z" horiz-adv-x="933" />
</font></defs></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
font/icomoon.ttf
View File

Binary file not shown.

BIN
font/icomoon.woff
View File

Binary file not shown.

10
js/controllers/sidebar.js
View File

@ -4,23 +4,23 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
$scope.menu = [{
'title': 'Home',
'icon': 'fi-home',
'icon': 'icon-home',
'link': 'homeWallet'
}, {
'title': 'Receive',
'icon': 'fi-download',
'icon': 'icon-receive',
'link': 'receive'
}, {
'title': 'Send',
'icon': 'fi-arrow-right',
'icon': 'icon-paperplane',
'link': 'send'
}, {
'title': 'History',
'icon': 'fi-clipboard-pencil',
'icon': 'icon-history',
'link': 'history'
}, {
'title': 'Settings',
'icon': 'fi-widget',
'icon': 'icon-gear',
'link': 'more'
}];

5
views/create.html
View File

@ -21,7 +21,10 @@
<div class="large-12 columns">
<div class="panel">
<label><span translate>Wallet name</span>
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" auto-focus>
<div class="input">
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" auto-focus>
<i class="icon-wallet"></i>
</div>
</label>
<div class="row">
<div class="large-6 medium-6 columns">

60
views/createProfile.html
View File

@ -28,27 +28,31 @@
</span>
</div>
<form name="profileForm" ng-submit="createProfile(profileForm)" novalidate>
<div class="row collapse">
<div class="small-12 columns">
<label class="left" for="insightLivenet">Email</label>
<span translate class="has-error right size-12" ng-show="profileForm.email.$invalid &&
!profileForm.email.$pristine || error">
<span class="icon-input"><i class="fi-x"></i></span>
Not valid
</span>
<span class="icon-input right" ng-show="!profileForm.email.$invalid &&
!profileForm.email.$pristine || error"><i class="fi-check"></i></span>
<input type="email" ng-model="email" class="form-control fi-email"
name="email" placeholder="Email" required auto-focus>
</div>
<div class="row">
<label class="left" for="insightLivenet">Email</label>
<span translate class="has-error right size-12" ng-show="profileForm.email.$invalid &&
!profileForm.email.$pristine || error">
<span class="icon-input"><i class="fi-x"></i></span>
Not valid
</span>
<span class="icon-input right" ng-show="!profileForm.email.$invalid &&
!profileForm.email.$pristine || error"><i class="fi-check"></i></span>
</div>
<div class="input">
<input type="email" ng-model="email" class="form-control fi-email"
name="email" placeholder="Email" required auto-focus>
<i class="icon-email"></i>
</div>
<label class="left" for="insightLivenet">Password</label>
<input id="password" type="password" ng-model="$parent.password"
class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength"
tooltip-html-unsafe="Password strength: <i>{{passwordStrength}}</i><br/><span class='size-12'>Tip: Use lower and uppercase, numbers and symbols</span>" tooltip-trigger="focus" required tooltip-placement="right">
<div class="pr">
<label for="insightLivenet">Password</label>
<div class="input">
<input id="password" type="password" ng-model="$parent.password"
class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength"
tooltip-html-unsafe="Password strength: <b>{{passwordStrength}}</b><br/><span class='size-12'>Tip: Use lower and uppercase, numbers and symbols</span>" tooltip-trigger="focus" required tooltip-placement="right">
<i class="icon-locked"></i>
</div>
<div class="row">
<label class="left" for="insightLivenet">Confirm Password</label>
<span translate class="has-error right size-12" ng-show="profileForm.repeatpassword.$dirty &&
profileForm.repeatpassword.$invalid">
@ -56,12 +60,16 @@
{{'Passwords must match'|translate}}
</span>
<span class="icon-input right" ng-show="profileForm.repeatpassword.$dirty &&
!profileForm.repeatpassword.$invalid"><i class="fi-check"></i></span>
<input type="password" ng-model="repeatpassword"
class="columns form-control" name="repeatpassword"
placeholder="{{'Repeat password'|translate}}"
match="password" required >
!profileForm.repeatpassword.$invalid"><i class="fi-check"></i></span>
</div>
<div class="input">
<input type="password" ng-model="repeatpassword"
class="input form-control" name="repeatpassword"
placeholder="{{'Repeat password'|translate}}"
match="password" required>
<i class="icon-locked"></i>
</div>
<button translate type="submit" class="button primary radius expand m0"
ng-disabled="profileForm.$invalid || loading">
Create
@ -70,13 +78,13 @@
<div class="box-setup-footer">
<div class="left">
<a class="text-gray" href="#!/">
<i class="fi-arrow-left"></i>
<i class="icon-arrow-left4"></i>
<span translate>Back</span>
</a>
</div>
<div class="right">
<a class="right size-12 text-gray" href="#!/settings">
<i class="fi-wrench"></i>
<i class="icon-wrench"></i>
<span translate>Settings</span>
</a>
</div>

17
views/home.html
View File

@ -56,11 +56,16 @@
<i class="fi-x"></i>
{{error|translate}}
</p>
<input type="email" ng-model="email" class="form-control"
name="email" placeholder="Email" required auto-focus>
<div class="input">
<input type="email" ng-model="email" class="form-control"
name="email" placeholder="Email" required auto-focus>
<i class="icon-email"></i>
</div>
<div class="input">
<input type="password" ng-model="password" class="form-control"
name="password" placeholder="Password" required>
<i class="icon-locked"></i>
</div>
<button translate type="submit" class="button primary radius expand m0"
ng-disabled="loginForm.$invalid || loading">
@ -70,19 +75,19 @@
<div class="box-setup-footer">
<div class="left m10r">
<a class="button-setup text-gray" href="#!/createProfile">
<i class="fi-torso"></i>
<i class="icon-person"></i>
<span translate>Create a profile</span>
</a>
</div>
<div class="left">
<a class="button-setup text-gray" href="#!/importProfile">
<i class="fi-upload"></i>
<i class="icon-upload"></i>
<span translate>Import a profile</span>
</a>
</div>
<div class="right m10t">
<a class="text-gray" href="#!/settings">
<i class="fi-wrench"></i>
<i class="icon-wrench"></i>
<span translate>Settings</span>
</a>
</div>

5
views/import.html
View File

@ -52,7 +52,10 @@
<label for="password"><span translate>Password</span> <small translate>Required</small>
</label>
<input type="password" class="form-control" placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<i class="icon-locked"></i>
</div>
<div class="line-dashed-h m10b m20t"></div>

9
views/importProfile.html
View File

@ -44,9 +44,10 @@
ng-model="backupText"
rows="5"></textarea>
</div>
<input type="password" class="form-control"
placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<div class="input">
<input type="password" class="form-control" placeholder="{{'Your wallet password'|translate}}" name="password" ng-model="password" required>
<i class="icon-locked"></i>
</div>
<button translate type="submit"
class="button primary radius expand m0"
@ -56,7 +57,7 @@
</form>
<div class="box-setup-footer">
<a class="text-gray" href="#!/">
<i class="fi-arrow-left"></i>
<i class="icon-arrow-left4"></i>
<span translate>Back</span>
</a>
</div>

24
views/includes/head.html
View File

@ -21,21 +21,21 @@
<img gravatar-src="'{{username}}'" gravatar-size="35">
</div>
<span class="m15t">{{username}} </span>
<i class="icon-arrow-down size-16 vm"></i>
<i class="icon-arrow-down2 size-16 vm"></i>
</a>
<ul ng-show="hoverMenu" ng-class="{'hover': hoverMenu}">
<ul ng-show="hoverMenu" class="size-16 text-gray" ng-class="{'hover': hoverMenu}">
<li>
<a class="text-gray size-16" href="#!/create" title="Create new wallet">
<i class="fi-plus m10r"></i> {{'Create new wallet'|translate}}</a></li>
<li><a class="text-gray size-16" href="#!/join" title="Join shared wallet">
<i class="fi-torsos-all m10r"></i> {{'Join shared wallet'|translate}}</a></li>
<li><a class="text-gray size-16" href="#!/import" title="Import wallet">
<i class="fi-download m10r"></i> {{'Import wallet'|translate}}</a></li>
<a href="#!/create" title="Create new wallet">
<i class="fi-plus size-18 m10r"></i> {{'Create new wallet'|translate}}</a></li>
<li><a href="#!/join" title="Join shared wallet">
<i class="icon-people size-18 m10r"></i> {{'Join shared wallet'|translate}}</a></li>
<li><a href="#!/import" title="Import wallet">
<i class="icon-download size-18 m10r"></i> {{'Import wallet'|translate}}</a></li>
<li class="divider"></li>
<li><a class="text-gray size-16" href="#!/profile" title="Profile">
<i class="fi-torso m10r"></i> {{'Profile'|translate}}</a></li>
<li><a class="text-gray size-16" href="#!/" title="Close" ng-click="signout()">
<i class="fi-power m10r"></i> {{'Close'|translate}}</a></li>
<li><a href="#!/profile" title="Profile">
<i class="icon-person size-18 m10r"></i> {{'Profile'|translate}}</a></li>
<li><a href="#!/" title="Close" ng-click="signout()">
<i class="icon-power size-18 m10r"></i> {{'Close'|translate}}</a></li>
</ul>
</div>

12
views/join.html
View File

@ -33,10 +33,11 @@
</span>
<small class="icon-input right" ng-show="joinForm.connectionId.$valid
&& !joinForm.connectionId.$pristine"><i class="fi-check"></i></small>
</div>
<div class="pr">
<input id="connectionId" type="text" class="columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
<div class="input">
<input id="connectionId" type="text" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
<i class="icon-wallet"></i>
<div ng-hide="showScanner || disableScanner">
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera">&nbsp;</i></a>
</div>
@ -48,9 +49,8 @@
<div id="scanner"
class="row"
ng-if="showScanner"
ng-include="'views/includes/scanner.html'"></div>
</div>
ng-include="'views/includes/scanner.html'">
</div>
<div class="line-dashed-h"></div>

31
views/modals/address-book.html
View File

@ -1,21 +1,28 @@
<h2 translate>Address Book</h2>
<form class="m0" name="addressBookForm" ng-submit="submitAddressBook(addressBookForm)" novalidate>
<label for="newaddress" class="left"><span translate>Address</span>
<small translate ng-hide="!addressBookForm.newaddress.$pristine || newaddress">Required</small>
</label>
<span translate class="has-error right size-12" ng-show="addressBookForm.newaddress.$invalid && newaddress">
<span class="icon-input"><i class="fi-x"></i></span>
Not valid
</span>
<small class="icon-input right" ng-show="!addressBookForm.newaddress.$invalid && newaddress"><i class="fi-check"></i></small>
<input type="text" id="newaddress" name="newaddress" ng-disabled="loading"
<div class="row collapse">
<label for="newaddress" class="left"><span translate>Address</span>
<small translate ng-hide="!addressBookForm.newaddress.$pristine || newaddress">Required</small>
</label>
<span translate class="has-error right size-12" ng-show="addressBookForm.newaddress.$invalid && newaddress">
<span class="icon-input"><i class="fi-x"></i></span>
Not valid
</span>
<small class="icon-input right" ng-show="!addressBookForm.newaddress.$invalid && newaddress"><i class="fi-check"></i></small>
</div>
<div class="input">
<input type="text" id="newaddress" name="newaddress" ng-disabled="loading"
placeholder="{{'Address'|translate}}" ng-model="newaddress" valid-address required>
<i class="fi-address-book"></i>
</div>
<label for="newlabel"><span translate>Label</span>
<small translate ng-hide="!addressBookForm.newlabel.$pristine || newlabel">Required</small>
<input type="text" id="newlabel" name="newlabel" ng-disabled="loading"
placeholder="{{'Label'|translate}}" ng-model="newlabel" required>
<div class="input">
<input type="text" id="newlabel" name="newlabel" ng-disabled="loading"
placeholder="{{'Label'|translate}}" ng-model="newlabel" required>
<i class="icon-pricetag"></i>
</div>
</label>
<a translate class="m0 button warning small default" ng-click="cancel()">Cancel</a>
<input type="submit" class="m0 button small primary right"

69
views/send.html
View File

@ -48,25 +48,27 @@
Not valid
</span>
<small class="icon-input right" ng-show="!sendForm.address.$invalid && address"><i class="fi-check"></i></small>
<div class="pr">
<input class="columns" type="text" id="address" name="address" ng-disabled="loading || !!$root.merchant"
placeholder="{{'Bitcoin address'|translate}}" ng-model="address" ng-change="onChanged()" valid-address required>
<div ng-hide="showScanner || disableScanner">
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera size-24"></i></a>
</div>
<div ng-show="showScanner">
<a translate class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x size-18"></i></a>
</div>
</div>
<div id="scanner"
class="row"
ng-if="showScanner"
ng-include="'views/includes/scanner.html'"></div>
</div>
<div class="input">
<input type="text" id="address" name="address" ng-disabled="loading || !!$root.merchant"
placeholder="{{'Bitcoin address'|translate}}" ng-model="address" ng-change="onChanged()" valid-address required>
<i class="fi-address-book"></i>
<div ng-hide="showScanner || disableScanner">
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera size-24"></i></a>
</div>
<div ng-show="showScanner">
<a translate class="postfix button warning" ng-click="cancelScanner()"><i class="fi-x size-18"></i></a>
</div>
</div>
<div id="scanner"
class="row"
ng-if="showScanner"
ng-include="'views/includes/scanner.html'">
</div>
<div class="row">
<div class="large-6 medium-6 columns">
<div class="row collapse">
@ -80,20 +82,22 @@
<small class="icon-input right" ng-show="!sendForm.amount.$invalid &&
!sendForm.amount.$pristine"><i class="fi-check"></i></small>
<div class="pr">
<div class="small-9 columns">
<input type="number" id="amount"
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0)"
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
min="0.00000001" max="10000000000" valid-amount required
autocomplete="off">
<div class="input">
<input type="number" id="amount"
ng-disabled="loading || ($root.merchant && +$root.merchant.total > 0)"
name="amount" placeholder="{{'Amount'|translate}}" ng-model="amount"
min="0.00000001" max="10000000000" valid-amount required
autocomplete="off">
<i class="icon-bitcoin"></i>
</div>
<a class="small input-note" title="{{'Send all funds'|translate}}"
ng-show="topAmount && (!$root.merchant || +$root.merchant.total === 0)"
ng-click="setTopAmount(sendForm)">
<span translate>Use all funds</span> {{$root.wallet.settings.unitName}}
</a>
</div>
</div>
<div class="small-3 columns">
<span class="postfix">{{$root.wallet.settings.unitName}}</span>
</div>
@ -103,12 +107,12 @@
<div class="row collapse">
<label for="alternative"><span translate>Amount in</span> {{ alternativeName }} </label>
<div class="small-9 columns">
<input type="number" id="alternative_amount"
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0)"
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative"
required
autocomplete="off"
>
<div class="input">
<input type="number" id="alternative_amount"
ng-disabled="loading || !isRateAvailable || ($root.merchant && +$root.merchant.total > 0)"
name="alternative" placeholder="{{'Amount'|translate}}" ng-model="alternative"requiredautocomplete="off">
<i class="icon-usd"></i>
</div>
</div>
<div class="small-3 columns">
<span class="postfix">{{alternativeIsoCode}}</span>
@ -158,8 +162,11 @@
<small translate ng-hide="!sendForm.comment.$pristine">optional</small>
<small translate class="has-error" ng-show="sendForm.comment.$invalid && !sendForm.comment.$pristine">too long!</small>
</label>
<textarea id="comment" ng-disabled="loading"
<div class="input">
<textarea id="comment" ng-disabled="loading"
name="comment" placeholder="{{(wallet.isShared() ? 'Leave a private message to your copayers' : 'Add a private comment to identify the transaction') |translate}}" ng-model="commentText" ng-maxlength="100"></textarea>
<i class="icon-compose"></i>
</div>
</div>
</div>

28
views/settings.html
View File

@ -22,19 +22,29 @@
</fieldset>
<fieldset>
<legend translate>Insight API server</legend>
<label class="left" for="insightLivenet">Livenet</label>
<div class="row collapse">
<label class="left" for="insightLivenet">Livenet</label>
<div translate class="has-error right size-12" ng-show="settingsForm.insightLivenet.$invalid">
<span class="icon-input"><i class="fi-x"></i></span>
Not valid
</div>
<input type="text" ng-model="insightLivenet" class="form-control" name="insightLivenet" valid-url required>
<label class="left" for="insightTestnet">Testnet</label>
<div translate class="has-error right size-12" ng-show="settingsForm.insightTestnet.$invalid">
<span class="icon-input"><i class="fi-x"></i></span>
Not valid
</div>
<input type="text" ng-model="insightTestnet" class="form-control" name="insightTestnet" valid-url required>
<div class="input">
<input type="text" ng-model="insightLivenet" class="form-control" name="insightLivenet" valid-url required>
<i class="fi-link"></i>
</div>
<div class="row collapse">
<label class="left" for="insightTestnet">Testnet</label>
<div translate class="has-error right size-12" ng-show="settingsForm.insightTestnet.$invalid">
<span class="icon-input"><i class="fi-x"></i></span>
Not valid
</div>
</div>
<div class="input">
<input type="text" ng-model="insightTestnet" class="form-control" name="insightTestnet" valid-url required>
<i class="fi-link"></i>
</div>
<div translate class="small text-gray">
Insight API server is open-source software. You can run your own instances, check <a href="http://insight.is" target="_blank">Insight API Homepage</a>
@ -63,7 +73,7 @@
</form>
<div class="box-setup-footer">
<a class="text-gray" href="#!/">
<i class="fi-arrow-left"></i>
<i class="icon-arrow-left4"></i>
<span translate>Back</span>
</a>
<div class="right m10r">