ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1712 from nasa/link-1710

Browse Source 
Review and merge fixes for Hyperlinks
This commit is contained in:
Victor Woeltjen 2017-09-14 12:15:09 -07:00 committed by GitHub
commit 469820fb0f
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@ -72,11 +72,13 @@
}
}
// Hyperlink objects
.s-hyperlink {
// Hyperlink objects
.label {
font-size: 0.8rem !important;
}
&:not(.s-button) {
color: $colorKey;
font-size: 0.8rem;
&:hover { color: $colorKeyHov; }
}
}

5
platform/commonUI/general/res/sass/user-environ/_frame.scss
View File

@ -122,7 +122,10 @@
/********************************************************** OBJECT TYPES */
.t-object-type-hyperlink {
.s-hyperlink.s-button {
.object-holder {
overflow: hidden;
}
.l-hyperlink.s-button {
// When a hyperlink is a button in a frame, make it expand to fill out to the object-holder
@extend .abs;
.label {

4
platform/features/hyperlink/res/templates/hyperlink.html
View File

@ -19,10 +19,10 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<a class="s-hyperlink" ng-controller="HyperlinkController as hyperlink" href="{{domainObject.getModel().url}}"
<a class="l-hyperlink s-hyperlink" ng-controller="HyperlinkController as hyperlink" href="{{domainObject.getModel().url}}"
ng-attr-target="{{hyperlink.openNewTab() ? '_blank' : undefined}}"
ng-class="{
's-button': hyperlink.isButton()
}">
<div class="label">{{domainObject.getModel().displayText}}</div>
<span class="label">{{domainObject.getModel().displayText}}</span>
</a>