Skip to content

[5.3] Fix CheckBox and ToolBarSearchBox icon positioning. (#10356) #10366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjcenizal merged 1 commit into from
Feb 15, 2017
Merged

[5.3] Fix CheckBox and ToolBarSearchBox icon positioning. (#10356) #10366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ui_framework/components/form/_check_box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@

&:before {
position: relative;
top: -0.05em;
left: 0.15em;
left: 0.25em;
font-family: FontAwesome;
content: "\F00C";
font-size: 1em;
Expand Down
5 changes: 5 additions & 0 deletions ui_framework/components/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,11 @@ $verticalRhythm: 10px;

* {
box-sizing: border-box;

&:before,
&:after {
box-sizing: border-box;
}
}

body {
Expand Down
13 changes: 8 additions & 5 deletions ui_framework/components/tool_bar/_tool_bar_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
.kuiToolBarSearchBox {
flex: 1 1 auto;
position: relative;
font-size: $fontSize;
}

.kuiToolBarSearchBox__icon {
position: absolute;
top: 6px;
left: 8px;
top: 0.5em;
left: 0.7em;
font-size: 1em;
font-size: 14px;
color: #ACACAC;
}
Expand All @@ -43,14 +45,15 @@
.kuiToolBarSearchBox__input {
width: 100%;
min-width: 200px;
padding: 5px 12px 6px 28px;
padding: 4px 12px 5px 28px;
font-family: $font; /* 1 */
background-color: #FFFFFF;
color: $fontColor;
border: 1px solid #FFFFFF;
border-radius: $buttonBorderRadius;
font-size: $fontSize;
font-size: 1em;
border: 1px solid #ffffff;
line-height: normal; /* 1 */
transition: border-color $formTransitionTiming;

&:focus {
@include formControlFocus;
Expand Down
24 changes: 15 additions & 9 deletions ui_framework/dist/ui_framework.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
*/
* {
box-sizing: border-box; }
*:before, *:after {
box-sizing: border-box; }

body {
font-family: "Open Sans", Helvetica, Arial, sans-serif; }
Expand Down Expand Up @@ -302,8 +304,7 @@ body {
transition: background-color 0.1s linear; }
.kuiCheckBox:before {
position: relative;
top: -0.05em;
left: 0.15em;
left: 0.25em;
font-family: FontAwesome;
content: "\F00C";
font-size: 1em;
Expand Down Expand Up @@ -1663,12 +1664,14 @@ body {
-webkit-flex: 1 1 auto;
-ms-flex: 1 1 auto;
flex: 1 1 auto;
position: relative; }
position: relative;
font-size: 14px; }

.kuiToolBarSearchBox__icon {
position: absolute;
top: 6px;
left: 8px;
top: 0.5em;
left: 0.7em;
font-size: 1em;
font-size: 14px;
color: #ACACAC; }

Expand All @@ -1678,15 +1681,18 @@ body {
.kuiToolBarSearchBox__input {
width: 100%;
min-width: 200px;
padding: 5px 12px 6px 28px;
padding: 4px 12px 5px 28px;
font-family: "Open Sans", Helvetica, Arial, sans-serif;
/* 1 */
background-color: #FFFFFF;
color: #191E23;
border: 1px solid #FFFFFF;
border-radius: 4px;
font-size: 14px;
font-size: 1em;
border: 1px solid #ffffff;
line-height: normal;
/* 1 */ }
/* 1 */
-webkit-transition: border-color 0.1s linear;
transition: border-color 0.1s linear; }
.kuiToolBarSearchBox__input:focus {
outline: none;
border-color: #6EADC1; }
Expand Down
48 changes: 36 additions & 12 deletions ui_framework/doc_site/src/views/table/controlled_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,19 @@
<tbody>
<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Alligator</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Alligator</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--success fa-check"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--success fa-check"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand All @@ -89,13 +95,19 @@

<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Boomerang</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Boomerang</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--success fa-check"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--success fa-check"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand All @@ -111,13 +123,19 @@

<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Celebration</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Celebration</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--warning fa-bolt"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--warning fa-bolt"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand All @@ -133,13 +151,19 @@

<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Dog</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Dog</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--error fa-warning"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--error fa-warning"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand Down
48 changes: 36 additions & 12 deletions ui_framework/doc_site/src/views/table/table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,19 @@
<tbody>
<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Alligator</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Alligator</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--success fa-check"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--success fa-check"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand All @@ -48,13 +54,19 @@

<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Boomerang</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Boomerang</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--success fa-check"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--success fa-check"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand All @@ -70,13 +82,19 @@

<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Celebration</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Celebration</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--warning fa-bolt"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--warning fa-bolt"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand All @@ -92,13 +110,19 @@

<tr class="kuiTableRow">
<td class="kuiTableRowCell kuiTableRowCell--checkBox">
<input type="checkbox" class="kuiCheckBox">
<div class="kuiTableRowCell__liner">
<input type="checkbox" class="kuiCheckBox">
</div>
</td>
<td class="kuiTableRowCell">
<a class="kuiLink" href="#">Dog</a>
<div class="kuiTableRowCell__liner">
<a class="kuiLink" href="#">Dog</a>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiIcon kuiIcon--error fa-warning"></div>
<div class="kuiTableRowCell__liner">
<div class="kuiIcon kuiIcon--error fa-warning"></div>
</div>
</td>
<td class="kuiTableRowCell">
<div class="kuiTableRowCell__liner">
Expand Down