aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Winslow <evan@elgg.org>2013-03-24 23:26:23 -0700
committerEvan Winslow <evan@elgg.org>2013-03-24 23:26:23 -0700
commit369245047ddb2943c52ad9d8847e75b69af6d4b4 (patch)
tree6700eee69fc4fa18ad14f502942ce9d145f32eea
parent7e098f94738607c7d263b76277278f9ef4d5d209 (diff)
parent5a8e0b7d91c20b842d7414036bd6a1e04f4f2fcc (diff)
downloadelgg-369245047ddb2943c52ad9d8847e75b69af6d4b4.tar.gz
elgg-369245047ddb2943c52ad9d8847e75b69af6d4b4.tar.bz2
Merge pull request #5283 from mrclay/5271-18
Prevent break of pagination elements when wrapped
-rw-r--r--views/default/css/elements/navigation.php5
-rw-r--r--views/default/css/ie7.php1
2 files changed, 4 insertions, 2 deletions
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 62f370069..49e36e494 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -16,7 +16,7 @@
text-align: center;
}
.elgg-pagination li {
- display: inline;
+ display: inline-block;
margin: 0 6px 0 0;
text-align: center;
}
@@ -24,7 +24,8 @@
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-
+
+ display: block;
padding: 2px 6px;
color: #4690d6;
border: 1px solid #4690d6;
diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
index 229df8431..90274797d 100644
--- a/views/default/css/ie7.php
+++ b/views/default/css/ie7.php
@@ -24,6 +24,7 @@
.elgg-menu-footer > li > a,
.elgg-menu-footer li,
.elgg-menu-general > li > a,
+.elgg-pagination li,
.elgg-menu-general li {
display: inline;
}