LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Packages Projects Releases 238 Wiki Activity

so much discovery I can't take it #2617

Merged
neb-b merged 20 commits from fixes into master 2019-07-23 01:45:30 +02:00
Conversation 1 Commits 20 Files changed 47 +18 -6
6 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 456f7ec039 - Show all commits

2
src/ui/component/transactionList/internal/transaction-list-item.jsx
View file

@ -74,7 +74,7 @@ class TransactionListItem extends React.PureComponent<Props> {
</td> </td>
<td className="table__item--actionable"> <td className="table__item--actionable">
{reward && <span>{reward.reward_title}</span>} {reward && <span>{reward.reward_title}</span>}
{uri ? <Button button="link" navigate={uri} label={claimName} /> : claimName} {claimName && claimId ? <Button button="link" navigate={uri} label={claimName} /> : claimName}
</td> </td>
<td> <td>

4
src/ui/scss/component/_badge.scss
View file

@ -14,7 +14,7 @@
[data-mode='dark'] & { [data-mode='dark'] & {
color: var(--dm-color-01); color: var(--dm-color-01);
background-color: rgba($lbry-teal-5, 0.3); background-color: lighten(mix($lbry-black, $lbry-teal-5, 80%), 10%);
} }
} }
@ -33,6 +33,6 @@
} }
[data-mode='dark'] & { [data-mode='dark'] & {
background-color: rgba($lbry-grape-1, 0.3); background-color: darken(mix($lbry-grape-1, $lbry-gray-5, 50%), 20%);
} }
} }

8
src/ui/scss/component/_claim-list.scss
View file

@ -24,6 +24,13 @@
&:hover { &:hover {
color: $lbry-teal-1; color: $lbry-teal-1;
} }
[data-mode='dark'] & {
color: $lbry-teal-4;
&:hover {
color: $lbry-teal-1;
}
}
} }
// Fix this in @lbry/components, we shouldn't need to be this specific // Fix this in @lbry/components, we shouldn't need to be this specific
@ -177,6 +184,7 @@
.claim-preview-title { .claim-preview-title {
font-weight: 600; font-weight: 600;
margin-right: auto; margin-right: auto;
padding-right: var(--spacing-medium);
} }
.claim-preview-tags { .claim-preview-tags {

4
src/ui/scss/component/_main.scss
View file

@ -67,4 +67,8 @@
svg { svg {
stroke: $lbry-white; stroke: $lbry-white;
} }
[data-mode='dark'] & {
background-color: $lbry-teal-5;
}
} }

2
src/ui/scss/component/menu-button.scss
View file

@ -22,7 +22,7 @@
border-top: none; border-top: none;
[data-mode='dark'] & { [data-mode='dark'] & {
background-color: lighten($lbry-black, 10%); background-color: var(--dm-color-05);
color: $lbry-white; color: $lbry-white;
box-shadow: 0 10px 30px 2px $lbry-black; box-shadow: 0 10px 30px 2px $lbry-black;
border: 1px solid $lbry-gray-5; border: 1px solid $lbry-gray-5;

4
yarn.lock
View file

@ -6646,9 +6646,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4:
yargs "^13.2.2" yargs "^13.2.2"
zstd-codec "^0.1.1" zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#87e01209f56cb3326c12ffc114072c48f72c1a3e: lbry-redux@lbryio/lbry-redux#eb3a7afc46ef69678149ad5caff3829473d75b43:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/87e01209f56cb3326c12ffc114072c48f72c1a3e" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/eb3a7afc46ef69678149ad5caff3829473d75b43"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"