Browse Source

Fix module example text, fix ascending/descending arrows for sortable table

pull/954/head
jlukic 10 years ago
parent
commit
66f7b724dc
7 changed files with 35 additions and 14 deletions
  1. 12
      server/documents/module.html.eco
  2. 2
      server/documents/modules/checkbox.html.eco
  3. 23
      src/definitions/elements/label.less
  4. 2
      src/definitions/modules/checkbox.less
  5. 4
      src/themes/packages/default/collections/table.variables
  6. 3
      src/themes/packages/default/elements/label.variables
  7. 3
      src/themes/packages/default/modules/checkbox.variables

12
server/documents/module.html.eco

@ -52,11 +52,11 @@ type : 'Semantic'
</div> </div>
</div> </div>
<div class="ui divider"></div> <div class="ui divider"></div>
<a href="/spec/docs/modal.commented.html" class="ui large secondary labeled icon button">
<a href="/spec/docs/modal.commented.html" class="ui large primary labeled icon button">
<i class="info icon"></i> <i class="info icon"></i>
Real World Commented Example Real World Commented Example
</a> </a>
<a href="/spec/docs/module.commented.html" class="ui large black labeled icon button">
<a href="/spec/docs/module.commented.html" class="ui large secondary labeled icon button">
<i class="info icon"></i> <i class="info icon"></i>
Commented Design Pattern Commented Design Pattern
</a> </a>
@ -69,9 +69,9 @@ type : 'Semantic'
<p>The following example shows how to attach behavior to elements on a page using Semantic</p> <p>The following example shows how to attach behavior to elements on a page using Semantic</p>
<div class="code" data-type="html" data-preview="true"> <div class="code" data-type="html" data-preview="true">
<div class="ui medium image"> <div class="ui medium image">
<div class="ui corner label">
<i class="help link icon" data-content="This appears to the right"></i>
</div>
<a class="ui corner label" data-content="This appears to the right">
<i class="help link icon"></i>
</a>
<img src="/images/demo/photo.jpg" data-content="This appears in the default location"> <img src="/images/demo/photo.jpg" data-content="This appears in the default location">
</div> </div>
</div> </div>
@ -83,7 +83,7 @@ type : 'Semantic'
</div> </div>
<div class="evaluated code" data-type="javascript"> <div class="evaluated code" data-type="javascript">
// initializing with settings // initializing with settings
$('.ui.image .help')
$('.ui.image .corner.label')
.popup({ .popup({
position: 'right center' position: 'right center'
}) })

2
server/documents/modules/checkbox.html.eco

@ -8,7 +8,7 @@ elementType : 'module'
title : 'Checkbox' title : 'Checkbox'
description : "A checkbox visually indicates the status of a user's selection" description : "A checkbox visually indicates the status of a user's selection"
type : 'UI Module' type : 'UI Module'
themes : ['default', 'GitHub']
themes : ['default']
--- ---
<script src="/javascript/checkbox.js"></script> <script src="/javascript/checkbox.js"></script>

23
src/definitions/elements/label.less

@ -900,7 +900,7 @@ a.ui.yellow.label:hover:before {
.ui.tiny.labels .label, .ui.tiny.labels .label,
.ui.tiny.label { .ui.tiny.label {
font-size: @tiny;
font-size: @tiny;
} }
.ui.small.labels .label, .ui.small.labels .label,
.ui.small.label { .ui.small.label {
@ -919,4 +919,25 @@ font-size: @tiny;
font-size: @huge; font-size: @huge;
} }
.ui.tiny.corner.labels .label,
.ui.tiny.corner.label {
font-size: (@cornerSizeRatio * @tiny);
}
.ui.small.corner.labels .label,
.ui.small.corner.label {
font-size: (@cornerSizeRatio * @small);
}
.ui.corner.labels .label,
.ui.corner.label {
font-size: (@cornerSizeRatio * @medium);
}
.ui.large.corner.labels .label,
.ui.large.corner.label {
font-size: (@cornerSizeRatio * @large);
}
.ui.huge.corner.labels .label,
.ui.huge.corner.label {
font-size: (@cornerSizeRatio * @huge);
}
.loadUIOverrides(); .loadUIOverrides();

2
src/definitions/modules/checkbox.less

@ -61,7 +61,7 @@
.ui.checkbox label { .ui.checkbox label {
cursor: pointer; cursor: pointer;
padding-left: @labelPadding; padding-left: @labelPadding;
line-height: @checkboxSize;
line-height: @labelLineHeight;
outline: none; outline: none;
} }
.ui.checkbox label { .ui.checkbox label {

4
src/themes/packages/default/collections/table.variables

@ -125,8 +125,8 @@
@sortableIconDistance: 0.5em; @sortableIconDistance: 0.5em;
@sortableIconOpacity: 0.8; @sortableIconOpacity: 0.8;
@sortableIconFont: 'Icons'; @sortableIconFont: 'Icons';
@sortableIconAscending: '\25b4';
@sortableIconDescending: '\25b4';
@sortableIconAscending: '\f0d7';
@sortableIconDescending: '\f0d8';
@sortableDisabledColor: @disabledTextColor; @sortableDisabledColor: @disabledTextColor;

3
src/themes/packages/default/elements/label.variables

@ -88,6 +88,7 @@
@attachedHorizontalPadding: 1em; @attachedHorizontalPadding: 1em;
/* Corner */ /* Corner */
@cornerSizeRatio: 1.2;
@cornerTriangleSize: 3em; @cornerTriangleSize: 3em;
@cornerTextWidth: 2.5em; @cornerTextWidth: 2.5em;
@ -123,4 +124,4 @@
@small: 0.75rem; @small: 0.75rem;
@medium: 0.8125rem; @medium: 0.8125rem;
@large: 0.875rem; @large: 0.875rem;
@huge: 1rem;
@huge: 1rem;

3
src/themes/packages/default/modules/checkbox.variables

@ -2,13 +2,12 @@
Checkbox Checkbox
--------------------*/ --------------------*/
@checkboxHeight: 1em;
@checkboxColor: @textColor; @checkboxColor: @textColor;
@fontSize: 1em; @fontSize: 1em;
/* Label */ /* Label */
@labelPadding: 2em; @labelPadding: 2em;
@labelLineHeight: 15px;
@neutralCheckbox: @transparentBlack; @neutralCheckbox: @transparentBlack;
@positiveCheckbox: @positiveColor; @positiveCheckbox: @positiveColor;

Loading…
Cancel
Save