Skip to content
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

Jump to bottom

update reset styles #7682

Merged
merged 7 commits into from
Sep 22, 2017
Merged

update reset styles #7682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e40d94
seperate reset styles
afc163 Sep 20, 2017
e69df89
not reset ul/ol/p/heading
afc163 Sep 21, 2017
f6254f2
revert reset.less idea
afc163 Sep 21, 2017
b766dfd
move label style into ant-form-item, #5851
afc163 Sep 21, 2017
5353e7a
revert reset.less idea
afc163 Sep 21, 2017
3fa3862
update base.less
afc163 Sep 21, 2017
4bd6d87
Better typography from bootstrap@4
afc163 Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions components/alert/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";

@alert-prefix-cls: ~"@{ant-prefix}-alert";

@alert-message-color: @heading-color;
@alert-text-color: @text-color;

.@{alert-prefix-cls} {
.reset-component;
position: relative;
padding: 8px 48px 8px 38px;
border-radius: @border-radius-base;
color: @alert-text-color;
font-size: @font-size-base;
line-height: @line-height-base;

&&-no-icon {
padding: 8px 48px 8px 16px;
Expand Down
2 changes: 2 additions & 0 deletions components/anchor/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";

.@{ant-prefix}-anchor {
.reset-component;
position: relative;
&-wrapper {
background-color: @component-background;
Expand Down
2 changes: 2 additions & 0 deletions components/auto-complete/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
@autocomplete-prefix-cls: ~"@{select-prefix-cls}-auto-complete";

.@{autocomplete-prefix-cls} {
.reset-component;

&.@{select-prefix-cls} {
.@{select-prefix-cls} {
&-selection {
Expand Down
2 changes: 2 additions & 0 deletions components/avatar/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";

@avatar-prefix-cls: ~"@{ant-prefix}-avatar";

.@{avatar-prefix-cls} {
.reset-component;
display: inline-block;
text-align: center;
background: @avatar-bg;
Expand Down
2 changes: 2 additions & 0 deletions components/back-top/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";

@backtop-prefix-cls: ~"@{ant-prefix}-back-top";

.@{backtop-prefix-cls} {
.reset-component;
z-index: @zindex-back-top;
position: fixed;
right: 100px;
Expand Down
2 changes: 2 additions & 0 deletions components/badge/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";

@badge-prefix-cls: ~"@{ant-prefix}-badge";
@number-prefix-cls: ~"@{ant-prefix}-scroll-number";

.@{badge-prefix-cls} {
.reset-component;
position: relative;
display: inline-block;
line-height: 1;
Expand Down
4 changes: 2 additions & 2 deletions components/breadcrumb/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";

@breadcrumb-prefix-cls: ~"@{ant-prefix}-breadcrumb";

.@{breadcrumb-prefix-cls} {
color: @text-color;
font-size: @font-size-base;
.reset-component;

a {
color: @text-color;
Expand Down
1 change: 1 addition & 0 deletions components/button/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// Button styles
// -----------------------------
.@{btn-prefix-cls} {
.reset-component;
.btn;
.btn-default;

Expand Down
4 changes: 2 additions & 2 deletions components/calendar/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "../../style/themes/default";
@import "../../style/mixins/index";

@full-calendar-prefix-cls: ~"@{ant-prefix}-fullcalendar";

.@{full-calendar-prefix-cls} {
font-size: @font-size-base;
line-height: @line-height-base;
.reset-component;
outline: none;
border-top: @border-width-base @border-style-base @border-color-base;

Expand Down
6 changes: 6 additions & 0 deletions components/card/demo/basic.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ ReactDOM.render(
</Card>
, mountNode);
````

<style>
.code-box-demo p {
margin: 0;
}
</style>
5 changes: 4 additions & 1 deletion components/card/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
@card-padding-wider: 32px;

.@{card-prefix-cls} {
.reset-component;
background: @component-background;
border-radius: @border-radius-sm;
font-size: @font-size-base;
position: relative;
transition: all .3s;

Expand Down Expand Up @@ -78,6 +78,9 @@

&-loading-content {
padding: @card-padding-base;
p {
margin: 0;
}
}

&-loading-block {
Expand Down
2 changes: 2 additions & 0 deletions components/carousel/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
@import "../../style/mixins/index";

.@{ant-prefix}-carousel {
.reset-component;

.slick-slider {
position: relative;
display: block;
Expand Down
12 changes: 10 additions & 2 deletions components/cascader/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@cascader-prefix-cls: ~"@{ant-prefix}-cascader";

.@{cascader-prefix-cls} {
font-size: @font-size-base;
.reset-component;

&-input.@{ant-prefix}-input {
// Add important to fix https://github.com/ant-design/ant-design/issues/5078
Expand All @@ -17,10 +17,10 @@
}

&-picker {
.reset-component;
position: relative;
display: inline-block;
cursor: pointer;
font-size: @font-size-base;
background-color: @component-background;
border-radius: @border-radius-base;
outline: 0;
Expand Down Expand Up @@ -110,6 +110,14 @@
border-radius: @border-radius-base;
box-shadow: @box-shadow-base;
white-space: nowrap;

ul,
ol {
list-style: none;
margin: 0;
padding: 0;
}

&-empty,
&-hidden {
display: none;
Expand Down
5 changes: 3 additions & 2 deletions components/checkbox/style/mixin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@checkbox-inner-prefix-cls: ~"@{checkbox-prefix-cls}-inner";
// 一般状态
.@{checkbox-prefix-cls} {
.reset-component;
white-space: nowrap;
cursor: pointer;
outline: none;
Expand Down Expand Up @@ -148,8 +149,8 @@
}

.@{checkbox-prefix-cls}-wrapper {
.reset-component;
cursor: pointer;
font-size: @font-size-base;
display: inline-block;
&:not(:last-child) {
margin-right: 8px;
Expand All @@ -163,7 +164,7 @@
}

.@{checkbox-prefix-cls}-group {
font-size: @font-size-base;
.reset-component;
&-item {
display: inline-block;
}
Expand Down
1 change: 1 addition & 0 deletions components/collapse/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
}

.@{collapse-prefix-cls} {
.reset-component;
background-color: @collapse-header-bg;
border-radius: @border-radius-base;
border: @border-width-base @border-style-base @border-color-base;
Expand Down
3 changes: 2 additions & 1 deletion components/date-picker/style/Picker.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.@{calendar-prefix-cls}-picker-container {
.reset-component;
position: absolute;
z-index: @zindex-picker;

Expand Down Expand Up @@ -28,10 +29,10 @@
}

.@{calendar-prefix-cls}-picker {
.reset-component;
position: relative;
display: inline-block;
outline: none;
font-size: @font-size-base;
transition: opacity 0.3s;

&-input {
Expand Down
1 change: 1 addition & 0 deletions components/divider/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@divider-prefix-cls: ~"@{ant-prefix}-divider";

.@{divider-prefix-cls} {
.reset-component;
background: @border-color-split;

&, // for compatiable
Expand Down
4 changes: 1 addition & 3 deletions components/dropdown/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
@dropdown-prefix-cls: ~"@{ant-prefix}-dropdown";

.@{dropdown-prefix-cls} {
.reset-component;
position: absolute;
left: -9999px;
top: -9999px;
z-index: @zindex-dropdown;
display: block;
font-size: @font-size-base;
font-weight: normal;
line-height: 1.5;

&-wrap {
position: relative;
Expand Down
28 changes: 17 additions & 11 deletions components/form/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,9 @@
@form-component-height: @input-height-lg;
@form-feedback-icon-size: 14px;

.reset-form();

label {
position: relative;

> .@{iconfont-css-prefix} {
vertical-align: top;
font-size: @font-size-base;
}
.@{form-prefix-cls} {
.reset-component;
.reset-form;
}

.@{form-prefix-cls}-item-required:before {
Expand Down Expand Up @@ -65,9 +59,17 @@ input[type="checkbox"] {
// Form items
// You should wrap labels and controls in .@{form-prefix-cls}-item for optimum spacing
.@{form-prefix-cls}-item {
font-size: @font-size-base;
label {
position: relative;

> .@{iconfont-css-prefix} {
vertical-align: top;
font-size: @font-size-base;
}
}

.reset-component;
margin-bottom: @form-item-margin-bottom;
color: @text-color;
vertical-align: top;
transition: margin .15s steps(1);

Expand All @@ -81,6 +83,10 @@ input[type="checkbox"] {
line-height: @form-component-height;
position: relative;
.clearfix;
font-size: 0;
* {
font-size: @font-size-base;
}
}

&-with-help {
Expand Down
1 change: 1 addition & 0 deletions components/grid/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
.@{ant-prefix}-row {
.make-row();
display: block;
box-sizing: border-box;
}

.@{ant-prefix}-row-flex {
Expand Down
1 change: 1 addition & 0 deletions components/grid/style/mixin.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
.loop-grid-columns(@index, @class) when (@index > 0) {
.@{ant-prefix}-col@{class}-@{index} {
display: block;
box-sizing: border-box;
width: percentage((@index / @grid-columns));
}
.@{ant-prefix}-col@{class}-push-@{index} {
Expand Down
5 changes: 2 additions & 3 deletions components/input-number/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
}

.@{input-number-prefix-cls} {
.input();
.reset-component;
.input;
margin: 0;
padding: 0;
font-size: @font-size-base;
height: @input-height-base;
display: inline-block;
border: @border-width-base @border-style-base @border-color-base;
border-radius: @border-radius-base;
Expand Down
3 changes: 3 additions & 0 deletions components/input/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@

// Input styles
.@{ant-prefix}-input {
.reset-component;
.input;
}

//== Style for input-group: input with label, with button or dropdown...
.@{ant-prefix}-input-group {
.reset-component;
.input-group(~"@{ant-prefix}-input");
&-wrapper {
display: inline-block;
Expand All @@ -19,6 +21,7 @@

// Input with affix: prefix or suffix
.@{ant-prefix}-input-affix-wrapper {
.reset-component;
.input-affix-wrapper(~"@{ant-prefix}-input");

// https://github.com/ant-design/ant-design/issues/6144
Expand Down
5 changes: 5 additions & 0 deletions components/layout/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
flex: auto;
background: @layout-body-background;

&,
* {
box-sizing: border-box;
}

&&-has-sider {
flex-direction: row;
> .@{layout-prefix-cls},
Expand Down
2 changes: 2 additions & 0 deletions components/list/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
@list-prefix-cls: ~"@{ant-prefix}-list";

.@{list-prefix-cls} {
.reset-component;

&-more, &-pagination {
margin-top: 24px;
text-align: center;
Expand Down