mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:humhub/humhub into develop

Browse Source
This commit is contained in:
Lucas Bartholemy 2022-12-30 13:29:03 +01:00
commit b01eed9872
19 changed files with 459 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG-DEV.md
View File

@ -5,6 +5,5 @@ HumHub Changelog (DEVELOP)
1.14.0 (February 28, 2023)
--------------------------
No changes
- Enh #4803: Added more panel styles (`panel-info` and `panel-primary`)
- Enh #5972: Removed old vendor CSS prefixes (e.g. `-moz` or `-webkit`)

5
static/less/base.less
View File

@ -69,8 +69,6 @@ input[type=text],
input[type=password],
input[type=select] {
/* Remove First */
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
}
@ -123,8 +121,5 @@ span.likeLinkContainer .like.disabled, span.likeLinkContainer .unlike.disabled {
word-wrap: normal;
overflow-wrap: normal;
word-break: normal;
-moz-hyphens: none;
hyphens: none;
}

2
static/less/button.less
View File

@ -4,9 +4,7 @@
.btn {
float: none;
border: none;
-webkit-box-shadow: none;
box-shadow: none;
-moz-box-shadow: none;
background-image: none;
text-shadow: none;
border-radius: 3px;

1
static/less/comment.less
View File

@ -55,7 +55,6 @@
.comment-blocked-user {
img[data-contentcontainer-id] {
-webkit-filter: grayscale(100%);
filter: grayscale(100%);
}
}

1
static/less/datepicker.less
View File

@ -11,7 +11,6 @@
border-radius: 0 !important;
background: @background-color-main;
color: @text-color-highlight !important;
-webkit-box-shadow: 0 6px 6px rgba(0, 0, 0, 0.1);
box-shadow: 0 6px 6px rgba(0, 0, 0, 0.1);
}

25
static/less/form.less
View File

