Browse Source

fixes name conflict with url icon and link variation. formatting on popup module

Former-commit-id: 94b7bd5d92
Former-commit-id: 68a3a3616b
pull/258/head
jlukic 11 years ago
parent
commit
66669cae34
3 changed files with 23 additions and 23 deletions
  1. 2
      node/src/documents/elements/icon.html.eco.REMOVED.git-id
  2. 38
      node/src/documents/modules/popup.html.eco
  3. 6
      src/elements/icon.less

2
node/src/documents/elements/icon.html.eco.REMOVED.git-id

@ -1 +1 @@
2dab59513c8c4e30bb50c18959714cf8f0ed404a
2ddfe2dbd42912df4bf16b2b3136174660724a01

38
node/src/documents/modules/popup.html.eco

@ -26,7 +26,7 @@ type : 'UI Module'
<div class="example">
<h4 class="ui header">Popup</h4>
<p>A standard popup</p>
<i class="circular help icon link" data-content="Hello, I am a pop-up."></i>
<i class="large help icon link" data-content="Hello, I am a pop-up."></i>
</div>
<h2 class="ui dividing header">Variations</h2>
@ -34,14 +34,14 @@ type : 'UI Module'
<div class="example">
<h4 class="ui header">Size</h4>
<p>A popup can be large or small</p>
<i class="circular help icon link" data-content="Hello. This is a small popup" data-variation="small"></i>
<i class="circular help icon link" data-content="Hello. This is a large popup" data-variation="large"></i>
<i class="help icon link" data-content="Hello. This is a small popup" data-variation="small"></i>
<i class="help icon link" data-content="Hello. This is a large popup" data-variation="large"></i>
</div>
<div class="example">
<h4 class="ui header">Inverted</h4>
<p>A popup can have its colors inverted</p>
<i class="circular help icon link" data-content="Hello. This is an inverted popup" data-variation="inverted"></i>
<i class="help icon link" data-content="Hello. This is an inverted popup" data-variation="inverted"></i>
</div>
@ -57,7 +57,7 @@ type : 'UI Module'
<h4 class="ui header">Including metadata</h4>
<p>Frequently used metadata like, title, content, html, or arrowOffset or variation, can be included in html metadata<p>
<div class="ui info icon ignored message">
<i class="icon circular help circle"></i>
<i class="icon help circle"></i>
<div class="content">
<div class="header">Specifying Content</div>
<p>Popups can specify content in three ways:<p>
@ -69,7 +69,7 @@ type : 'UI Module'
</div>
</div>
<div class="code" data-type="html">
<i class="circular help icon link" data-content="Here is some popup content." data-position="top left" data-variation="black"></i>
<i class="help icon link" data-content="Here is some popup content." data-position="top left" data-variation="black"></i>
</div>
<h2 class="ui dividing header">Examples</h2>
@ -77,32 +77,32 @@ type : 'UI Module'
<div class="example segment">
<h4 class="ui header">Positioning</h4>
<p>A popup can be positioned to any side of an element. If space is not available, it will automatically search for a similar alternative position to use.</p>
<i class="circular help icon link" data-content="Top Left" data-position="top left"></i>
<i class="circular help icon link" data-content="Top Center" data-position="top center"></i>
<i class="circular help icon link" data-content="Top Right" data-position="top right"></i>
<i class="circular help icon link" data-content="Left Center" data-position="left center"></i>
<i class="circular help icon link" data-content="Right Center" data-position="right center"></i>
<i class="circular help icon link" data-content="Bottom Left" data-position="bottom left"></i>
<i class="circular help icon link" data-content="Bottom Center" data-position="bottom center"></i>
<i class="circular help icon link" data-content="Bottom Right" data-position="bottom right"></i>
<i class="help icon link" data-content="Top Left" data-position="top left"></i>
<i class="help icon link" data-content="Top Center" data-position="top center"></i>
<i class="help icon link" data-content="Top Right" data-position="top right"></i>
<i class="help icon link" data-content="Left Center" data-position="left center"></i>
<i class="help icon link" data-content="Right Center" data-position="right center"></i>
<i class="help icon link" data-content="Bottom Left" data-position="bottom left"></i>
<i class="help icon link" data-content="Bottom Center" data-position="bottom center"></i>
<i class="help icon link" data-content="Bottom Right" data-position="bottom right"></i>
</div>
<div class="example segment">
<h4 class="ui header">Title</h4>
<p>A popup can be formatted with a title</p>
<i class="circular help icon link" data-title="Dog Breeds" data-content="There are many types of dogs. We don't have time to list them all"></i>
<i class="help icon link" data-title="Dog Breeds" data-content="There are many types of dogs. We don't have time to list them all"></i>
</div>
<div class="example segment">
<h4 class="ui header">HTML</h4>
<p>A popup can be formatted with html</p>
<i class="circular help icon link" data-html="<strike>I rescind my comment about cats</strike>"></i>
<i class="help icon link" data-html="<strike>I rescind my comment about cats</strike>"></i>
</div>
<div class="no example">
<h4 class="ui header">Transitions</h4>
<p>A popup can have different <a href="/modules/transition.html">transitions</a>. Any transition with both an in and out animation can be specified. The following are just a few examples.</p>
<i class="circular help icon fade link" data-content="This is a different transition"></i>
<i class="help icon fade link" data-content="This is a different transition"></i>
<br><br>
<div class="code" data-demo="true" data-title="Fade">
$('.fade.icon')
@ -112,7 +112,7 @@ type : 'UI Module'
</div>
</div>
<div class="no example">
<i class="circular help icon slide link" data-content="This is a different transition"></i>
<i class="help icon slide link" data-content="This is a different transition"></i>
<br><br>
<div class="code" data-demo="true" data-title="Slide Up">
$('.slide.icon')
@ -122,7 +122,7 @@ type : 'UI Module'
</div>
</div>
<div class="no example">
<i class="circular help icon flip link" data-content="This is a different transition"></i>
<i class="help icon flip link" data-content="This is a different transition"></i>
<br><br>
<div class="code" data-demo="true" data-title="Vertical Flip">
$('.flip.icon')

6
src/elements/icon.less

@ -185,8 +185,8 @@ i.icon.exchange:before { content: "\f0ec"; }
i.icon.attention:before { content: "\f06a"; }
i.icon.exclamation:before { content: "\f12a"; }
i.icon.expand:before { content: "\f116"; }
i.icon.external.link.sign:before { content: "\f14c"; }
i.icon.external.link:before { content: "\f08e"; }
i.icon.external.url.sign:before { content: "\f14c"; }
i.icon.external.url:before { content: "\f08e"; }
i.icon.facebook.sign:before { content: "\f082"; }
i.icon.facebook:before { content: "\f09a"; }
i.icon.facetime.video:before { content: "\f03d"; }
@ -261,7 +261,7 @@ i.icon.lemon:before { content: "\f094"; }
i.icon.level.down:before { content: "\f149"; }
i.icon.level.up:before { content: "\f148"; }
i.icon.lightbulb:before { content: "\f0eb"; }
i.icon.link:before { content: "\f0c1"; }
i.icon.url:before { content: "\f0c1"; }
i.icon.linkedin.sign:before { content: "\f08c"; }
i.icon.linkedin:before { content: "\f0e1"; }
i.icon.linux:before { content: "\f17c"; }

Loading…
Cancel
Save