diff options
| author | PayBas <contact@paybas.com> | 2014-06-13 12:21:04 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-13 12:25:02 +0200 |
| commit | 7c527adee87096d26087d82984b6f283db63832e (patch) | |
| tree | b818876d228d9a1f2b40431b0a2bb0fd4cb90589 /phpBB/styles/prosilver/theme | |
| parent | 86a320ff5c9c4f7c7eeac8d4956c4c131d0b1f7b (diff) | |
| download | forums-7c527adee87096d26087d82984b6f283db63832e.tar forums-7c527adee87096d26087d82984b6f283db63832e.tar.gz forums-7c527adee87096d26087d82984b6f283db63832e.tar.bz2 forums-7c527adee87096d26087d82984b6f283db63832e.tar.xz forums-7c527adee87096d26087d82984b6f283db63832e.zip | |
[ticket/12613] Remove unnecessary checks and clean up CSS
PHPBB3-12613
Diffstat (limited to 'phpBB/styles/prosilver/theme')
| -rw-r--r-- | phpBB/styles/prosilver/theme/bidi.css | 15 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 13 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 56 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/responsive.css | 6 |
4 files changed, 34 insertions, 56 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 8e609857d2..bce86db1a5 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -208,7 +208,7 @@ float: left; } -.rtl .pagination ul { +.rtl .pagination > ul { margin-left: 0; margin-right: 5px; } @@ -217,17 +217,16 @@ .rtl .row .pagination { background-position: 100% 50%; float: left; - padding: 1px 15px 1px 0; + padding-left: 0; + padding-right: 15px; } -.rtl .pagination span { - direction: ltr; +.rtl .row .pagination > ul { + margin: 0; } -.rtl .pagination span.page-sep { - display: inline; - visibility: hidden; - position: absolute; +.rtl .pagination span { + direction: ltr; } .pagination li.page-jump { diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 41a379d850..875e61020b 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -159,7 +159,7 @@ dl.details dd { /* Pagination ---------------------------------------- */ -.pagination li a, li .pagination li a { +.pagination li a { color: #5C758C; background-color: #ECEDEE; border-color: #B4BAC0; @@ -176,8 +176,7 @@ dl.details dd { border-color: #4692BF; } -.pagination li a:hover, .pagination .active a:hover, -.pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { +.pagination li a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { border-color: #368AD2; background-color: #368AD2; color: #FFFFFF; @@ -192,14 +191,6 @@ dl.details dd { background-image: url("./images/icon_pages.gif"); } -.row .pagination span a, li.pagination span a { - background-color: #FFFFFF; -} - -.row .pagination span a:hover, li.pagination span a:hover { - background-color: #368AD2; -} - /* Miscellaneous styles ---------------------------------------- */ diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 3577cd03c6..8a9df319c3 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -812,33 +812,25 @@ fieldset.fields1 dl.pmlist dd.recipients { width: auto; } -li.pagination { - margin-top: 0; -} - .pagination img { vertical-align: middle; } -.pagination ul { +.pagination > ul { display: inline-block; + list-style: none !important; margin-left: 5px; } -li.pagination ul { - margin-top: -2px; - vertical-align: middle; -} - -.pagination ul li, dl .pagination ul li, dl.icon .pagination ul li { - display: inline-block; +.pagination > ul > li { + display: inline-block !important; padding: 0; font-size: 100%; line-height: normal; vertical-align: middle; } -.pagination li a, .pagination li span, li .pagination li a, li .pagination li span, .pagination li.active span, .pagination li.ellipsis span { +.pagination li a, .pagination li span { border: 1px solid transparent; border-radius: 2px; display: block; @@ -861,6 +853,7 @@ li.pagination ul { } .pagination li.page-jump a, .pagination li.next a, .pagination li.previous a { + background-repeat: no-repeat; font-size: 0; height: 13px; width: 11px; @@ -868,36 +861,45 @@ li.pagination ul { .pagination li.page-jump a { background-position: 0 2px; - background-repeat: no-repeat; width: 24px; } .pagination li.next a { background-position: -50px 2px; - background-repeat: no-repeat; } .pagination li.previous a { background-position: -30px 2px; - background-repeat: no-repeat; } .pagination li.page-jump a:hover, .pagination .dropdown-visible a.dropdown-trigger, .nojs .pagination .dropdown-container:hover a.dropdown-trigger { background-position: 0 -18px; } .pagination li.next a:hover { background-position: -50px -18px; } .pagination li.previous a:hover { background-position: -30px -18px; } +/* Memberlist search */ +li.pagination { + margin-top: 0; +} + +li.pagination > ul { + margin-top: -2px; + vertical-align: middle; +} + /* Pagination in viewforum for multipage topics */ .row .pagination { display: block; - float: right; - width: auto; margin-top: 0; - padding: 1px 0 1px 8px; + padding: 1px 0 1px 15px; font-size: 0.9em; background: none 0 50% no-repeat; } -li .pagination li a, li .pagination li span { +.row .pagination > ul { + margin: 0; +} + +.row .pagination li a, .row .pagination li span { border-radius: 1px; padding: 1px; } @@ -1207,20 +1209,6 @@ form > p.post-notice strong { bottom: 20px; } -.dropdown-page-jump .dropdown-contents { - margin: 0; -} - -.dropdown-page-jump ul.dropdown-contents { - display: inherit; -} - -.dropdown-page-jump .dropdown-contents li { - display: list-item; - padding-bottom: 4px; - padding-top: 4px; -} - .dropdown-page-jump input.tiny { width: 50px; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index a587dd3ee4..324c5a206b 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -201,11 +201,11 @@ ul.topiclist li.row dt a.subforum { margin: 5px 0; } -.pagination ul { - margin-top: 5px; +.pagination > ul { + margin: 5px 0 0; } -.row .pagination ul { +.row .pagination > ul { margin-top: 0; } |