Skip to content

Commit

Permalink
Merge latest GUI changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rynomster committed Dec 12, 2016
1 parent 8ccfead commit 3bdd02e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -23,6 +23,7 @@ umbra
qrc_*.cpp
#qt creator
*.pro.user
.qmake.stash
#mac specific
.DS_Store
build
Expand Down
1 change: 1 addition & 0 deletions shadow.qrc
Expand Up @@ -98,6 +98,7 @@
<file alias="assets/img/progress/progress-circle-primary.svg">src/qt/res/assets/img/progress/progress-circle-primary.svg</file>
<file alias="assets/img/progress/progress-circle-success.svg">src/qt/res/assets/img/progress/progress-circle-success.svg</file>
<file alias="assets/img/progress/progress-circle-warning.svg">src/qt/res/assets/img/progress/progress-circle-warning.svg</file>
<file alias="assets/img/sdc_leak_image.jpg">src/qt/res/assets/img/sdc_leak_image.jpg</file>
<file alias="assets/img/sdc-vertical.png">src/qt/res/assets/img/sdc-vertical.png</file>
<file alias="assets/img/shadow_logo.png">src/qt/res/assets/img/shadow_logo.png</file>
<file alias="assets/img/shoppingcart.png">src/qt/res/assets/img/shoppingcart.png</file>
Expand Down
Binary file added src/qt/res/assets/img/sdc_leak_image.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/qt/res/assets/js/shadow.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/qt/res/assets/plugins/markdown/markdown.min.js
Expand Up @@ -183,9 +183,9 @@ var micromarkdown = {
/* links */
while ((stra = micromarkdown.regexobject.links.exec(str)) !== null) {
if (stra[0].substr(0, 1) === '!') {
str = str.replace(stra[0], '<img src="' + stra[2] + '" alt="' + stra[1] + '" title="' + stra[1] + '" />\n');
str = str.replace(stra[0], '<img src="qrc:///assets/img/sdc_leak_image.jpg" onclick="confirmConversationShowImage(this)" data-src="' + stra[2] + '" alt="' + stra[1] + '" title="' + stra[1] + '" />\n');
} else {
str = str.replace(stra[0], '<a ' + micromarkdown.mmdCSSclass(stra[2], strict) + 'href="' + stra[2] + '">' + stra[1] + '</a>\n');
str = str.replace(stra[0], '<a ' + micromarkdown.mmdCSSclass(stra[2], strict) + 'onclick="return confirmConversationOpenLink()" target="_blank" href="' + stra[2] + '">' + stra[1] + '</a>\n');
}
}
while ((stra = micromarkdown.regexobject.mail.exec(str)) !== null) {
Expand Down

0 comments on commit 3bdd02e

Please sign in to comment.