From 343af40625cd7b6cfcac0d3e7d8eef21353c9f64 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 15 Sep 2014 10:56:01 -0400 Subject: [PATCH] Fix bullet sizing to match chrome native bullets, fix grid responsive style overrides, fix checkbox utf char reference, fix flags --- src/definitions/collections/grid.less | 12 ++++---- src/definitions/elements/flag.less | 4 +++ src/definitions/modules/checkbox.less | 12 ++++++++ .../default/modules/checkbox.overrides | 28 +++++++------------ .../default/modules/checkbox.variables | 10 +++++-- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less index 779e73fc2..3df2c15a2 100755 --- a/src/definitions/collections/grid.less +++ b/src/definitions/collections/grid.less @@ -679,13 +679,13 @@ body > .ui.grid:not(.page) { .ui.grid > .tablet:not(.mobile).only.row, .ui.grid > .tablet:not(.mobile).only.column, .ui.grid > .row > .tablet:not(.mobile).only.column { - display: none; + display: none !important; } .ui.computer:not(.mobile).only.grid, .ui.grid > .computer:not(.mobile).only.row, .ui.grid > .computer:not(.mobile).only.column, .ui.grid > .row > .computer:not(.mobile).only.column { - display: none; + display: none !important; } } /* Tablet Only Hide */ @@ -694,13 +694,13 @@ body > .ui.grid:not(.page) { .ui.grid > .mobile:not(.tablet).only.row, .ui.grid > .mobile:not(.tablet).only.column, .ui.grid > .row > .mobile:not(.tablet).only.column { - display: none; + display: none !important; } .ui.computer:not(.tablet).only.grid, .ui.grid > .computer:not(.tablet).only.row, .ui.grid > .computer:not(.tablet).only.column, .ui.grid > .row > .computer:not(.tablet).only.column { - display: none; + display: none !important; } } @@ -710,13 +710,13 @@ body > .ui.grid:not(.page) { .ui.grid > .mobile:not(.computer).only.row, .ui.grid > .mobile:not(.computer).only.column, .ui.grid > .row > .mobile:not(.computer).only.column { - display: none; + display: none !important; } .ui.tablet:not(.computer).only.grid, .ui.grid > .tablet:not(.computer).only.row, .ui.grid > .tablet:not(.computer).only.column, .ui.grid > .row > .tablet:not(.computer).only.column { - display: none; + display: none !important; } } diff --git a/src/definitions/elements/flag.less b/src/definitions/elements/flag.less index 284c8a8ab..8b5c35912 100755 --- a/src/definitions/elements/flag.less +++ b/src/definitions/elements/flag.less @@ -36,7 +36,11 @@ i.flag { } i.flag:before { + display: inline-block; + content: ''; background: url(@spritePath) no-repeat 0px 0px; + width: @width; + height: @height; } .loadUIOverrides(); diff --git a/src/definitions/modules/checkbox.less b/src/definitions/modules/checkbox.less index e8cb6b260..a575c6ce9 100755 --- a/src/definitions/modules/checkbox.less +++ b/src/definitions/modules/checkbox.less @@ -210,6 +210,8 @@ width: @checkboxRadioSize; height: @checkboxRadioSize; border-radius: @circularRadius; + top: @checkboxRadioTop; + left: @checkboxRadioLeft; transform: none; } @@ -224,6 +226,16 @@ left: @checkboxRadioLeft; font-size: @checkboxRadioCircleSize; } +/* Radio Checkbox */ +.ui.radio.checkbox .box:after, +.ui.radio.checkbox label:after { + width: @checkboxRadioSize; + height: @checkboxRadioSize; + border-radius: @checkboxBulletRadius; + transform: scale(@checkboxBulletScale); + background-color: @checkboxBulletColor; +} + /*-------------- Slider diff --git a/src/themes/packages/default/modules/checkbox.overrides b/src/themes/packages/default/modules/checkbox.overrides index 9e7beda3f..8b7b41bac 100755 --- a/src/themes/packages/default/modules/checkbox.overrides +++ b/src/themes/packages/default/modules/checkbox.overrides @@ -18,22 +18,14 @@ content: '\e800'; /* '' */ } -/* Radio Checkbox */ -.ui.radio.checkbox .box:after, -.ui.radio.checkbox label:after { - content: ''; /* '' */ - transform: scale(0.5); - width: @checkboxRadioSize; - height: @checkboxRadioSize; - border-radius: @circularRadius; - background-color: @checkboxColor; -} +/* UTF Reference +.check:before { content: '\e800'; } +.circle:before { content: '\e801'; } +.ok-circled:before { content: '\e806'; } +.ok-circle:before { content: '\e805'; } +.cancel-circle:before { content: '\e807'; } +.cancel-circle-1:before { content: '\e804'; } +.empty-circle:before { content: '\e802'; } +.radio:before { content: '\e803'; } -.icon-check:before { content: '\e800'; } -.icon-circle:before { content: '\e801'; } /* '' */ -.icon-ok-circled:before { content: '\e806'; } /* '' */ -.icon-ok-circle:before { content: '\e805'; } /* '' */ -.icon-cancel-circle:before { content: '\e807'; } /* '' */ -.icon-cancel-circle-1:before { content: '\e804'; } /* '' */ -.icon-empty-circle:before { content: '\e802'; } /* '' */ -.icon-radio:before { content: '\e803'; }/* '' */ \ No newline at end of file +*/ \ No newline at end of file diff --git a/src/themes/packages/default/modules/checkbox.variables b/src/themes/packages/default/modules/checkbox.variables index 2b92afd80..370f2a0d3 100755 --- a/src/themes/packages/default/modules/checkbox.variables +++ b/src/themes/packages/default/modules/checkbox.variables @@ -16,7 +16,7 @@ /* Checkbox */ @checkboxSize: 17px; @checkboxBackground: @white; -@checkboxBorder: 1px solid @borderColor; +@checkboxBorder: 1px solid @solidBorderColor; @checkboxBorderRadius: 0.25em; @checkboxTransition: background-color 0.3s ease, @@ -60,11 +60,15 @@ --------------------*/ /* Radio */ -@checkboxRadioSize: 16px; +@checkboxRadioSize: 14px; @checkboxRadioCircleSize: 9px; -@checkboxRadioTop: 0px; +@checkboxRadioTop: 1px; @checkboxRadioLeft: 0px; +@checkboxBulletScale: 0.428571428; +@checkboxBulletColor: @textColor; +@checkboxBulletRadius: @circularRadius; + /* Slider & Toggle Handle */ @handleBackground: @white @subtleGradient; @handleBoxShadow: