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

Merge branch 'staging' into responsiveContextmenu

Browse Source
This commit is contained in:
ClemDee
2019-08-12 12:15:44 +02:00
parent 5e1426bee0 ecffe23c08
commit 6bcf9f13d3
98 changed files with 3150 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
customize.dist/src/less2/include/colortheme.less
View File

@@ -137,6 +137,15 @@
@colortheme_admin-color: #FFF;
@colortheme_admin-warn: #ffae00;
@colortheme_notifications-bg: #4ae397;
@colortheme_notifications-color: #000;
@colortheme_notifications-warn: #e34a85;
@colortheme_support-bg: #42d1f4;
@colortheme_support-color: #000;
@colortheme_support-warn: #9A37F7;
// Sidebar layout (profile / settings)
@colortheme_sidebar-active: #fff;
@colortheme_sidebar-left-bg: #eee;

3
customize.dist/src/less2/include/contextmenu.less
View File

@@ -23,7 +23,7 @@
}
.dropdown-toggle {
transform: rotate(270deg);
margin-left: 10px;
margin-left: 1rem;
float: right;
}
.dropdown-menu {
@@ -40,6 +40,7 @@
.fa, .cptools {
margin-right: 1rem;
color: @colortheme_context-menu-icon-color;
width: 16px;
}
}
}

32
customize.dist/src/less2/include/notifications.less
View File

@@ -1,4 +1,5 @@
@import (reference) "./colortheme-all.less";
@import (reference) "./avatar.less";
.notifications_main() {
--LessLoader_require: LessLoader_currentFile();
@@ -14,6 +15,7 @@
display: flex;
.cp-notification-content {
flex: 1;
align-items: stretch;
min-width: 0;
p {
word-break: break-word;
@@ -28,8 +30,7 @@
.cp-notification-dismiss {
color: black;
width: 25px;
height: 100%;
display: none;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
@@ -39,6 +40,33 @@
}
}
}
hr {
margin: 0px !important;
}
.cp-notifications-gotoapp {
p {
padding: 10px 0 !important;
text-align: center !important;
font-weight: bold;
cursor: pointer;
&:hover {
background-color: rgba(0,0,0,0.1);
}
}
}
.cp-notifications-requestedit-verified {
display: flex;
align-items: center;
&> span.cp-avatar {
.avatar_main(30px);
}
&> span {
margin-right: 10px;
}
&> p {
margin: 0;
}
}
}

9
customize.dist/src/less2/include/sidebar-layout.less
View File

@@ -90,12 +90,21 @@
button.btn {
@button-bg: @colortheme_sidebar-button-bg;
@button-red-bg: @colortheme_sidebar-button-red-bg;
@button-alt-bg: @colortheme_sidebar-button-alt-bg;
background-color: @button-bg;
border-color: darken(@button-bg, 10%);
color: white;
&:hover {
background-color: darken(@button-bg, 10%);
}
&.btn-secondary {
background-color: @button-alt-bg;
border-color: darken(@button-alt-bg, 10%);
color: black;
&:hover {
background-color: darken(@button-alt-bg, 10%);
}
}
&.btn-danger {
background-color: @button-red-bg;
border-color: darken(@button-red-bg, 10%);

86
customize.dist/src/less2/include/support.less Normal file
View File

@@ -0,0 +1,86 @@
@import (reference) "./colortheme-all.less";
.support_main () {
@ticket-bg: #F7F7F7;
@msg-bg: #eee;
@fromme-bg: #ddd;
.cp-support-form-container {
[type="text"] {
width: @sidebar_button-width;
margin-bottom: 10px;
}
textarea {
width: 2*@sidebar_button-width;
max-width: 90%;
padding: 10px 15px;
height: 300px;
}
}
.cp-support-container {
.cp-support-list-ticket {
display: flex;
flex-flow: column;
background-color: @ticket-bg;
padding: 10px;
width: 1200px;
max-width: 90%;
margin: 5px auto;
.cp-support-list-message {
background-color: @msg-bg;
margin: 2px;
padding: 2px 5px;
.cp-support-fromme {
background-color: @fromme-bg;
}
.cp-support-showdata {
cursor: pointer;
background-color: @fromme-bg;
.cp-support-message-data {
display: none;
cursor: default;
}
}
.cp-support-message-time {
float: right;
}
pre {
margin-bottom: 0;
white-space: pre-wrap;
&.cp-support-message-content {
margin-top: 10px;
margin-bottom: 10px;
}
}
}
.cp-support-list-actions {
order: 3;
.cp-support-hide {
display: none;
}
}
.cp-support-form-container {
order: 2;
}
&.cp-support-list-closed {
.cp-support-list-actions {
display: block !important;
.cp-support-answer, .cp-support-close {
display: none;
}
.cp-support-hide {
display: inline;
}
}
.cp-support-form-container {
display: none !important;
}
}
button {
margin-left: 2px;
margin-right: 5px;
}
}
}
}