Skip to content
This repository has been archived by the owner on May 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #544 from thevoiceofzeke/widgets
Browse files Browse the repository at this point in the history
Replace widget action popovers with material tooltips
  • Loading branch information
thevoiceofzeke authored Oct 6, 2016
2 parents 704bbdc + 5682fa5 commit 29ffade
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 62 deletions.
52 changes: 1 addition & 51 deletions angularjs-portal-home/src/main/webapp/css/widget.less
Original file line number Diff line number Diff line change
Expand Up @@ -264,56 +264,6 @@ weather {
}
}

.list-content .widget-info,
.widget-frame .widget-info, {
position: absolute;
left: -999em;
.tooltip-inner {
max-width:200px;
width:200px;
}
}
.list-content .widget-remove,
.widget-frame .widget-remove {
position: absolute;
right: 999em;
.tooltip-inner {
max-width:200px;
width:200px;
}
}

.list-content:hover,
.widget-frame:hover {
.widget-info {
display:inline;
position:absolute;
left:8px;
top:3px;
i {
color:#999;
&:hover {
cursor:pointer;
color:#666;
}
}
}

.widget-remove {
display:inline;
position:absolute;
right:8px;
top:3px;
i {
color:#999;
&:hover {
cursor:pointer;
color:#666;
}
}
}
}

.scroll-widget {
max-height: 210px;
overflow-y: scroll;
Expand All @@ -326,4 +276,4 @@ weather {
.widget-middle {
width : 315px;
margin : auto;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
<!-- HEADER -->
<md-card-header class="widget-header">
<!-- Widget Chrome -->
<div class='widget-info'>
<i title="Info" class="fa fa-info-circle"
tooltip="{{portlet.description}}"
tooltip-trigger="mouseenter"
tooltip-placement="top"
tooltip-popup-delay="200"></i>
</div>
<div class='widget-remove' ng-hide='GuestMode || cantRemove'>
<i title="Remove" class="fa fa-times portlet-options" ng-click="widgetCtrl.removePortlet(portlet.nodeId, portlet.title)"><a aria-label="Remove this app" href="#"></a></i>
</div>
<md-button class="widget-action widget-info md-icon-button" aria-label="see a brief description of this app">
<md-tooltip md-direction="top" class="widget-action-tooltip">
{{portlet.description}}
</md-tooltip>
<md-icon>info</md-icon>
</md-button>
<md-button class="widget-action widget-remove md-icon-button"
aria-label="remove this widget from your home screen"
ng-click="widgetCtrl.removePortlet(portlet.nodeId, portlet.title)"
ng-hide="GuestMode || cantRemove">
<md-icon>close</md-icon>
</md-button>

<md-card-header-text>
<span class='md-title' style='text-align: center;' id="appTitle_portlet.title-{{portlet.nodeId}}" aria-labelledby="appTitle_portlet.title-{{portlet.nodeId}}" tabindex="0">{{ portlet.title }}</span>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"scripts": {
"pretest": "mvn clean package",
"test": "karma start angularjs-portal-home/target/web/karma.conf.js --single-run",
"prestart": "mvn package",
"prestart": "mvn clean package",
"start": "mvn jetty:run",
"predocs" : "./build-docs-local.sh",
"docs" : "cd doc_target/gh-pages/ && http-server",
Expand Down

0 comments on commit 29ffade

Please sign in to comment.