diff --git a/src/strand-grid-column/doc.json b/src/strand-grid-column/doc.json index 2a653d1a..1f760fbe 100644 --- a/src/strand-grid-column/doc.json +++ b/src/strand-grid-column/doc.json @@ -26,12 +26,27 @@ { "name":"minWidth", - "type":"Integer", + "type":"Number", "description":"The minimum width of the column in pixels when resizing.", "attribute":"min-width", "optional":true, "default":"75" }, + { + "name":"tipWidth", + "type":"Number", + "description":"The desired width of the tooltip for the column, in pixels (see: the 'info' property). For longer multiline tooltips, provide a tip-width for best results.", + "attribute":"min-width", + "optional":true, + "default":"none" + }, + { + "name":"info", + "type":"String", + "description":"", + "optional":true, + "default":"false" + }, { "name":"resize", "type":"Boolean", diff --git a/src/strand-grid-column/strand-grid-column.html b/src/strand-grid-column/strand-grid-column.html index a372c788..b8acc222 100644 --- a/src/strand-grid-column/strand-grid-column.html +++ b/src/strand-grid-column/strand-grid-column.html @@ -19,7 +19,7 @@
- + diff --git a/src/strand-grid-column/strand-grid-column.js b/src/strand-grid-column/strand-grid-column.js index 2467e02f..28a46d19 100644 --- a/src/strand-grid-column/strand-grid-column.js +++ b/src/strand-grid-column/strand-grid-column.js @@ -64,6 +64,9 @@ type: Number, value: 75 }, + tipWidth: { + type: Number + } }, listeners: { diff --git a/src/strand-grid-column/strand-grid-column.scss b/src/strand-grid-column/strand-grid-column.scss index b7745f34..941e7370 100644 --- a/src/strand-grid-column/strand-grid-column.scss +++ b/src/strand-grid-column/strand-grid-column.scss @@ -41,13 +41,8 @@ } #label { - // TODO: switch this block to the mixin for default font - font-family: "Arimo", sans-serif; - font-weight: bold; - font-size: 11px; - line-height: 11px; + @include defaultFont(11px, 11px, 700); color: $color-A2; - text-transform: uppercase; white-space: nowrap; overflow: hidden; diff --git a/src/strand-guide-tooltip/strand-guide-tooltip.html b/src/strand-guide-tooltip/strand-guide-tooltip.html index 2b9a7a6f..41922a0d 100644 --- a/src/strand-guide-tooltip/strand-guide-tooltip.html +++ b/src/strand-guide-tooltip/strand-guide-tooltip.html @@ -6,6 +6,7 @@ --> + diff --git a/src/strand-guide-tooltip/strand-guide-tooltip.js b/src/strand-guide-tooltip/strand-guide-tooltip.js index 37575be5..f8c4db10 100644 --- a/src/strand-guide-tooltip/strand-guide-tooltip.js +++ b/src/strand-guide-tooltip/strand-guide-tooltip.js @@ -6,6 +6,8 @@ */ (function(scope) { + var BehaviorUtils = StrandLib.BehaviorUtils; + scope.GuideTooltip = Polymer({ is: 'strand-guide-tooltip', @@ -72,6 +74,12 @@ } }, + open: function(silent) { + var inherited = BehaviorUtils.findSuper(StrandTraits.Closable, "open"); + inherited.apply(this, [silent]); + this._updatePosition(); + }, + _currentStepChanged: function(newVal, oldVal) { if (this.currentStep <= this.data.length-1) { if (this.state === this.STATE_OPENED) this.close(); diff --git a/src/strand-guide/strand-guide.js b/src/strand-guide/strand-guide.js index 0c099541..dfda7352 100644 --- a/src/strand-guide/strand-guide.js +++ b/src/strand-guide/strand-guide.js @@ -125,7 +125,7 @@ newVal.forEach(function(item) { var target = Polymer.dom(this.scope).querySelector('#' + item.target); item.targetRef = target; - }); + }, this); if (this._isAttached) this._init(); } diff --git a/src/strand-tooltip/strand-tooltip.scss b/src/strand-tooltip/strand-tooltip.scss index 9d38e70c..e7d78fb6 100644 --- a/src/strand-tooltip/strand-tooltip.scss +++ b/src/strand-tooltip/strand-tooltip.scss @@ -14,6 +14,8 @@ $bg-color: $color-A1; :host { position: fixed; display: block; + left: 0; + top: 0; } #container {