diff options
| author | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
|---|---|---|
| committer | rechosen <rechosen@gmail.com> | 2013-09-23 18:08:29 +0200 |
| commit | e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806 (patch) | |
| tree | 0c7421d14d3f803358740a2febb84bc06acd4dac /phpBB/styles/prosilver/theme | |
| parent | 564a7cc89dcd2464024b78fe2e70adef771368f2 (diff) | |
| parent | 717e2337b9276d9f9680110dff552ea536d0723c (diff) | |
| download | forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.gz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.bz2 forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.tar.xz forums-e45b69ee094d8e3cb8cb91ebdcddb8f50db7b806.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786
Diffstat (limited to 'phpBB/styles/prosilver/theme')
| -rw-r--r-- | phpBB/styles/prosilver/theme/bidi.css | 7 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 25 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 33 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/forms.css | 10 |
4 files changed, 57 insertions, 18 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index a921805327..41a9874a18 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -371,6 +371,13 @@ float: right; } +.rtl p.post-notice:before { + left: auto; + right: 0; + padding-left: 5px; + padding-right: 26px; +} + /* Topic review panel ----------------------------------------*/ .rtl #topicreview { diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 5548905ede..9e3d29bec2 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -77,7 +77,7 @@ hr { } .bg1 { background-color: #ECF3F7; } -.bg2 { background-color: #e1ebf2; } +.bg2 { background-color: #e1ebf2; } .bg3 { background-color: #cadceb; } .ucprowbg { @@ -214,11 +214,24 @@ div.rules { color: #BC2A4D; } -p.rules { +p.post-notice { background-color: #ECD5D8; background-image: none; } +p.post-notice.deleted:before { + background-image: url("./images/icon_topic_deleted.png"); +} + +p.post-notice.unapproved:before { + background-image: url("./images/icon_topic_unapproved.gif"); +} + +p.post-notice.reported:before, p.post-notice.error:before { + background-image: url("./images/icon_topic_reported.gif"); +} + + /* -------------------------------------------------------------- Colours and backgrounds for links.css @@ -331,10 +344,10 @@ a.top2 { } /* Arrow links */ -a.arrow-up { background-image: url("./images/arrow_up.gif") } -a.arrow-down { background-image: url("./images/arrow_down.gif") } -a.arrow-left { background-image: url("./images/arrow_left.gif") } -a.arrow-right { background-image: url("./images/arrow_right.gif") } +a.arrow-up { background-image: url("./images/arrow_up.gif"); } +a.arrow-down { background-image: url("./images/arrow_down.gif"); } +a.arrow-left { background-image: url("./images/arrow_left.gif"); } +a.arrow-right { background-image: url("./images/arrow_right.gif"); } a.arrow-up:hover { background-color: transparent; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index a2b8034187..9021c157a3 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -134,6 +134,10 @@ p.right { text-align: right; } +p.jumpbox-return { + margin-top: 1em; +} + b, strong { font-weight: bold; } @@ -685,23 +689,28 @@ div.rules ul, div.rules ol { margin-left: 20px; } -p.rules { - background-image: none; +p.post-notice { + position: relative; padding: 5px; + padding-left: 26px; + min-height: 14px; + margin-bottom: 1em; } -p.rules img { - vertical-align: middle; -} - -p.rules strong { - vertical-align: middle; - padding-top: 5px; +p.post-notice:before { + content: ''; + display: block; + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: 28px; + background: transparent none 50% 50% no-repeat; + pointer-events: none; } -p.rules a { - vertical-align: middle; - clear: both; +form > p.post-notice strong { + line-height: 20px; } #top { diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index b66544acf7..34f8bc8c32 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -28,6 +28,10 @@ select { font-size: 1em; } +select:focus { + outline-style: none; +} + option { padding-right: 1em; } @@ -271,6 +275,7 @@ fieldset.submit-buttons input { .inputbox:hover, .inputbox:focus { border: 1px solid transparent; + outline-style: none; } input.inputbox { width: 85%; } @@ -347,6 +352,11 @@ input.disabled { font-weight: normal; } +/* Focus states */ +input.button1:focus, input.button2:focus, input.button3:focus { + outline-style: none; +} + /* Topic and forum Search */ .search-box { margin-top: 3px; |