diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index bc17bee0a..96baa40e8 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "3.1.42", + "version": "3.1.43", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/lib/misc.ts b/packages/hydrooj/src/lib/misc.ts index 73566ecfb..a2b038bba 100644 --- a/packages/hydrooj/src/lib/misc.ts +++ b/packages/hydrooj/src/lib/misc.ts @@ -24,7 +24,7 @@ export function datetimeSpan(dt: Date | ObjectID, relative = true, format = 'YYY } export function* paginate(page: number, numPages: number) { - const radius = 2; + const radius = 5; let first: number; let last: number; if (page > 1) { diff --git a/packages/ui-default/components/pager/pager.page.styl b/packages/ui-default/components/pager/pager.page.styl index bd492b789..83e22051c 100644 --- a/packages/ui-default/components/pager/pager.page.styl +++ b/packages/ui-default/components/pager/pager.page.styl @@ -1,11 +1,23 @@ .pager - margin-bottom: rem(10px) - border-top: 2px solid $pager-border-color text-align: center font-size: rem($font-size-small) &:empty display: none + + &.pager-bottom + margin-bottom: rem(10px) + border-top: 2px solid $pager-border-color + + .pager__item + border-top: 2px solid $pager-border-color + + &.pager-top + margin-top: rem(10px) + border-bottom: 2px solid $pager-border-color + + .pager__item + border-bottom: 2px solid $pager-border-color li margin: 0 @@ -17,7 +29,6 @@ padding: rem(10px) text-decoration: none border: 0 - border-top: 2px solid $pager-border-color transition: border-top .2s linear, color .2s linear color: #a7a7a7 @@ -32,8 +43,8 @@ color: #666 &.current - color: $secondary-color - border-color: $secondary-color + color: $secondary-color !important + border-color: $secondary-color !important +mobile() .pager__item diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index e0047bc12..4ee58aa29 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.26.24", + "version": "4.26.25", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/components/paginator.html b/packages/ui-default/templates/components/paginator.html index b228dd0bd..561dd7711 100644 --- a/packages/ui-default/templates/components/paginator.html +++ b/packages/ui-default/templates/components/paginator.html @@ -1,6 +1,6 @@ -{% macro render(page, num_pages, add_qs='') %} +{% macro render(page, num_pages, add_qs='', position='bottom') %} {% if num_pages > 0 %} -