From 66f7b724dcc3166dae36b5761397e175f77883d9 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 10 Jul 2014 18:11:57 -0400 Subject: [PATCH] Fix module example text, fix ascending/descending arrows for sortable table --- server/documents/module.html.eco | 12 +++++----- server/documents/modules/checkbox.html.eco | 2 +- src/definitions/elements/label.less | 23 ++++++++++++++++++- src/definitions/modules/checkbox.less | 2 +- .../default/collections/table.variables | 4 ++-- .../packages/default/elements/label.variables | 3 ++- .../default/modules/checkbox.variables | 3 +-- 7 files changed, 35 insertions(+), 14 deletions(-) diff --git a/server/documents/module.html.eco b/server/documents/module.html.eco index e494af673..32fbe5478 100755 --- a/server/documents/module.html.eco +++ b/server/documents/module.html.eco @@ -52,11 +52,11 @@ type : 'Semantic'
- + Real World Commented Example - + Commented Design Pattern @@ -69,9 +69,9 @@ type : 'Semantic'

The following example shows how to attach behavior to elements on a page using Semantic

-
- -
+ + +
@@ -83,7 +83,7 @@ type : 'Semantic'
// initializing with settings - $('.ui.image .help') + $('.ui.image .corner.label') .popup({ position: 'right center' }) diff --git a/server/documents/modules/checkbox.html.eco b/server/documents/modules/checkbox.html.eco index 09c498823..438f9b56f 100755 --- a/server/documents/modules/checkbox.html.eco +++ b/server/documents/modules/checkbox.html.eco @@ -8,7 +8,7 @@ elementType : 'module' title : 'Checkbox' description : "A checkbox visually indicates the status of a user's selection" type : 'UI Module' -themes : ['default', 'GitHub'] +themes : ['default'] --- diff --git a/src/definitions/elements/label.less b/src/definitions/elements/label.less index 6b54a7998..ed975d1ac 100755 --- a/src/definitions/elements/label.less +++ b/src/definitions/elements/label.less @@ -900,7 +900,7 @@ a.ui.yellow.label:hover:before { .ui.tiny.labels .label, .ui.tiny.label { -font-size: @tiny; + font-size: @tiny; } .ui.small.labels .label, .ui.small.label { @@ -919,4 +919,25 @@ font-size: @tiny; 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(); diff --git a/src/definitions/modules/checkbox.less b/src/definitions/modules/checkbox.less index be7227915..665b1e849 100755 --- a/src/definitions/modules/checkbox.less +++ b/src/definitions/modules/checkbox.less @@ -61,7 +61,7 @@ .ui.checkbox label { cursor: pointer; padding-left: @labelPadding; - line-height: @checkboxSize; + line-height: @labelLineHeight; outline: none; } .ui.checkbox label { diff --git a/src/themes/packages/default/collections/table.variables b/src/themes/packages/default/collections/table.variables index 497cc3c91..0da63070d 100644 --- a/src/themes/packages/default/collections/table.variables +++ b/src/themes/packages/default/collections/table.variables @@ -125,8 +125,8 @@ @sortableIconDistance: 0.5em; @sortableIconOpacity: 0.8; @sortableIconFont: 'Icons'; -@sortableIconAscending: '\25b4'; -@sortableIconDescending: '\25b4'; +@sortableIconAscending: '\f0d7'; +@sortableIconDescending: '\f0d8'; @sortableDisabledColor: @disabledTextColor; diff --git a/src/themes/packages/default/elements/label.variables b/src/themes/packages/default/elements/label.variables index f8116eba3..f620d45d3 100755 --- a/src/themes/packages/default/elements/label.variables +++ b/src/themes/packages/default/elements/label.variables @@ -88,6 +88,7 @@ @attachedHorizontalPadding: 1em; /* Corner */ +@cornerSizeRatio: 1.2; @cornerTriangleSize: 3em; @cornerTextWidth: 2.5em; @@ -123,4 +124,4 @@ @small: 0.75rem; @medium: 0.8125rem; @large: 0.875rem; -@huge: 1rem; \ No newline at end of file +@huge: 1rem; diff --git a/src/themes/packages/default/modules/checkbox.variables b/src/themes/packages/default/modules/checkbox.variables index 8326bef3c..07bd7aec4 100755 --- a/src/themes/packages/default/modules/checkbox.variables +++ b/src/themes/packages/default/modules/checkbox.variables @@ -2,13 +2,12 @@ Checkbox --------------------*/ -@checkboxHeight: 1em; @checkboxColor: @textColor; - @fontSize: 1em; /* Label */ @labelPadding: 2em; +@labelLineHeight: 15px; @neutralCheckbox: @transparentBlack; @positiveCheckbox: @positiveColor;