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 2018-12-10 18:31:09 +01:00
commit 7b5ab38f59
32 changed files with 735 additions and 1039 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
composer.json
View File

@ -14,28 +14,26 @@
"minimum-stability": "stable",
"require": {
"php": ">=5.6.0",
"bower-asset/animate.css": "*",
"bower-asset/autosize": "1.*",
"bower-asset/bluebird": "^3.3.5",
"bower-asset/blueimp-file-upload": "9.24.*",
"bower-asset/bootstrap-markdown": "2.10.*",
"bower-asset/caret.js": "0.2.2",
"bower-asset/clipboard.js": "*",
"bower-asset/fontawesome": "^4.7.0",
"bower-asset/html5shiv": "^3.7",
"bower-asset/imagesloaded": "*",
"bower-asset/jPlayer": "2.9.*",
"bower-asset/jquery-color": "^2.1.2",
"bower-asset/jquery-knob": "1.2.*",
"bower-asset/jquery-nicescroll": "3.6.*",
"bower-asset/jquery-placeholder": "^2.3.0",
"bower-asset/jquery-timeago": "1.5.*",
"bower-asset/jquery-timeentry": "^2.0",
"bower-asset/jquery.cookie": "^1.4.1",
"bower-asset/nprogress": "*",
"bower-asset/open-sans-fontface": "^1.4",
"bower-asset/select2": "^4.0.4",
"bower-asset/select2-bootstrap-theme": "0.1.0-beta.4",
"npm-asset/animate.css": "*",
"npm-asset/jquery-autosize": "1.*",
"npm-asset/bluebird": "^3.3.5",
"npm-asset/blueimp-file-upload": "9.24.*",
"npm-asset/bootstrap-markdown": "2.10.*",
"npm-asset/clipboard-polyfill": "*",
"npm-asset/font-awesome": "^4.7.0",
"npm-asset/imagesloaded": "*",
"npm-asset/jPlayer": "2.9.*",
"npm-asset/jquery-color": "*",
"npm-asset/jquery-knob": "1.2.*",
"npm-asset/jquery.nicescroll": "3.6.8",
"npm-asset/timeago": "^1.6.3",
"npm-asset/kbw.timeentry": "^2.0",
"npm-asset/jquery.cookie": "^1.4.1",
"npm-asset/nprogress": "*",
"npm-asset/open-sans-fontface": "^1.4",
"npm-asset/select2": "^4.0.4",
"npm-asset/select2-bootstrap-theme": "0.1.0-beta.4",
"npm-asset/bootstrap-tour": "0.11.0",
"cebe/markdown": "1.0.2",
"firebase/php-jwt": "^5.0",
"jbroadway/urlify": "^1.0",

1224
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
protected/humhub/assets/AnimateCssAsset.php
View File

@ -21,7 +21,7 @@ class AnimateCssAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/animate.css';
public $sourcePath = '@npm/animate.css';
/**
* @inheritdoc

4
protected/humhub/assets/AppAsset.php
View File

@ -56,13 +56,11 @@ class AppAsset extends AssetBundle
'humhub\assets\JqueryTimeAgoAsset',
'humhub\assets\JqueryWidgetAsset',
'humhub\assets\JqueryColorAsset',
'humhub\assets\JqueryPlaceholderAsset',
'humhub\assets\FontAwesomeAsset',
'humhub\assets\BlueimpFileUploadAsset',
'humhub\assets\JqueryHighlightAsset',
'humhub\assets\JqueryCookieAsset',
'humhub\assets\JqueryAutosizeAsset',
'humhub\assets\AtJsAsset',
'humhub\assets\AnimateCssAsset',
'humhub\assets\CoreApiAsset',
'humhub\modules\content\assets\ProseMirrorRichTextAsset',
@ -79,8 +77,6 @@ class AppAsset extends AssetBundle
'humhub\modules\ui\filter\assets\FilterAsset',
'humhub\modules\comment\assets\CommentAsset',
'humhub\assets\NProgressAsset',
'humhub\assets\IE9FixesAsset',
'humhub\assets\IEFixesAsset',
'humhub\assets\PagedownConverterAsset',
'humhub\assets\ClipboardJsAsset',
'humhub\assets\ImagesLoadedAsset',

2
protected/humhub/assets/BluebirdAsset.php
View File

@ -21,7 +21,7 @@ class BluebirdAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/bluebird';
public $sourcePath = '@npm/bluebird';
/**
* @inheritdoc

2
protected/humhub/assets/BlueimpFileUploadAsset.php
View File

@ -21,7 +21,7 @@ class BlueimpFileUploadAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/blueimp-file-upload/js';
public $sourcePath = '@npm/blueimp-file-upload/js';
/**
* @inheritdoc

2
protected/humhub/assets/BootstrapMarkdownAsset.php
View File

@ -22,7 +22,7 @@ class BootstrapMarkdownAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/bootstrap-markdown';
public $sourcePath = '@npm/bootstrap-markdown';
/**
* @inheritdoc

2
protected/humhub/assets/ClipboardJsAsset.php
View File

@ -21,7 +21,7 @@ class ClipboardJsAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/clipboard.js';
public $sourcePath = '@npm/clipboard-polyfill';
/**
* @inheritdoc

2
protected/humhub/assets/FontAwesomeAsset.php
View File

@ -21,7 +21,7 @@ class FontAwesomeAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/fontawesome';
public $sourcePath = '@npm/font-awesome';
/**
* @inheritdoc

2
protected/humhub/assets/ImagesLoadedAsset.php
View File

@ -21,7 +21,7 @@ class ImagesLoadedAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/imagesloaded';
public $sourcePath = '@npm/imagesloaded';
/**
* @inheritdoc

2
protected/humhub/assets/JplayerAsset.php
View File

@ -21,7 +21,7 @@ class JplayerAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jplayer/dist';
public $sourcePath = '@npm/jplayer/dist';
/**
* @inheritdoc

2
protected/humhub/assets/JqueryAutosizeAsset.php
View File

@ -21,7 +21,7 @@ class JqueryAutosizeAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/autosize';
public $sourcePath = '@npm/jquery-autosize';
/**
* @inheritdoc

2
protected/humhub/assets/JqueryColorAsset.php
View File

@ -21,7 +21,7 @@ class JqueryColorAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery-color';
public $sourcePath = '@npm/jquery-color';
/**
* @inheritdoc

2
protected/humhub/assets/JqueryCookieAsset.php
View File

@ -21,7 +21,7 @@ class JqueryCookieAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery.cookie';
public $sourcePath = '@npm/jquery.cookie';
/**
* @inheritdoc

2
protected/humhub/assets/JqueryKnobAsset.php
View File

@ -24,7 +24,7 @@ class JqueryKnobAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery-knob';
public $sourcePath = '@npm/jquery-knob';
/**
* @inheritdoc

2
protected/humhub/assets/JqueryNiceScrollAsset.php
View File

@ -21,7 +21,7 @@ class JqueryNiceScrollAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery-nicescroll';
public $sourcePath = '@npm/jquery.nicescroll';
/**
* @inheritdoc

31
protected/humhub/assets/JqueryPlaceholderAsset.php
View File

@ -1,31 +0,0 @@
<?php
/**
* @link https://www.humhub.org/
* @copyright Copyright (c) 2017 HumHub GmbH & Co. KG
* @license https://www.humhub.com/licences
*/
namespace humhub\assets;
use yii\web\AssetBundle;
/**
* jquery-placeholder
*
* @author luke
*/
class JqueryPlaceholderAsset extends AssetBundle
{
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery-placeholder';
/**
* @inheritdoc
*/
public $js = ['jquery.placeholder.min.js'];
}

2
protected/humhub/assets/JqueryTimeAgoAsset.php
View File

@ -22,7 +22,7 @@ class JqueryTimeAgoAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery-timeago';
public $sourcePath = '@npm/timeago';
/**
* @inheritdoc

2
protected/humhub/assets/JqueryTimeAgoLocaleAsset.php
View File

@ -23,7 +23,7 @@ class JqueryTimeAgoLocaleAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery-timeago';
public $sourcePath = '@npm/timeago';
/**
* @var array language mapping between humhub locale id and timeago messages

2
protected/humhub/assets/JqueryTimeEntryAsset.php
View File

@ -26,7 +26,7 @@ class JqueryTimeEntryAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/jquery-timeentry';
public $sourcePath = '@npm/kbw.timeentry';
/**
* @inheritdoc

2
protected/humhub/assets/NProgressAsset.php
View File

@ -22,7 +22,7 @@ class NProgressAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/nprogress';
public $sourcePath = '@npm/nprogress';
/**
* @inheritdoc

2
protected/humhub/assets/OpenSansAsset.php
View File

@ -21,7 +21,7 @@ class OpenSansAsset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/open-sans-fontface';
public $sourcePath = '@npm/open-sans-fontface';
/**
* @inheritdoc

2
protected/humhub/assets/Select2Asset.php
View File

@ -21,7 +21,7 @@ class Select2Asset extends AssetBundle
/**
* @inheritdoc
*/
public $sourcePath = '@bower/select2';
public $sourcePath = '@npm/select2';
/**
* @inheritdoc

4
protected/humhub/docs/CHANGELOG_DEV.md
View File

@ -8,6 +8,10 @@ HumHub Change Log (DEVELOP)
- Enh: GroupPermissionManager - allow to query users by given permission
- Enh: Automatic migrate DB collations from utf8 to utf8mb4
- Enh: Added Icon widget as wrapper class
- Enh: Moved from bower to npm assets
- Chng: Removed `jquery-placeholder` asset and dependency
- Chng: Removed `atwho` asset and dependency
- Cnng: Removed old IE support

4
protected/humhub/docs/guide/theme/migrate-1.4.md Normal file
View File

@ -0,0 +1,4 @@
# Theme Migration to HumHub 1.4
- Added jquery.atwho.modified.css to `mentioning.less`

39
static/css/ie.css
View File

@ -1,39 +0,0 @@
.hideInIE8 {
display: none;
}
.navbar-inner {
filter: none;
}
.box,
.discussions ul li {
border-top: none;
border-left: 1px solid #e4e6eb;
border-right: 1px solid #e4e6eb;
border-bottom: 2px solid #e4e6eb;
}
a.brand {
position: absolute;
left: 0px;
}
.container-fluid-full {
overflow: hidden;
position: relative;
height: 100%;
}
.container-fluid-full #content {
width: 85.578%;
padding: 28px;
margin: 0px 0px;
margin-left: 14.422% !important;
}
.container-fluid-full #sidebar-left {
margin-left: 0px !important;
position: absolute;
height: 100%;
}
footer {
position: relative;
}

86
static/css/ie9.css
View File

@ -1,86 +0,0 @@
.navbar-inner {
filter: none;
}
.dark {
right: -17px;
}
.verticalChart .singleBar .bar .value span{
color: #3b3b41;
}
hr {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y5ZjlmOSIgc3RvcC1vcGFjaXR5PSIwLjI1Ii8+CiAgICA8c3RvcCBvZmZzZXQ9IjUwJSIgc3RvcC1jb2xvcj0iI2Y5ZjlmOSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmOWY5ZjkiIHN0b3Atb3BhY2l0eT0iMC4yNSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.box-header {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmNGY0ZjQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.btn3d:before {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2ViZWFlOCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.login-box {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y1ZjVmNSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjE5JSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9Ijc3JSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmNWY1ZjUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderOverlay,
.progressBarOverlay {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2ViZWFlOCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.slider {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZjZmNmYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmYWZhZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderVertical {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2ViZWFlOCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderBlue .ui-slider-range, .progressBlue .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY3YzJlZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiMyZmFiZTkiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderGreen .ui-slider-range, .progressGreen .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2JkZWE3NCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNiNmUzNzAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderDarkGreen .ui-slider-range, .progressDarkGreen .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc4Y2Q1MSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM1YWFkMzQiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderPink .ui-slider-range, .progressPink .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U4NGM4YSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlMjE2NjgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderOrange .ui-slider-range, .progressOrange .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZhNjAzZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmYTU4MzMiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderLightOrange .ui-slider-range, .progressLightOrange .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZhYmIzZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmNGE1MDYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderRed .ui-slider-range, .progressRed .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmNTQ1NCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZjAwMDAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.sliderYellow .ui-slider-range, .progressYellow .ui-progressbar-value {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VhZTg3NCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlM2UyNzAiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.progress {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZjZmNmYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmYWZhZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.progressSlim {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZjZmNmYyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmYWZhZmEiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}
.quick-button,
.quick-button-small {
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZhZmFmYSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlZmVmZWYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
}

97
static/css/jquery.atwho.modified.css
View File

@ -1,97 +0,0 @@
.atwho-view {
position: absolute;
top: 0;
left: 0;
display: none;
margin-top: 18px;
background: white;
color: #555555;
font-size: 14px;
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;
z-index: 11110 !important;
padding: 5px 0;
}
.atwho-view strong, .atwho-view b {
font-weight: normal;
}
.atwho-view ul li.hint {
background: #fff !important;
border-left: 3px solid transparent !important;
font-size: 12px;
color: #999;
}
.atwho-view .cur small {
color: red;
}
.atwho-view strong {
background-color: #f9f0d2;
}
.atwho-view .cur strong {
background-color: #f9f0d2;
}
.atwho-view ul {
/* width: 100px; */
list-style: none;
padding: 0;
margin: auto;
}
.atwho-view ul li {
display: block;
padding: 5px 10px;
border-left: 3px solid transparent;
padding: 4px 15px 4px 8px;
cursor: pointer;
/* border-top: 1px solid #C8C8C8; */
}
.atwho-view small {
font-size: smaller;
color: #777;
font-weight: normal;
}
.atwho-input.form-control {
min-height: 36px;
height: auto;
padding-right: 95px;
word-wrap: break-word;
}
.atwho-input p {
padding: 0;
margin: 0;
}
.atwho-placeholder {
color: #bebebe !important;
}
.atwho-emoji-entry {
float: left;
padding: 4px !important;
margin: 0px !important;
border:none !important;
}
.atwho-emoji-entry:hover, .atwho-emoji-entry:active, .atwho-emoji-entry:focus {
padding: 4px !important;
margin: 0px !important;
border:none !important;
background-color: #f7f7f7 !important;
border-radius: 3px;
}

