isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ScreenShield: fix spacing of notifications and sources

Browse Source 
Reduce padding around persistent sources, and ensure that spacing
around resident notifications is only applied once.
Also, add some padding to the clock.

https://bugzilla.gnome.org/show_bug.cgi?id=681143
This commit is contained in:
Giovanni Campagna 2012-08-06 20:44:07 +02:00
parent 59cd9b4220
commit 8d7fa54af4
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/theme/gnome-shell.css
View File

@ -1220,17 +1220,17 @@ StButton.popup-menu-item:insensitive {
padding-bottom: 12px; padding-bottom: 12px;
} }
#summary-notification-stack-scrollview { .summary-notification-stack-scrollview {
max-height: 18em; max-height: 18em;
padding-top: 6px; padding-top: 6px;
padding-bottom: 6px; padding-bottom: 6px;
} }
#summary-notification-stack-scrollview:ltr { .summary-notification-stack-scrollview:ltr {
padding-right: 8px; padding-right: 8px;
} }
#summary-notification-stack-scrollview:rtl { .summary-notification-stack-scrollview:rtl {
padding-left: 8px; padding-left: 8px;
} }
@ -2216,6 +2216,7 @@ StButton.popup-menu-item:insensitive {
text-shadow: 0px 1px 2px rgba(0,0,0,0.6); text-shadow: 0px 1px 2px rgba(0,0,0,0.6);
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
padding-bottom: 1.5em;
} }
.screen-shield-clock-time { .screen-shield-clock-time {
@ -2232,14 +2233,15 @@ StButton.popup-menu-item:insensitive {
background-color: rgba(0.0, 0.0, 0.0, 0.9); background-color: rgba(0.0, 0.0, 0.0, 0.9);
border: 2px solid #868686; border: 2px solid #868686;
max-height: 500px; max-height: 500px;
padding: 12px 0;
} }
.screen-shield-notifications-box { .screen-shield-notifications-box {
spacing: 8px; spacing: 12px;
} }
.screen-shield-notification-source { .screen-shield-notification-source {
padding: 24px 8px; padding: 0 24px;
spacing: 5px; spacing: 5px;
} }
@ -2254,3 +2256,12 @@ StButton.popup-menu-item:insensitive {
.screen-shield-notifications-box .notification { .screen-shield-notifications-box .notification {
background-color: transparent; background-color: transparent;
} }
/* Override padding on resident notifications, since
the notifications box has its own spacing
*/
.screen-shield-notifications-box .summary-notification-stack-scrollview {
padding-top: 0px;
padding-bottom: 0px;
}

10
js/ui/messageTray.js
View File

@ -1284,12 +1284,12 @@ const SummaryItem = new Lang.Class({
this._sourceBox.add(this._sourceTitleBin, { expand: true, y_fill: false }); this._sourceBox.add(this._sourceTitleBin, { expand: true, y_fill: false });
this.actor.child = this._sourceBox; this.actor.child = this._sourceBox;
this.notificationStackView = new St.ScrollView({ name: source.isChat ? '' : 'summary-notification-stack-scrollview', this.notificationStackView = new St.ScrollView({ style_class: source.isChat ? '' : 'summary-notification-stack-scrollview',
vscrollbar_policy: source.isChat ? Gtk.PolicyType.NEVER : Gtk.PolicyType.AUTOMATIC, vscrollbar_policy: source.isChat ? Gtk.PolicyType.NEVER : Gtk.PolicyType.AUTOMATIC,
hscrollbar_policy: Gtk.PolicyType.NEVER, hscrollbar_policy: Gtk.PolicyType.NEVER });
style_class: 'vfade' }); this.notificationStackView.add_style_class_name('vfade');
this.notificationStack = new St.BoxLayout({ name: 'summary-notification-stack', this.notificationStack = new St.BoxLayout({ style_class: 'summary-notification-stack',
vertical: true }); vertical: true });
this.notificationStackView.add_actor(this.notificationStack); this.notificationStackView.add_actor(this.notificationStack);
this._stackedNotifications = []; this._stackedNotifications = [];

2
js/ui/screenShield.js
View File

@ -136,7 +136,7 @@ const NotificationsBox = new Lang.Class({
box.add(sourceActor.actor, { y_fill: true }); box.add(sourceActor.actor, { y_fill: true });
let textBox = new St.BoxLayout({ vertical: true }); let textBox = new St.BoxLayout({ vertical: true });
box.add(textBox, { y_fill: true, expand: true }); box.add(textBox);
let label = new St.Label({ text: source.title, let label = new St.Label({ text: source.title,
style_class: 'screen-shield-notification-label' }); style_class: 'screen-shield-notification-label' });