1
0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-02 08:30:14 +01:00

adjust notification bar for small/zoomed screens

This commit is contained in:
Kyle Spearrin 2017-09-07 10:12:34 -04:00
parent 0b2fa01232
commit 1b344ade0d
5 changed files with 52 additions and 3 deletions

View File

@ -75,6 +75,9 @@ chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
else if (msg.command === 'bgCloseNotificationBar') { else if (msg.command === 'bgCloseNotificationBar') {
messageTab(sender.tab.id, 'closeNotificationBar'); messageTab(sender.tab.id, 'closeNotificationBar');
} }
else if (msg.command === 'bgAdjustNotificationBar') {
messageTab(sender.tab.id, 'adjustNotificationBar', msg.data);
}
else if (msg.command === 'bgCollectPageDetails') { else if (msg.command === 'bgCollectPageDetails') {
collectPageDetailsForContentScript(sender.tab, msg.sender); collectPageDetailsForContentScript(sender.tab, msg.sender);
} }

View File

@ -17,6 +17,11 @@
sendResponse(); sendResponse();
return true; return true;
} }
else if (msg.command === 'adjustNotificationBar') {
adjustBar(msg.data);
sendResponse();
return true;
}
else if (msg.command === 'pageDetails') { else if (msg.command === 'pageDetails') {
pageDetails.push(msg.data.details); pageDetails.push(msg.data.details);
watchForms(msg.data.forms); watchForms(msg.data.forms);
@ -249,4 +254,20 @@
break; break;
} }
} }
function adjustBar(data) {
if (data.height !== 42) {
var newHeight = data.height + 'px';
doHeightAdjustment('bit-notification-bar-iframe', newHeight);
doHeightAdjustment('bit-notification-bar', newHeight);
doHeightAdjustment('bit-notification-bar-spacer', newHeight);
}
}
function doHeightAdjustment(elId, heightStyle) {
var el = document.getElementById(elId);
if (el) {
el.style.height = heightStyle;
}
}
}); });

View File

@ -79,3 +79,13 @@ button.link {
background: none; background: none;
text-decoration: underline; text-decoration: underline;
} }
.add-buttons {
width: 175px;
}
@media (min-width: 768px) {
.add-buttons {
width: 320px;
}
}

View File

@ -28,7 +28,7 @@
<tbody> <tbody>
<tr> <tr>
<td class="add-text"></td> <td class="add-text"></td>
<td align="right" width="320"> <td align="right" class="add-buttons">
<button class="never-save link"></button> <button class="never-save link"></button>
<button class="add-save"></button> <button class="add-save"></button>
</td> </td>

View File

@ -5,8 +5,16 @@
// i18n // i18n
$('#logo-link').attr('title', chrome.i18n.getMessage('appName')); $('#logo-link').attr('title', chrome.i18n.getMessage('appName'));
closeButton.attr('title', chrome.i18n.getMessage('close')); closeButton.attr('title', chrome.i18n.getMessage('close'));
$('#template-add .add-save').text(chrome.i18n.getMessage('notificationAddSave'));
$('#template-add .never-save').text(chrome.i18n.getMessage('notificationNeverSave')); if (window.innerWidth < 768) {
$('#template-add .add-save').text(chrome.i18n.getMessage('yes'));
$('#template-add .never-save').text(chrome.i18n.getMessage('never'));
}
else {
$('#template-add .add-save').text(chrome.i18n.getMessage('notificationAddSave'));
$('#template-add .never-save').text(chrome.i18n.getMessage('notificationNeverSave'));
}
$('#template-add .add-text').text(chrome.i18n.getMessage('notificationAddDesc')); $('#template-add .add-text').text(chrome.i18n.getMessage('notificationAddDesc'));
if (getQueryVariable('add')) { if (getQueryVariable('add')) {
@ -42,6 +50,13 @@
}); });
}); });
chrome.runtime.sendMessage({
command: 'bgAdjustNotificationBar',
data: {
height: document.body.scrollHeight
}
});
function getQueryVariable(variable) { function getQueryVariable(variable) {
var query = window.location.search.substring(1); var query = window.location.search.substring(1);
var vars = query.split('&'); var vars = query.split('&');