97
static/css/jquery.atwho.modified_1.css
View File

@ -1,97 +0,0 @@
.atwho-view {
position: absolute;
top: 0;
left: 0;
display: none;
margin-top: 18px;
background: white;
color: #555555;
font-size: 14px;
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;
z-index: 11110 !important;
padding: 5px 0;
}
.atwho-view strong, .atwho-view b {
font-weight: normal;
}
.atwho-view ul li.hint {
background: #fff !important;
border-left: 3px solid transparent !important;
font-size: 12px;
color: #999;
}
.atwho-view .cur small {
color: red;
}
.atwho-view strong {
background-color: #f9f0d2;
}
.atwho-view .cur strong {
background-color: #f9f0d2;
}
.atwho-view ul {
/* width: 100px; */
list-style: none;
padding: 0;
margin: auto;
}
.atwho-view ul li {
display: block;
padding: 5px 10px;
border-left: 3px solid transparent;
padding: 4px 15px 4px 8px;
cursor: pointer;
/* border-top: 1px solid #C8C8C8; */
}
.atwho-view small {
font-size: smaller;
color: #777;
font-weight: normal;
}
.atwho-input.form-control {
min-height: 36px;
height: auto;
padding-right: 95px;
word-wrap: break-word;
}
.atwho-input p {
padding: 0;
margin: 0;
}
.atwho-placeholder {
color: #bebebe !important;
}
.atwho-emoji-entry {
float: left;
padding: 4px !important;
margin: 0px !important;
border:none !important;
}
.atwho-emoji-entry:hover, .atwho-emoji-entry:active, .atwho-emoji-entry:focus {
padding: 4px !important;
margin: 0px !important;
border:none !important;
background-color: #f7f7f7 !important;
border-radius: 3px;
}

