diff options
| author | Cesar G <prototech91@gmail.com> | 2014-06-22 15:44:06 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-06-22 15:44:06 -0700 |
| commit | 74a37259f77a3155fd2b954fbfea9b9544ffa678 (patch) | |
| tree | cea4414a408f358a03823e7176e59ba9df8cf5f8 /phpBB/styles/prosilver/theme | |
| parent | 4f2acbaed2028cc1b5ad96f6eada97b1cc94532f (diff) | |
| parent | 1a3c1d5b9ad6def9da4186d79a32f583b892a7cd (diff) | |
| download | forums-74a37259f77a3155fd2b954fbfea9b9544ffa678.tar forums-74a37259f77a3155fd2b954fbfea9b9544ffa678.tar.gz forums-74a37259f77a3155fd2b954fbfea9b9544ffa678.tar.bz2 forums-74a37259f77a3155fd2b954fbfea9b9544ffa678.tar.xz forums-74a37259f77a3155fd2b954fbfea9b9544ffa678.zip | |
Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeus
* PayBas/ticket/12608:
[ticket/12608] Change CSS classes to prevent styling conflicts
[ticket/12608] Add subSilver
[ticket/12608] Changed get_styling() to get_style_class()
[ticket/12608] Remove somewhat redundant reported color style
[ticket/12608] Improved LTR and various bugfixes
[ticket/12608] Clean up whitespace
[ticket/12608] Add styling (CSS class) options to notifications
[ticket/12608] Updated tests
[ticket/12608] Improve notifications drop-down menu styling in header
Diffstat (limited to 'phpBB/styles/prosilver/theme')
| -rw-r--r-- | phpBB/styles/prosilver/theme/bidi.css | 26 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 11 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 39 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/links.css | 3 |
4 files changed, 73 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index bf108fd9c8..d8d568c7a5 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -112,6 +112,32 @@ padding-right: 10px; } +.rtl .dropdown-extended .header .header_settings { + float: left; +} + +/* Notifications +----------------------------------------*/ +.rtl .notification_list ul li img { + float: right; + margin-left: 5px; + margin-right: 0; +} + +.rtl .notification_list div.notifications { + margin-left: 0; + margin-right: 50px; +} + +.rtl .notification_text { + margin-left: 0; + margin-right: 58px; +} + +.rtl .notification_list p.notification-time { + text-align: left; +} + /* Responsive breadcrumbs ----------------------------------------*/ .rtl .breadcrumbs .crumb { diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 875e61020b..9565eb9967 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1173,3 +1173,14 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist #minitabs .dropdown-contents { background-color: #F1F8FF; } + +/* Notifications +---------------------------------------- */ + +.notification_list p.notification-time { + color: #4C5D77; +} + +li.notification-reported strong, li.notification-disapproved strong { + color: #D31141; +} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 7e0e2cdea4..a52f5e494d 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1101,7 +1101,7 @@ form > p.post-notice strong { display: none; position: absolute; left: 0; - width: 330px; + width: 340px; z-index: 1; top: 22px; } @@ -1115,7 +1115,7 @@ form > p.post-notice strong { .dropdown-extended ul li { padding: 0; - margin: 0; + margin: 0 !important; float: none; border-bottom: 1px solid; list-style-type: none; @@ -1160,8 +1160,8 @@ form > p.post-notice strong { font-size: 1.1em; } -.dropdown-extended ul li a{ - padding: 10px; +.dropdown-extended ul li a, .dropdown-extended ul li.no-url { + padding: 8px; } .dropdown-extended .footer > a { @@ -1176,28 +1176,55 @@ form > p.post-notice strong { .notification_list ul li img { float: left; max-height: 50px; + max-width: 50px; width: auto !important; height: auto !important; margin-right: 5px; } .notification_list ul li p { - margin: 0; + margin-bottom: 4px; font-size: 1em; } +.notification_list p.notification-reference, +.notification_list p.notification-location, +.notification_list li a p.notification-reason { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.notification_list p.notification-time { + font-size: 10px; + margin: 0; + text-align: right; +} + .notification_list div.notifications { + margin-left: 50px; padding: 5px; } +.notification_list div.notifications a { + display: block; +} + .notification_list p.notifications_title { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; font-size: 13px !important; +} + +.notification_list p.notifications_title strong { font-weight: bold; } .notification_list p.notifications_time { - font-size: 11px !important; + font-size: 10px !important; +} + +.notification_text { + margin-left: 58px; } .notification_text:after { diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 86cdf9c10e..89639dde02 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -62,6 +62,9 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a { top: 50%; width: 30px; height: 40px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .dropdown-extended li:hover a.mark_read { |