From d5f4d288e92499b64e96aeafe673ed05708cc8da Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 28 May 2014 21:33:17 +0200 Subject: [ticket/12608] Improve notifications drop-down menu styling in header PHPBB3-12608 --- .../prosilver/template/notification_dropdown.html | 9 ++++--- .../prosilver/template/ucp_notifications.html | 6 +++-- phpBB/styles/prosilver/theme/common.css | 30 ++++++++++++++++++++-- phpBB/styles/prosilver/theme/links.css | 3 +++ 4 files changed, 41 insertions(+), 7 deletions(-) (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index db4d5bade7..fbe0e1efd4 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -20,12 +20,15 @@
  • - + {notifications.AVATAR}
    -

    {notifications.FORMATTED_TITLE}

    -

    » {notifications.TIME}

    +

    {notifications.FORMATTED_TITLE}

    +

    {notifications.REFERENCE}

    +

    {notifications.FORUM}

    +

    {notifications.REASON}

    +

    {notifications.TIME}

     diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 8910769cce..61df0c9cf5 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -72,8 +72,10 @@ {notification_list.AVATAR}
    -

    {notification_list.FORMATTED_TITLE}

    -     +

    {notification_list.FORMATTED_TITLE} {notification_list.REFERENCE}

    + +

    {notification_list.FORUM}

    +

    {notification_list.REASON}

    {notification_list.TIME}

    {L_MARK_READ}

    diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index aa28cd6962..50e89928d0 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; } @@ -1173,19 +1173,38 @@ form > p.post-notice strong { text-decoration: none; } +.notification_list a.notification-block { + padding: 8px; +} + .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 a.notification-block p.notification-reason { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.notification_list ul li p.notification-time { + font-size: 0.9em; + margin: 0; + text-align: right; +} + .notification_list div.notifications { padding: 5px; } @@ -1193,6 +1212,9 @@ form > p.post-notice strong { .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; } @@ -1200,6 +1222,10 @@ form > p.post-notice strong { font-size: 11px !important; } +.notification_text { + margin-left: 58px; +} + .notification_text:after { content: ''; clear: both; 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 { -- cgit v1.2.1 From 693cbd247cc1d3768d56795da4a580780e6b899c Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 28 May 2014 22:49:16 +0200 Subject: [ticket/12608] Add styling (CSS class) options to notifications This will allow different notifications to have different styles PHPBB3-12608 --- phpBB/styles/prosilver/template/notification_dropdown.html | 4 ++-- phpBB/styles/prosilver/template/ucp_notifications.html | 2 +- phpBB/styles/prosilver/theme/colours.css | 9 +++++++++ phpBB/styles/prosilver/theme/common.css | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index fbe0e1efd4..4aebeb16a8 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -18,13 +18,13 @@
    • -
  • +
  • {notifications.AVATAR}
    -

    {notifications.FORMATTED_TITLE}

    +

    {notifications.FORMATTED_TITLE}

    {notifications.REFERENCE}

    {notifications.FORUM}

    {notifications.REASON}

    diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 61df0c9cf5..a7cf2f43aa 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -65,7 +65,7 @@
    diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index f3902b363d..2e563a1edf 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/common.css b/phpBB/styles/prosilver/theme/common.css index 75ae7ae59d..05eeee8849 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -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 { @@ -1173,10 +1173,6 @@ form > p.post-notice strong { text-decoration: none; } -.notification_list a.notification-block { - padding: 8px; -} - .notification_list ul li img { float: left; max-height: 50px; @@ -1193,22 +1189,27 @@ form > p.post-notice strong { .notification_list p.notification-reference, .notification_list p.notification-location, -.notification_list a.notification-block p.notification-reason { +.notification_list li a p.notification-reason { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .notification_list p.notification-time { - font-size: 0.9em; + 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; @@ -1219,7 +1220,7 @@ form > p.post-notice strong { } .notification_list p.notifications_time { - font-size: 11px !important; + font-size: 10px !important; } .notification_text { -- cgit v1.2.1 From a9e6caa7756102e61ee50739ee562b0cf09965fd Mon Sep 17 00:00:00 2001 From: PayBas Date: Sun, 1 Jun 2014 11:12:20 +0200 Subject: [ticket/12608] Remove somewhat redundant reported color style PHPBB3-12608 --- phpBB/styles/prosilver/theme/colours.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index a022c361c3..dc22b54914 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -239,8 +239,7 @@ p.post-notice.reported:before, p.post-notice.error:before { color: #4C5D77; } -.notification_list .reported p.notifications_title strong, -.notification_list .reported p.notification-title strong { +.notification_list .reported strong { color: #D31141; } -- cgit v1.2.1 From c805e53da3fd7578205133b0749e5fd989ad7095 Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 13 Jun 2014 10:28:04 +0200 Subject: [ticket/12608] Add subSilver PHPBB3-12608 --- .../prosilver/template/ucp_notifications.html | 2 +- .../styles/subsilver2/template/overall_header.html | 8 ++++++-- .../subsilver2/template/ucp_notifications.html | 6 ++++-- phpBB/styles/subsilver2/theme/stylesheet.css | 23 +++++++++++++++++++--- 4 files changed, 31 insertions(+), 8 deletions(-) (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 5d2af425e8..500bae0c47 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -72,7 +72,7 @@ {notification_list.AVATAR}
    -

    {notification_list.FORMATTED_TITLE} {notification_list.REFERENCE}

    +

    {notification_list.FORMATTED_TITLE} {notification_list.REFERENCE}

    {notification_list.FORUM}

    {notification_list.REASON}

    diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 314e284155..42f29b2445 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -166,7 +166,7 @@ function marklist(id, name, state)
    - +
    @@ -177,7 +177,11 @@ function marklist(id, name, state) {notifications.FORMATTED_TITLE} -
    » {notifications.TIME} + +
    {notifications.REFERENCE} +
    {notifications.FORUM} +
    {notifications.REASON} +
    {notifications.TIME}
    {L_MARK_READ} diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html index 64e21ec4a6..b0d2925b68 100644 --- a/phpBB/styles/subsilver2/template/ucp_notifications.html +++ b/phpBB/styles/subsilver2/template/ucp_notifications.html @@ -92,9 +92,11 @@     		- {notification_list.FORMATTED_TITLE} + {notification_list.FORMATTED_TITLE} {notification_list.REFERENCE}
    - {notification_list.TIME} + {notification_list.FORUM}
    + {notification_list.REASON}
    + {notification_list.TIME}     		diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index e69eec4f14..596ebdc29f 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -1189,12 +1189,21 @@ a.imageset { overflow-x: hidden; } +#notification_list table { + width: 100%; +} + #notification_list .notification_title { - padding: 5px; + padding: 3px; +} + +#notification_list .notification_title:after { + clear: both; + content: ''; + display: block; } #notification_list .header { - width: 298px; padding: 5px; font-weight: bold; border: 1px solid #A9B8C2; @@ -1208,7 +1217,6 @@ a.imageset { } #notification_list .footer { - width: 300px; text-align: center; font-size: 1.2em; border: 1px solid #A9B8C2; @@ -1223,3 +1231,12 @@ a.imageset { #notification_list .footer > a { display: block; } + +#notification_list .notification-time { + font-size: 0.9em; + float: right; +} + +.notification_list .notifications_time { + font-size: 0.8em; +} -- cgit v1.2.1 From 1a3c1d5b9ad6def9da4186d79a32f583b892a7cd Mon Sep 17 00:00:00 2001 From: PayBas Date: Sun, 22 Jun 2014 22:40:07 +0200 Subject: [ticket/12608] Change CSS classes to prevent styling conflicts PHPBB3-12608 --- phpBB/styles/prosilver/theme/colours.css | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index dc22b54914..9565eb9967 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -235,14 +235,6 @@ p.post-notice.reported:before, p.post-notice.error:before { background-image: url("./images/icon_topic_reported.gif"); } -.notification_list p.notification-time { - color: #4C5D77; -} - -.notification_list .reported strong { - color: #D31141; -} - /* -------------------------------------------------------------- Colours and backgrounds for links.css @@ -1181,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; +} -- cgit v1.2.1