102
static/less/mentioning.less
View File

@ -1,6 +1,106 @@
//
//atwho Plugin
//Mentioning (uses old atwho style)
//
.atwho-view {
position: absolute;
top: 0;
left: 0;
display: none;
margin-top: 18px;
background: white;
color: #555555;
font-size: 14px;
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;
z-index: 11110 !important;
padding: 5px 0;
}
.atwho-view strong, .atwho-view b {
font-weight: normal;
}
.atwho-view ul li.hint {
background: #fff !important;
border-left: 3px solid transparent !important;
font-size: 12px;
color: #999;
}
.atwho-view .cur small {
color: red;
}
.atwho-view strong {
background-color: #f9f0d2;
}
.atwho-view .cur strong {
background-color: #f9f0d2;
}
.atwho-view ul {
/* width: 100px; */
list-style: none;
padding: 0;
margin: auto;
}
.atwho-view ul li {
display: block;
padding: 5px 10px;
border-left: 3px solid transparent;
padding: 4px 15px 4px 8px;
cursor: pointer;
/* border-top: 1px solid #C8C8C8; */
}
.atwho-view small {
font-size: smaller;
color: #777;
font-weight: normal;
}
.atwho-input.form-control {
min-height: 36px;
height: auto;
padding-right: 95px;
word-wrap: break-word;
}
.atwho-input p {
padding: 0;
margin: 0;
}
.atwho-placeholder {
color: #bebebe !important;
}
.atwho-emoji-entry {
float: left;
padding: 4px !important;
margin: 0px !important;
border:none !important;
}
.atwho-emoji-entry:hover, .atwho-emoji-entry:active, .atwho-emoji-entry:focus {
padding: 4px !important;
margin: 0px !important;
border:none !important;
background-color: #f7f7f7 !important;
border-radius: 3px;
}
.atwho-view .cur {
border-left: 3px solid @info;
background-color: #f7f7f7 !important;

4
static/less/variables.less
View File

@ -1,8 +1,8 @@
//
// Theme color variables
// --------------------------------------------------
@import (reference) "../../protected/vendor/bower-asset/bootstrap/less/mixins.less";
@import (reference) "../../protected/vendor/bower-asset/fontawesome/less/variables.less";
@import (reference) "../../protected/vendor/npm-asset/bootstrap/less/mixins.less";
@import (reference) "../../protected/vendor/npm-asset/font-awesome/less/variables.less";
//
// Colors for buttons status etc.

2
themes/HumHub/css/theme.css
View File

File diff suppressed because one or more lines are too long