Merge branch '2.1.x'

This commit is contained in:
Marc Alexander
2015-06-16 21:01:32 +02:00
2 changed files with 40 additions and 8 deletions

View File

@@ -47,7 +47,7 @@
.portal-events li.row .portal-events li.row
{ {
border-top: 0px; border-top: 0;
list-style-type: none; list-style-type: none;
} }
@@ -98,7 +98,7 @@
.rtl .portal-user-annotation { .rtl .portal-user-annotation {
float: left; float: left;
padding-right: 0px; padding-right: 0;
} }
.portal-title-span { .portal-title-span {
@@ -121,7 +121,7 @@
.rtl .portal-text-span { .rtl .portal-text-span {
float: right; float: right;
padding-right: 0px; padding-right: 0;
padding-left: 10px; padding-left: 10px;
} }
@@ -132,7 +132,7 @@
.rtl .portal-data-span { .rtl .portal-data-span {
float: left; float: left;
padding-right: 0px; padding-right: 0;
padding-left: 10px; padding-left: 10px;
} }
@@ -371,8 +371,8 @@ a.portal-forumtitle {
} }
#portal-body #viewpoll { #portal-body #viewpoll {
margin-left: 0px; margin-left: 0;
margin-right: 0px; margin-right: 0;
} }
#portal-left li, #portal-center li, #portal-left li, #portal-center li,
@@ -412,6 +412,38 @@ a.portal-forumtitle {
text-align: right; text-align: right;
} }
ul.topiclist dt .list-inner {
margin-right: 50%;
}
ul.topiclist dt {
margin-right: -50%;
}
ul.responsive-portal-news dd:last-of-type, ul.responsive-portal-announcements dd:last-of-type {
width: 25%;
}
dd.responsive-portal-news:last-of-type, dd.responsive-portal-announcements:last-of-type {
width: 25%;
}
.rtl ul.topiclist dt .list-inner {
margin-left: 50%;
}
.rtl ul.topiclist dt {
margin-left: -50%;
}
.rtl ul.responsive-portal-news dd:last-of-type, ul.responsive-portal-announcements dd:last-of-type {
width: 25%;
}
.rtl dd.responsive-portal-news:last-of-type, dd.responsive-portal-announcements:last-of-type {
width: 25%;
}
/* Portal clock /* Portal clock
-------------------------------------- */ -------------------------------------- */
.portal-clock-wrapper { .portal-clock-wrapper {
@@ -448,7 +480,7 @@ a.portal-forumtitle {
.portal-clock-front, .portal-clock-back { .portal-clock-front, .portal-clock-back {
position: absolute; position: absolute;
top: 0px; top: 0;
} }
.portal-clock-front-upper div { .portal-clock-front-upper div {

View File

@@ -38,7 +38,7 @@
@media only screen and (max-width: 700px), only screen and (max-device-width: 700px) @media only screen and (max-width: 700px), only screen and (max-device-width: 700px)
{ {
.responsive-portal-news dd.lastpost, .responsive-portal-announcements dd.lastpost { display: none !important; } .responsive-portal-news dd.lastpost, .responsive-portal-announcements dd.lastpost { display: none !important; }
.responsive-portal-news dt .list-inner, .responsive-portal-announcements dt .list-inner { margin-right: 0px !important; } .responsive-portal-news dt .list-inner, .responsive-portal-announcements dt .list-inner { margin-right: 0 !important; }
.responsive-portal-news dt, .responsive-portal-announcements dt { width: 100% !important; } .responsive-portal-news dt, .responsive-portal-announcements dt { width: 100% !important; }
dt#n, dt#a { width: 100% !important; } dt#n, dt#a { width: 100% !important; }