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

Merge branch 'mute' into sidebarbuttons

Browse Source
This commit is contained in:
yflory
2019-12-16 14:46:36 +01:00
parent f64c11dc3a 47128802a2
commit 07ef60418b
37 changed files with 1019 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,9 @@
margin-bottom: @alertify_padding-base;
margin: 0;
overflow: auto;
:last-child {
margin-bottom: 0;
}
}
.alertify-tabs {
max-height: 100%;
@@ -219,6 +222,7 @@
::-ms-input-placeholder { /* Microsoft Edge */
color: @cryptpad_color_grey;
}
span.cp-password-container {
display: flex;
align-items: center;
@@ -413,5 +417,33 @@
overflow-x: auto;
}
}
// Bootstrap Alerts
.alert {
margin: 0px 0px @alertify_padding-base 0px;
font-size: 12px;
padding: 5px;
border-radius: 0px;
i {
margin-right: 10px;
}
&.alert-primary {
background-color: @alertify-base;
color: @alertify-fg;
border-color: @alertify-fg;
a {
color: @alertify-fg;
text-decoration: underline;
}
}
&.dismissable {
display: flex;
align-items: center;
span.fa-times {
font-size: @colortheme_app-font-size;
margin-left: 20px;
cursor: pointer;
}
}
}
}