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

Merge branch 'master' into publish_quickfix

Browse source
This commit is contained in:
Jeremy Kauffman 2017-08-10 22:41:33 -04:00 • committed by GitHub
commit 1c0d681d8f
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -21,8 +21,9 @@ Web UI version numbers should always match the corresponding version of LBRY App
* Removed placeholder values from price selection form fields, which was causing confusion that these were real values (#426) * Removed placeholder values from price selection form fields, which was causing confusion that these were real values (#426)
* Fixed showing "other currency" help tip in publish form, which was caused due to not "setting" state for price * Fixed showing "other currency" help tip in publish form, which was caused due to not "setting" state for price
* Now using setState in formFieldPrice * Now using setState in formFieldPrice
* Fixed a bug which enabled the user to publish without filling/checking required fields * Public page now properly checks for all required fields are filled
* * Fixed pagination styling for pages > 5 (#416)
* Fixed sizing on squat videos (#419)
### Deprecated ### Deprecated
* *

1
ui/js/page/channel/view.jsx
View file

@ -83,6 +83,7 @@ class ChannelPage extends React.PureComponent {
pageClassName="pagination__item" pageClassName="pagination__item"
previousClassName="pagination__item pagination__item--previous" previousClassName="pagination__item pagination__item--previous"
nextClassName="pagination__item pagination__item--next" nextClassName="pagination__item pagination__item--next"
breakClassName="pagination__item pagination__item--break"
marginPagesDisplayed={2} marginPagesDisplayed={2}
onPageChange={e => this.changePage(e.selected + 1)} onPageChange={e => this.changePage(e.selected + 1)}
initialPage={parseInt(page - 1)} initialPage={parseInt(page - 1)}

4
ui/scss/component/_pagination.scss
View file

@ -26,6 +26,10 @@
font-size: 1.2em; font-size: 1.2em;
} }
.pagination__item--break {
padding: 0 $spacing-vertical * 2 / 3;
}
.pagination__item--selected { .pagination__item--selected {
color: white; color: white;
background: $color-primary; background: $color-primary;

3
ui/scss/component/_video.scss
View file

@ -20,9 +20,10 @@ video {
position: relative; position: relative;
video { video {
height: 100%; height: 100%;
width: 100%;
position: absolute; position: absolute;
left: 0;
top: 0; top: 0;
left: 0;
} }
&.video--hidden { &.video--hidden {
height: $height-video-embedded; height: $height-video-embedded;