fixing tooltips merge conflic

This commit is contained in:
Tom Johnson
2015-05-05 14:09:34 -07:00

View File

@ -1,4 +1,3 @@
---
title: Adding tooltips title: Adding tooltips
permalink: /adding_tooltips/ permalink: /adding_tooltips/
tags: [] tags: []
@ -8,18 +7,22 @@ last_updated:
summary: summary:
--- ---
{% include linkrefs.html %} {% include linkrefs.html %}
=======
You can add tooltips to your content. Because this theme is built on Bootstrap, you can simply use a specific attribute on an element to insert a tooltip. ## permalink: /adding_tooltips/
You can add tooltips to your content. Because this theme is built on Bootstrap, you can simply use a specific attribute on an element to insert a tooltip.  test...
Suppose you have a glossary.yml file inside your _data folder. You could pull in that glossary definition like this: Suppose you have a glossary.yml file inside your _data folder. You could pull in that glossary definition like this:
{% raw %} <!--|%%|%7B%25%20raw%20%25%7D|%%|-->
```html
<a href="#" data-toggle="tooltip" data-original-title="{{site.data.glossary.jekyll_platform}}">Jekyll</a> is my favorite tool for building websites.</a> ```
<a href="#" data-toggle="tooltip" data-original-title="<!--|%%|%7B%7Bsite.data.glossary.jekyll_platform%7D%7D|%%|-->">Jekyll</a> is my favorite tool for building websites.</a>
``` ```
{% endraw %}
This renders to the following: <!--|%%|%7B%25%20endraw%20%25%7D|%%|-->
<a href="#" data-toggle="tooltip" data-original-title="{{site.data.glossary.jekyll_platform}}">Jekyll</a> is my favorite tool for building websites.</a> This renders to the following:
<a data-toggle="tooltip" data-original-title="<!--|%%|%7B%7Bsite.data.glossary.jekyll_platform%7D%7D|%%|-->" href="#">Jekyll</a> is my favorite tool for building websites.