@ -59,8 +59,6 @@ textarea {
}
select.form-control:not([multiple]) {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
background-image: url("../img/select_arrow.png") !important;
background-repeat: no-repeat;
@ -89,30 +87,11 @@ label.control-label {
color: @text-color-soft3 !important;
}
::-webkit-input-placeholder {
color: @text-color-soft3 !important;
}
::-moz-placeholder {
color: @text-color-soft3 !important;
}
/* firefox 19+ */
:-ms-input-placeholder {
color: @text-color-soft3 !important;
}
/* hide native password reveal icons */
input::-ms-clear, input::-ms-reveal {
display: none;
}
/* ie */
input:-moz-placeholder {
color: @text-color-soft !important;
}
// Placeholder text for empty content
.placeholder {
padding: 10px;
@ -271,7 +250,6 @@ div.form-group {
.has-error .form-control,
.has-error .form-control:focus {
border-color: @danger;
-webkit-box-shadow: none;
box-shadow: none;
}
@ -287,7 +265,6 @@ div.form-group {
.has-success .form-control,
.has-success .form-control:focus {
border-color: @success;
-webkit-box-shadow: none;
box-shadow: none;
}
@ -303,7 +280,6 @@ div.form-group {
.has-warning .form-control,
.has-warning .form-control:focus {
border-color: @warning;
-webkit-box-shadow: none;
box-shadow: none;
}
@ -354,4 +330,3 @@ div.form-group {
display: inline;
}
}

18
static/less/loader.less
View File

@ -15,44 +15,26 @@
background-color: @info;
border-radius: 100%;
display: inline-block;
-webkit-animation: sk-threeBounceDelay 1.4s infinite ease-in-out;
animation: sk-threeBounceDelay 1.4s infinite ease-in-out;
/* Prevent first frame from flickering when animation starts */
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
}
.sk-spinner-three-bounce .sk-bounce1 {
-webkit-animation-delay: -0.32s;
animation-delay: -0.32s;
}
.sk-spinner-three-bounce .sk-bounce2 {
-webkit-animation-delay: -0.16s;
animation-delay: -0.16s;
}
@-webkit-keyframes sk-threeBounceDelay {
0%,
80%,
100% {
-webkit-transform: scale(0);
transform: scale(0);
}
40% {
-webkit-transform: scale(1);
transform: scale(1);
}
}
@keyframes sk-threeBounceDelay {
0%,
80%,
100% {
-webkit-transform: scale(0);
transform: scale(0);
}
40% {
-webkit-transform: scale(1);
transform: scale(1);
}
}

2
static/less/login.less
View File

@ -34,8 +34,6 @@
.panel {
box-shadow: 0 0 15px #627d92;
-moz-box-shadow: 0 0 15px #627d92;
-webkit-box-shadow: 0 0 15px #627d92;
.panel-heading,
.panel-body {

1
static/less/mentioning.less
View File

@ -13,7 +13,6 @@
font-weight: 400;
border: 1px solid #d7d7d7;
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
min-width: 120px;
max-width: 265px;

6
static/less/mixins.less
View File

@ -128,11 +128,7 @@
.text-break {
word-wrap: break-word;
overflow-wrap: break-word;
-ms-word-break: break-all;
word-break: break-word;
-ms-hyphens: auto;
-moz-hyphens: auto;
-webkit-hyphens: auto;
hyphens: auto;
}
@ -140,7 +136,5 @@
// Thumbnails
// --------------------------------------------------
.img-rounded {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}

6
static/less/modal.less
View File

@ -11,8 +11,6 @@
// --------------------------------------------------
.modal-dialog.fadeIn,
.modal-dialog.pulse {
-webkit-animation-duration: 200ms;
-moz-animation-duration: 200ms;
animation-duration: 200ms;
}
@ -96,11 +94,7 @@ body.modal-open {
}
.modal-content {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
box-shadow: 0 2px 26px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.1);
-webkit-box-shadow: 0 2px 26px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 2px 26px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.1);
border: none;
.modal-header {

20
static/less/panel.less
View File

@ -1,10 +1,11 @@
//
// Panel
//
.panel {
.text-break();
border: none;
background-color: @background-color-main;
box-shadow: 0 0 3px #dadada;
-webkit-box-shadow: 0 0 3px #dadada;
-moz-box-shadow: 0 0 3px #dadada;
border-radius: 4px;
position: relative;
margin-bottom: 15px;
@ -159,20 +160,7 @@
border-bottom-left-radius: 3px;
color: #fff;
pointer-events: none;
background: -moz-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.38) 100%);
/* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(0, 0, 0, 0)), color-stop(1%, rgba(0, 0, 0, 0)), color-stop(100%, rgba(0, 0, 0, 0.38)));
/* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.38) 100%);
/* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.38) 100%);
/* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.38) 100%);
/* IE10+ */
background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 1%, rgba(0, 0, 0, 0.38) 100%);
/* W3C */
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#94000000', GradientType=0);
/* IE6-9 */
h1 {
font-size: 30px;
@ -224,8 +212,6 @@
.panel.pulse,
.panel.fadeIn {
-webkit-animation-duration: 200ms;
-moz-animation-duration: 200ms;
animation-duration: 200ms;
}

477
static/less/popover.less
View File

@ -1,27 +1,195 @@
//
// popover
// --------------------------------------------------
.popover {
border: 1px solid rgba(0, 0, 0, 0.15);
border-radius: 4px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-moz-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
// Content create form
.contentForm_options {
margin-top: 10px;
min-height: 29px;
.popover-title {
background: none;
border-bottom: none;
color: @text-color-highlight;
font-weight: 300;
font-size: 16px;
padding: 15px;
.btn_container {
position: relative;
.label-public {
position: absolute;
right: 40px;
top: 11px;
}
}
}
#content-topic-bar {
margin-top: 5px;
text-align: right;
.label {
margin-left: 4px;
}
}
#contentFormBody {
.form-group, .help-block-error {
margin: 0;
}
}
// Empty stream info
.placeholder-empty-stream {
background-image: url("../img/placeholder-postform-arrow.png");
background-repeat: no-repeat;
padding: 37px 0 0 70px;
margin-left: 90px;
}
#streamUpdateBadge {
text-align: center;
z-index: 9999;
margin-bottom: 15px;
margin-top: 15px;
.label {
border-radius: 10px;
font-size: 0.8em !important;
padding: 5px 10px;
}
}
#wallStream {
.back_button_holder {
padding-bottom: 15px;
}
}
@wallEntryInnerPadding: 10px;
@wallEntryContentLeftPadding: 50px;
@wallEntryContentLeftPaddingMobile: 0;
// Wall-Entries
.wall-entry {
position: relative;
.panel .panel-body {
padding: @wallEntryInnerPadding;
}
.popover-content {
font-size: 13px;
padding: 5px 15px;
color: @text-color-highlight;
.wall-entry-header {
color: @text-color-highlight;
position: relative;
padding-bottom: @wallEntryInnerPadding;
margin-bottom: @wallEntryInnerPadding;
border-bottom: 1px solid #eeeeee;
.img-space {
top: 25px;
left: 25px;
}
.wall-entry-container-link {
color: @link;
}
.stream-entry-icon-list {
position: absolute;
top: 0;
right: 25px;
display: inline-block;
padding-top: 2px;
i {
padding-right: 5px;
}
.icon-pin {
color: @danger;
}
.fa-archive {
color: @warning;
}
}
.wall-entry-header-image {
display: table-cell;
width: 40px;
padding-right: @wallEntryInnerPadding;
.fa {
font-size: 2.39em;
color: @info;
margin-top: 5px;
}
}
.wall-entry-header-info {
display: table-cell;
padding-right: 30px;
width: 100%;
.media-heading {
font-size: 15px;
padding-top: 1px;
margin-bottom: 3px;
}
i.archived {
color: @warning;
}
}
.preferences {
position: absolute;
right: 0;
top: 0;
}
.media-subheading {
i.fa-caret-right {
margin: 0 2px;
}
.wall-entry-icons {
display: inline-block;
i {
margin-right: 2px;
}
}
.time, i, span {
font-size: 11px;
white-space: nowrap;
}
}
}
.wall-entry-body {
padding-left: @wallEntryContentLeftPadding;
padding-right: @wallEntryContentLeftPadding;
.wall-entry-content {
margin-bottom: 5px;
.post-short-text {
font-size: 1.6em;
.emoji {
width: 20px;
}
}
}
audio, video {
width: 100%;
}
}
.wall-stream-footer {
.wall-stream-addons {
.files {
margin-bottom: 5px;
}
}
}
.content {
a {
color: @link;
}
@ -31,8 +199,273 @@
}
}
.popover-navigation {
padding: 15px;
.media {
overflow: visible;
}
.well {
margin-bottom: 0;
.comment {
.show-all-link {
font-size: 12px;
cursor: pointer;
}
}
}
.media-heading {
font-size: 14px;
padding-top: 1px;
margin-bottom: 3px;
.labels {
padding-right: 32px;
}
.viaLink {
font-size: 13px;
i {
color: @text-color-soft;
padding-left: 4px;
padding-right: 4px;
}
}
}
.media-subheading {
color: @text-color-soft;
font-size: 12px;
.time {
font-size: 12px;
white-space: nowrap;
}
}
[data-ui-richtext] {
h1 {
font-size: 1.45em;
font-weight: normal;
}
h2 {
font-size: 1.3em;
font-weight: normal;
}
h3 {
font-size: 1.2em;
font-weight: normal;
}
h4 {
font-size: 1.1em;
font-weight: normal;
}
h5 {
font-size: 1.0em;
font-weight: normal;
}
h6 {
font-size: .85em;
font-weight: normal;
}
}
}
@media (max-width: 767px) {
.wall-entry .wall-entry-body {
padding-left: @wallEntryContentLeftPaddingMobile;
padding-right: @wallEntryContentLeftPaddingMobile;
}
#wallStream {
.back_button_holder {
padding-bottom: 5px;
text-align:center;
}
}
}
.wall-entry-controls a {
font-size: 11px;
color: @link !important;
margin-top: 10px;
margin-bottom: 0;
}
#wall-stream-filter-nav {
font-size: 12px;
margin-bottom: 10px;
padding-top: 2px;
border-radius: 0 0 4px 4px;
.wall-stream-filter-root {
margin: 0;
border: 0 !important;
}
.filter-panel {
padding: 0 10px;
}
.wall-stream-filter-head {
padding: 5px 5px 10px 5px;
border-bottom: 1px solid #ddd;
}
.wall-stream-filter-body {
overflow: hidden;
background-color: @background-color-secondary;
border: 1px solid #ddd;
border-top: 0;
border-radius: 0 0 4px 4px;
}
hr {
margin: 5px 0 0 0;
}
.topic-remove-label {
float: left;
}
.topic-remove-label, .content-type-remove-label {
margin-right: 6px;
}
.select2 {
width: 260px !important;
margin-bottom: 5px;
margin-top: 2px;
.select2-search__field {
height: 25px !important;
}
.select2-selection__choice {
height: 23px !important;
span, i {
line-height: 19px !important;
}
.img-rounded {
width: 18px !important;
height: 18px !important;
}
}
}
.wall-stream-filter-bar {
display: inline;
float: right;
white-space: normal;
.label {
height: 18px;
padding-top: 4px;
background-color: @background-color-main;
}
.btn, .label {
box-shadow: 0 0 2px @text-color-secondary;
}
}
}
@media (max-width: 767px) {
#wall-stream-filter-nav {
.wall-stream-filter-root {
white-space: nowrap;
}
.wall-stream-filter-body {
overflow: auto;
}
margin-bottom: 5px;
}
}
.filter-root {
margin: 15px;
.row {
display: table !important;
}
.filter-panel {
padding: 0 5px;
display: table-cell !important;
float: none;
.filter-block {
strong {
margin-bottom: 5px;
}
ul.filter-list {
list-style: none;
padding: 0;
margin: 0 0 5px;
li {
font-size: 12px;
padding: 2px;
a {
color: @text-color-highlight;
}
}
}
}
div.filter-block:last-of-type {
ul.filter-list {
margin: 0;
}
}
}
.filter-panel + .filter-panel {
border-left: 2px solid @background-color-page;
}
}
.stream-entry-loader {
float: right;
margin-top: 5px;
}
.load-suppressed {
margin-top: -17px;
margin-bottom: 15px;
text-align: center;
a {
display: inline-block;
background-color: white;
padding: 5px;
border-radius: 0 0 4px 4px;
border: 1px solid #ddd;
font-size: 11px
}
}
@media print {
.wall-entry {
page-break-inside: avoid;
}
#wall-stream-filter-nav,
#contentFormBody {
display: none;
}
}

