web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Store and display new notifications

Browse Source
This commit is contained in:
yflory
2019-05-17 16:19:41 +02:00
parent c9f1a69a2e
commit 62e128a9fe
6 changed files with 195 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
customize.dist/src/less2/include/toolbar.less
View File

@@ -9,6 +9,7 @@
@import (reference) "./icons.less";
@import (reference) "./modal.less";
@import (reference) "./help.less";
@import (reference) "./notifications.less";
.toolbar_vars (
@color: @colortheme_default-color, // Color of the text for the toolbar
@@ -66,6 +67,7 @@
}
.help_main(@color, @bg-color);
.notifications_main();
.dropdown_main();
.history_main();
.iconColors_main();
@@ -567,6 +569,17 @@
}
.cp-toolbar-user {
height: @toolbar_line-height;
.cp-toolbar-notifications {
height: @toolbar_line-height;
width: @toolbar_line-height;
margin-left: 0;
button {
height: @toolbar_line-height;
width: @toolbar_line-height;
font-size: 20px;
margin-top: -1px;
}
}
.cp-toolbar-new {
height: @toolbar_line-height;
width: @toolbar_line-height;
@@ -834,7 +847,7 @@
line-height: 28px; // padding + border
}
}
.cp-toolbar-link, .cp-toolbar-new {
.cp-toolbar-link, .cp-toolbar-new, .cp-toolbar-notifications {
font-size: 48px;
line-height: 64px;
width: @toolbar_top-height;
@@ -849,14 +862,13 @@
}
transition: all 0.15s;
}
.cp-toolbar-new {
.cp-toolbar-notifications, .cp-toolbar-new {
background-color: rgba(0,0,0,0.2);
&:hover {
background-color: rgba(0,0,0,0.3);
}
text-align: center;
font-size: 32px;
margin-left: 10px;
&> button {
display: flex;
align-items: center;
@@ -884,6 +896,9 @@
}
}
}
.cp-toolbar-notifications {
margin-left: 10px;
}
.cp-toolbar-link {
display: inline-flex;
align-items: center;
@@ -917,6 +932,7 @@
order: 6;
line-height: @toolbar_top-height;
color: white;
.cp-toolbar-notifications { order: 1; }
.cp-toolbar-new { order: 2; }
.cp-toolbar-user-dropdown { order: 3; }
.cp-toolbar-backup { order: 4; } // TODO drive migration to secure iframe