This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
commit 3dc7e2ffc22ba8ac6fd5d721bb5f033917c3a9b7 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Nov 10 11:49:37 2022 +0000 fix font awesome inclusion issue --- .../app-inspector/app/components/adjuncts-list/adjuncts-list.html | 2 +- .../app/components/config-sensor-table/config-sensor-table.style.less | 1 - .../app/views/main/inspect/management/detail/detail.template.html | 4 ++-- ui-modules/utils/br-core/style/variables.less | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui-modules/app-inspector/app/components/adjuncts-list/adjuncts-list.html b/ui-modules/app-inspector/app/components/adjuncts-list/adjuncts-list.html index 68525a84..07901c1f 100644 --- a/ui-modules/app-inspector/app/components/adjuncts-list/adjuncts-list.html +++ b/ui-modules/app-inspector/app/components/adjuncts-list/adjuncts-list.html @@ -59,7 +59,7 @@ <p ng-repeat="(id, highlight) in adjunctsWithHighlightsSorted[adjunct.id] track by id" ng-show="showHighlight(id)" class="highlight" ng-class="{'adjunct-last-action': id === 'lastAction', 'adjunct-last-confirmation': id === 'lastConfirmation', 'adjunct-last-violation': id === 'lastViolation', 'adjunct-trigger': id === 'triggers'}"> <span class="highlight-description">{{highlight.description}}</span> - <span class="highlight-time">{{highlight.time > 0 ? (highlight.time | timeAgo) : 'ongoing'}}</span> + <span class="highlight-time">{{highlight.time > 0 ? (highlight.time | timeAgo) : ''}}</span> </p> </div> </div> diff --git a/ui-modules/app-inspector/app/components/config-sensor-table/config-sensor-table.style.less b/ui-modules/app-inspector/app/components/config-sensor-table/config-sensor-table.style.less index be66ebb5..72847a89 100644 --- a/ui-modules/app-inspector/app/components/config-sensor-table/config-sensor-table.style.less +++ b/ui-modules/app-inspector/app/components/config-sensor-table/config-sensor-table.style.less @@ -44,7 +44,6 @@ } .grid-editable:not(.edit-disabled):after { - font-family: "myriad-pro-1", Helvetica, Arial, sans-serif, FontAwesome; content: '\f040'; opacity: 0.3; width: 1.1em; diff --git a/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html b/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html index ba57067b..766266bc 100644 --- a/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html +++ b/ui-modules/app-inspector/app/views/main/inspect/management/detail/detail.template.html @@ -84,10 +84,10 @@ </div> <div class="timestamp"> <span class="humanized fade" ng-show="!showUTC"> - {{highlight.time > 0 ? (highlight.time | timeAgo) : 'ongoing'}} + {{highlight.time > 0 ? (highlight.time | timeAgo) : ''}} </span> <span class="utcTime fade" ng-show="showUTC"> - {{highlight.time > 0 ? (highlight.time | dateFilter ) : 'ongoing'}} + {{highlight.time > 0 ? (highlight.time | dateFilter ) : ''}} </span> </div> </div> diff --git a/ui-modules/utils/br-core/style/variables.less b/ui-modules/utils/br-core/style/variables.less index fbb41ddd..10023486 100644 --- a/ui-modules/utils/br-core/style/variables.less +++ b/ui-modules/utils/br-core/style/variables.less @@ -77,4 +77,4 @@ // Override the font-awesome path to use our custom one @fa-font-path: @br-core-path-font; -@font-family-sans-serif: "myriad-pro-1", Helvetica, Arial, sans-serif; +@font-family-sans-serif: "myriad-pro-1", Helvetica, Arial, sans-serif, FontAwesome;
