Skip to content

Commit 5f129f4

Browse files
authored
Merge pull request #250 from ovh-ux/develop
Develop
2 parents 395e9c7 + adc3158 commit 5f129f4

File tree

24 files changed

+48
-46
lines changed

24 files changed

+48
-46
lines changed

packages/oui-action-menu/_mixins.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
// Deprecated: Support only for old use
4848
.action-menu-item-divider-base() {
4949
display: block;
50-
height: rem-calc(1);
50+
height: 1px;
5151
margin: rem-calc(4) 0;
5252
background-color: @oui-action-menu-divider-color;
5353
}

packages/oui-box/_variables.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Box
22
@oui-box-background-color: #f6f7f5;
33
@oui-box-border-color: #e1e4df;
4-
@oui-box-border-size: rem-calc(2);
4+
@oui-box-border-size: 2px;
55
@oui-box-padding: rem-calc(20);
66

77
// Box - Light

packages/oui-button/_normalize.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
@import '../oui-typography/_mixins';
22

3+
oui-button {
4+
display: inline-block;
5+
}
6+
37
#oui {
48
.button-normalize() {
59
#oui > .text-ellipsis();

packages/oui-button/_variables.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@oui-button-max-width: rem-calc(320);
88
@oui-button-padding-base: rem-calc(10);
99
@oui-button-padding: @oui-button-padding-base rem-calc(20);
10-
@oui-button-spacing: 0 0 rem-calc(20);
10+
@oui-button-spacing: 0;
1111

1212
// Button - Filled
1313
@oui-button-filled-background-color: @oui-color-turquoise;
@@ -55,7 +55,7 @@
5555
@oui-button-icon-alone-font-color: @oui-link-font-color;
5656
@oui-button-icon-alone-min-width: rem-calc(20);
5757
@oui-button-icon-alone-padding-left: rem-calc(5);
58-
@oui-button-icon-alone-padding-right: rem-calc(0);
58+
@oui-button-icon-alone-padding-right: 0;
5959
@oui-button-icon-alone-margin-right: rem-calc(15);
6060
@oui-button-icon-alone-icon-font-size: rem-calc(20);
6161
@oui-button-icon-alone-font-color_hover: @oui-link-font-color_hover;

packages/oui-calendar/_variables.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
@oui-calendar-font-color_hover: @oui-color-sapphire;
55
@oui-calendar-font-size: rem-calc(16);
66
@oui-calendar-font-weight: @oui-font-semibold;
7-
@oui-calendar-border: @oui-calendar-border-color rem-calc(1) solid;
7+
@oui-calendar-border: @oui-calendar-border-color 1px solid;
88
@oui-calendar-border-color: @oui-color-silver;
99
@oui-calendar-box-shadow: @oui-dropdown-menu-box-shadow;
1010
@oui-calendar-separator-color: @oui-color-silver;
1111

1212
@oui-calendar-header-height: rem-calc(60);
1313
@oui-calendar-header-spacing: rem-calc(20);
14-
@oui-calendar-header-border-bottom: @oui-calendar-separator-color rem-calc(1) solid;
14+
@oui-calendar-header-border-bottom: @oui-calendar-separator-color 1px solid;
1515

1616
@oui-calendar-title-arrow-width: rem-calc(15);
1717

@@ -27,7 +27,7 @@
2727
@oui-calendar-cell-line-height: rem-calc(28);
2828
@oui-calendar-cell-font-color_disabled: @oui-color-dusty;
2929
@oui-calendar-cell-border-radius: @oui-global-base-radius;
30-
@oui-calendar-cell-border-width: rem-calc(1);
30+
@oui-calendar-cell-border-width: 1px;
3131
@oui-calendar-cell-background-color_hover: @oui-color-charlotte;
3232
@oui-calendar-cell-background-color_selected: @oui-color-charlotte;
3333

packages/oui-checkbox/_variables.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@oui-checkbox-size: rem-calc(16);
55
@oui-checkbox-min-height: rem-calc(40);
66
@oui-checkbox-line-height: 1.5;
7-
@oui-checkbox-padding: rem-calc(0);
7+
@oui-checkbox-padding: 0;
88
@oui-checkbox-font-color: @oui-color-sapphire;
99
@oui-checkbox-outline-color: @oui-color-dusty;
1010
@oui-checkbox-outline-color_hover: @oui-checkbox-font-color;
@@ -22,7 +22,7 @@
2222
// Checkbox - m
2323
@oui-checkbox-m-size: rem-calc(24);
2424
@oui-checkbox-m-line-height: 1.3;
25-
@oui-checkbox-m-padding: rem-calc(0);
25+
@oui-checkbox-m-padding: 0;
2626

2727
@oui-checkbox-description-font-size: rem-calc(14);
2828

packages/oui-datagrid/_mixins.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,11 @@
206206
position: relative;
207207

208208
&_sticky-checkbox {
209-
padding-left: @oui-datagrid-checkbox-column-width - rem-calc(1);
209+
padding-left: @oui-datagrid-checkbox-column-width - 1px;
210210
}
211211

212212
&_sticky-actions {
213-
padding-right: @oui-datagrid-action-column-width - rem-calc(1);
213+
padding-right: @oui-datagrid-action-column-width - 1px;
214214
}
215215
}
216216

packages/oui-header-tabs/header-tabs.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
&__divider {
3232
background-color: @oui-color-silver;
3333
display: block;
34-
height: rem-calc(1);
34+
height: 1px;
3535
margin: rem-calc(4) 0;
3636

3737
&:first-child,

packages/oui-input-group/input-group.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ oui-clipboard { display: block; }
5757
}
5858

5959
.oui-button {
60+
transition: none;
61+
6062
&,
6163
&:hover,
6264
&:focus {

packages/oui-navbar/_mixins.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,6 @@
414414
color: @font-color;
415415
border-bottom: @item-border-bottom;
416416

417-
.oui-button { margin: 0; }
418-
419417
&_active { background-color: @background-color_active; }
420418

421419
&:hover {
@@ -450,8 +448,6 @@
450448
right: 0;
451449
pointer-events: none;
452450
}
453-
454-
.oui-button { margin: 0; }
455451
}
456452

457453
// Header for Menu

0 commit comments

Comments
 (0)