bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/bitwarden/browser into add-login-with-locked-vault

Browse Source
This commit is contained in:
Daniel James Smith
2021-10-08 12:45:35 +02:00
parent 418f37de8c a3876db30b
commit 2613a8cfea
51 changed files with 395 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/notification/bar.html
View File

@@ -16,10 +16,16 @@
</div>
<div id="content"></div>
<div>
<<<<<<< HEAD
<a href="#" id="close-button">
<img id="close" alt="X"
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeBAMAAADJHrORAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAABJQTFRFAAAAMzMzMzMzMzMzMzMzMzMzbxxq5QAAAAZ0Uk5TAECg/2CfwOuXQgAAAJVJREFUeJxVkdEJwzAMRNXgAQpZINAu0Fz7b3AHyP7T1MrppNQfMuI9sE42s7vp3Lws7+zHMcsDPdqGz8SAhAEctgIhNDhiDYyNVw+8p5ZYgrCExBS+iSmgMIXCEhJTKMy+Yobf//BF0Hv9gp8lcPKRAifPPSiYBAULoXJTWHNyJy/f917vbv4fCtZOslSwcZLKMf/zB2MLKtNp5GuwAAAAAElFTkSuQmCC" />
</a>
=======
<button type="button" class="neutral" id="close-button">
<img id="close" alt="X" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeBAMAAADJHrORAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAWJQAAFiUBSVIk8AAAABJQTFRFAAAAMzMzMzMzMzMzMzMzMzMzbxxq5QAAAAZ0Uk5TAECg/2CfwOuXQgAAAJVJREFUeJxVkdEJwzAMRNXgAQpZINAu0Fz7b3AHyP7T1MrppNQfMuI9sE42s7vp3Lws7+zHMcsDPdqGz8SAhAEctgIhNDhiDYyNVw+8p5ZYgrCExBS+iSmgMIXCEhJTKMy+Yobf//BF0Hv9gp8lcPKRAifPPSiYBAULoXJTWHNyJy/f917vbv4fCtZOslSwcZLKMf/zB2MLKtNp5GuwAAAAAElFTkSuQmCC" />
</button>
>>>>>>> a3876db30bdfb5ac42bda44ec02a728a52ae149c
</div>
</div>
<div id="templates" style="display: none;">

17
src/notification/bar.js
View File

@@ -135,12 +135,8 @@ document.addEventListener('DOMContentLoaded', () => {
});
});
sendPlatformMessage({
command: 'bgAdjustNotificationBar',
data: {
height: body.scrollHeight
}
});
window.addEventListener("resize", adjustHeight);
adjustHeight();
}
function getQueryVariable(variable) {
@@ -180,4 +176,13 @@ document.addEventListener('DOMContentLoaded', () => {
select.appendChild(new Option(folder.name, folder.id || '', false));
});
}
function adjustHeight() {
sendPlatformMessage({
command: 'bgAdjustNotificationBar',
data: {
height: document.querySelector('body').scrollHeight
}
});
}
});

41
src/notification/bar.scss
View File

@@ -13,29 +13,19 @@
padding: 0 10px;
border-bottom: 2px solid #175ddc;
display: grid;
grid-template-columns: 1fr auto 1fr;
column-gap: 10px;
grid-template-columns: 24px auto 55px;
grid-column-gap: 10px;
box-sizing: border-box;
height: 42px;
}
.outer-wrapper > * {
align-self: center;
min-height: 42px;
}
.inner-wrapper {
display: grid;
grid-template-columns: 2fr 1fr;
column-gap: 10px;
grid-column-gap: 10px;
grid-template-columns: auto max-content;
}
#content .change-buttons {
justify-self: end;
}
.wrapper > *, .inner-wrapper > * {
.outer-wrapper > *, .inner-wrapper > * {
align-self: center;
}
@@ -59,41 +49,32 @@ img {
margin-right: 10px;
}
button:not(.link) {
button:not(.link),
button:not(.neutral) {
background-color: #175DDC;
padding: 5px 15px;
border-radius: 3px;
color: #ffffff;
border: 0;
}
button:not(.link):hover {
&:hover {
cursor: pointer;
background-color: #1751bd;
}
}
button.link {
button.link,
button.neutral {
background: none;
padding: 5px 15px;
color: #175DDC;
border: 0;
}
button.link:hover {
&:hover {
cursor: pointer;
background: none;
text-decoration: underline;
}
body[class*='lang-en'] .add-buttons {
width: 175px;
text-align: right;
}
@media (min-width: 768px) {
body[class*='lang-en'] .add-buttons {
width: 420px;
}
}
@media (print) {