1
static/less/progress.less
View File

@ -11,7 +11,6 @@
.progress-bar-info {
background-color: @info;
-webkit-box-shadow: none;
box-shadow: none;
}

15
static/less/richtext.less
View File

@ -50,7 +50,6 @@
}
.ProseMirror-tooltip .ProseMirror-menu {
width: -webkit-fit-content;
width: fit-content;
white-space: pre;
}
@ -252,7 +251,6 @@
left: 0;
right: 0;
z-index: 10;
-moz-box-sizing: border-box;
box-sizing: border-box;
overflow: visible;
}
@ -276,7 +274,6 @@
left: 0;
right: 0;
z-index: 10;
-moz-box-sizing: border-box;
box-sizing: border-box;
overflow: visible;
margin-top: -25px;
@ -289,12 +286,6 @@
float: left;
}
@-moz-document url-prefix() {
.ProseMirror-menubar {
margin-top: -26px;
}
}
}
.ProsemirrorEditor {
@ -303,7 +294,6 @@
position: relative;
word-wrap: break-word;
white-space: pre-wrap;
-webkit-font-variant-ligatures: none;
font-variant-ligatures: none;
}
@ -327,10 +317,6 @@
background: transparent;
}
.ProseMirror-hideselection *::-moz-selection {
background: transparent;
}
.ProseMirror-selectednode {
outline: 2px dashed #8cf;
}
@ -362,7 +348,6 @@
}
.ProseMirror-tooltip .ProseMirror-menu {
width: -webkit-fit-content;
width: fit-content;
white-space: pre;
}

2
static/less/stream.less
View File

@ -394,8 +394,6 @@
.btn, .label {
box-shadow: 0 0 2px @text-color-secondary;
-webkit-box-shadow: 0 0 2px @text-color-secondary;
-moz-box-shadow: 0 0 2px @text-color-secondary;
}
}
}

1
static/less/tooltip.less
View File

@ -47,5 +47,4 @@
.tooltip.in {
opacity: 1;
filter: alpha(opacity=100);
}

2
static/less/topbar.less
View File

@ -282,8 +282,6 @@
background-color: #fff;
z-index: 1029;
background-image: none;
-webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
border-bottom: 1px solid #d4d4d4;

2
static/less/user-feedback.less
View File

@ -123,7 +123,5 @@
}
img.bounceIn {
-webkit-animation-duration: 800ms;
-moz-animation-duration: 800ms;
animation-duration: 800ms;
}