diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2020-06-08 02:46:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-08 02:46:56 +0300 |
commit | d0aaab95f1ef6d8b748b0e8d54f811a366864249 (patch) | |
tree | 86820438b4b56c764912316ebe8152362aa3e2dd /plugins/Annotations | |
parent | d10c4e89dc5d1081a3755497c45d366b470eeec7 (diff) |
Switch from bower to npm and update JS libraries (#14082)
* Starting to replace bower with npm: use updated jquery-ui from npm.
* Use jquery from npm./
* Use angular from npm.
* Add more angular libraries.
* Use chroma-js from npm.
* Remove html5shiv, does not appear to be used.
* Use iframe resizer library from npm.
* Add jquery-mousewheel
* Add jquery.dotdotdot from npm.
* Get jquery.scrollto from npm.
* Get jscrollpane from npm.
* Get materialize-css from npm.
* Get mousetrap from npm.
* Remove ngDialog, as it is no longer used.
* Install qrcode.js from npm.
* Get sprintf-js from npm.
* Get visibillityjs from npm.
* Remove bower.json.
* Getting parts of matomo to work w/ new versions of libraries installed by npm.
* Ignore node_modules subfolders in node_modules since we only use npm for frontend dependencies + fix a test.
* Fix button padding.
* Fix series picker checkboxes.
* Fix karma conf.
* Fix CSS in right place.
* Fixing more css/less issues.
* More test fixes.
* Limit selection style fix.
* Fix more tests + materializecss issues.
* Fix a couple more tests.
* Fix annotation styling.
* remove error
* add ng-dialog files
* try to fix some tests
* Fix several UI tests.
* fixing more build issues
* Fix several more tests and issues.
* fixing more tests
* split ui tests into 3 groups
* fix several more issues and tests
* Fix some console warnings on chrome.
* Updating more test files.
* fix some tests
* yet more fixes
* couple more fixes
* another form fix
* Fix some tests.
* update screenshot
* update more expected files
* Fix two more form issues.
* test commit (travis is not fetching submodules for some reason...)
* remove scripts removed in merge
* three travis builds
* split UIIntegrationTest into multiple suites
* lets try this again
* updae several expected screenshots
* fix some more tests
* fix plugin details material select and tabs initiaialization
* update screenshots + css fix
* re-initialize materialize tabs since we load jquery-ui afterwards for datepicker which unsets materialize tabs
* update more screenshots and fix couple more issues
* update more screenshots + tweak to test
* more fixes and screenshot updates
* fix some issues and update more screenshots
* update submodules
* more fixes + more updated screenshots
* more css fixes and test fixes
* couple fixes & updated screenshots
* update screenshots
* fix random failure
* Map old bower_component files to new ones in AssetManager.
* Remove node_modules from PR and ignore node_modules in .gitignore and remove libs/jquery (adding new required libs).
* Update .travis.yml.
* update screenshots
* fixing some more issues
* fix copy pasta
* update screenshots
* fix more modal issues
* Update css & screenshots.
* correct close modal calls
* fixing more issues
* data-target instead of data-activates
* fix more tests
* trigger build that works?
* fix more tests
* update submodule
* debugging travis
* more debugging
* try to fix test
* fix modal no button click in test
* update more screenshots
* couple more test fixes
* some more fixes and updated screenshots
* update screenshots
* apply some review feedback
* Fix modal centering and initial top position.
* apply some more pr feedback
* another pr fix
* update submodule
* remove style
* fix color of checkbox mark
* Fix centering the popover
Note: centering the popover relative to body doesn't work poperly anymore, maybe because of the fixed position of the widget overlay. Using the ui-widget-overlay to position the dialog centered seems to work
* ignore line endings check for node modules
* updates expected UI files
* submodule updates
* use minified file of jquery.browser.js
* updates expected test files
* ensure to hide parent tooltips when row action tooltips are shown
* tweak less for datatable navigation
* style is only useful for dashboard
* update some screenshots
* update submodules
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Annotations')
-rw-r--r-- | plugins/Annotations/stylesheets/annotations.less | 14 | ||||
-rw-r--r-- | plugins/Annotations/templates/_annotation.twig | 2 | ||||
-rw-r--r-- | plugins/Annotations/templates/_annotationList.twig | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less index 74ede38ba3..ac958a811e 100644 --- a/plugins/Annotations/stylesheets/annotations.less +++ b/plugins/Annotations/stylesheets/annotations.less @@ -30,9 +30,6 @@ height: 145px; .input-field { margin-top: 2px; - .new-annotation-edit { - padding-bottom: 4px; - } } } @@ -41,11 +38,16 @@ .input-field { margin-top: 2px; - .annotation-edit { - padding-bottom: 4px; - } } } + + .input-field { + margin-bottom: 0; + input { + height: 1rem; + padding-bottom: 4px; + } + } } span.annotation { diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig index c90e99a428..77f9f3304d 100644 --- a/plugins/Annotations/templates/_annotation.twig +++ b/plugins/Annotations/templates/_annotation.twig @@ -36,7 +36,7 @@ {% if annotation.canEditOrDelete %} <div class="annotation-edit-mode" style="display:none;"> <div class="input-field"> - <input class="annotation-edit browser-default" type="text" value="{{ annotation.note|raw }}"/> + <input class="annotation-edit" type="text" value="{{ annotation.note|raw }}"/> </div> <br/> <input class="annotation-save btn" type="button" value="{{ 'General_Save'|translate }}"/> diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig index e7f8a503e3..7e53c4ac9c 100644 --- a/plugins/Annotations/templates/_annotationList.twig +++ b/plugins/Annotations/templates/_annotationList.twig @@ -25,7 +25,7 @@ <td class="annotation-value"> <div class="input-field"> <input type="text" value="" - class="new-annotation-edit browser-default" + class="new-annotation-edit" placeholder="{{ 'Annotations_EnterAnnotationText'|translate }}"/> </div><br/> <input type="button" class="btn new-annotation-save" value="{{ 'General_Save'|translate }}"/> |