aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-10 17:00:41 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-10 17:00:41 +0200
commitdb9bf6da33b6f188674fa687f6f674c719afeb7c (patch)
tree9134097dfb9dd838ef923a32746826725bbf235e
parentd998efcf54f3a7ec202a98555c70094aede7ec42 (diff)
parent2a5eca0391fc45a82224887bfb081dabd1b331da (diff)
downloadforums-db9bf6da33b6f188674fa687f6f674c719afeb7c.tar
forums-db9bf6da33b6f188674fa687f6f674c719afeb7c.tar.gz
forums-db9bf6da33b6f188674fa687f6f674c719afeb7c.tar.bz2
forums-db9bf6da33b6f188674fa687f6f674c719afeb7c.tar.xz
forums-db9bf6da33b6f188674fa687f6f674c719afeb7c.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/styles/prosilver/theme/bidi.css30
-rw-r--r--phpBB/styles/prosilver/theme/colours.css2
-rw-r--r--phpBB/styles/prosilver/theme/responsive.css11
3 files changed, 19 insertions, 24 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index f6e490f82a..0d98fe7a66 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -112,6 +112,15 @@
text-align: right;
}
+.rtl .dropdown-contents > li {
+ padding-left: 15px;
+ padding-right: 0;
+}
+
+.rtl .dropdown-nonscroll > li {
+ padding-left: 0;
+}
+
.rtl .dropdown li li {
padding-left: 0;
padding-right: 18px;
@@ -601,8 +610,8 @@ li.breadcrumbs span:first-child > a {
/* Rollover buttons
Based on: http://wellstyled.com/css-nopreload-rollovers.html
----------------------------------------*/
-.rtl .icon-button.dropdown-select {
- padding-left: 26px;
+.rtl .dropdown-select {
+ padding-left: 24px;
padding-right: 8px;
}
@@ -612,7 +621,12 @@ li.breadcrumbs span:first-child > a {
margin-right: 2px;
}
-.dropdown-select:after {
+.rtl .dropdown-select.icon-button:before {
+ margin-left: 4px;
+ margin-right: 0;
+}
+
+.rtl .dropdown-select:after {
border-left: 0;
border-right-style: solid;
border-right-width: 1px;
@@ -915,16 +929,6 @@ li.breadcrumbs span:first-child > a {
float: left;
}
-/* Jumpbox */
-.rtl fieldset.jumpbox {
- text-align: left;
-}
-
-.rtl fieldset.quickmod {
- float: left;
- text-align: left;
-}
-
/* Posting page styles
----------------------------------------*/
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 82542c8d86..df27467cf8 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -610,7 +610,7 @@ Colours and backgrounds for buttons.css
color: #D31141;
}
-.dropdown-select, .dropdown-select:visited {
+.dropdown-select {
color: #536482;
}
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index b9cbd4cdfb..3ef0044621 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -466,12 +466,6 @@ p.rightside {
margin-bottom: 0;
}
-fieldset.quickmod {
- width: auto;
- float: none;
- text-align: center;
-}
-
fieldset.display-options label {
display: block;
clear: both;
@@ -509,14 +503,11 @@ fieldset.display-actions {
margin: 0;
}
- .action-bar > .pagination, fieldset.jumpbox {
- text-align: center;
- }
-
.action-bar > .pagination {
float: none;
clear: both;
padding-bottom: 1px;
+ text-align: center;
}
.action-bar > .pagination li.page-jump {