Skip to content

Commit

Permalink
Extract reset styles. (rsuite#1039)
Browse files Browse the repository at this point in the history
  • Loading branch information
hiyangguo authored May 13, 2020
1 parent 8a8e989 commit e439ab4
Show file tree
Hide file tree
Showing 41 changed files with 10,467 additions and 243 deletions.
8 changes: 8 additions & 0 deletions docs/less/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,11 @@ html[dir='rtl'] .document-nav {
.nav-wrapper {
padding: 20px;
}

// Horizontal rules
hr {
margin-top: @line-height-computed;
margin-bottom: @line-height-computed;
border: 0;
border-top: 1px solid @hr-border;
}
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions docs/pages/components/css-reset/en/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Supported HTML Elements

With regard to typography, after using the React Suite style, you can use the HTML elements to typeset directly for displaying titles, paragraphs, lists, links, and more.If you don't need these styles , you can [disable import it][config-reset-import].

<!--{demo}-->

[config-reset-import]: /en/guide/themes#Disable%20styles%20reset
File renamed without changes.
7 changes: 7 additions & 0 deletions docs/pages/components/css-reset/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# 支持的 HTML 元素

当使用了 React Suite 后,会重置一些 HTML 元素的样式。您可以直接使用 HTML 元素进行排版,展示标题、段落、列表、链接等等。如果不需要这些样式,可以[配置不引入这些样式][config-reset-import]

<!--{demo}-->

[config-reset-import]: /guide/themes#禁用%20reset%20相关样式引用
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions docs/pages/components/timeline/styles.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@
margin-left: 24px;
}
}

.rs-timeline-item-content p {
margin: 0;
}
5 changes: 0 additions & 5 deletions docs/pages/guide/html-elements/en/index.md

This file was deleted.

5 changes: 0 additions & 5 deletions docs/pages/guide/html-elements/index.md

This file was deleted.

20 changes: 20 additions & 0 deletions docs/pages/guide/modularized/en/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,23 @@ import { Button } from 'rsuite';
require('rsuite/lib/Button/styles/themes/dark.less');
var _Button = require('rsuite/lib/Button');
```

## Disabled HTML styles reset

We reset some HTML styles in rsuite by default.But you may not need these styles when you use modularized. So you should [disable import it][config-reset-import] . This is the example config for `less-loader` :

```
{
test: /\.less$/,
loader: 'less-loader',
options: {
// If you are using less-loader@5 or older version, please spread the lessOptions to options directly.
lessOptions: {
javascriptEnabled: true,
modifyVars: { '@reset-import': false }
}
}
}
```

[config-reset-import]: /en/guide/themes#Disable%20styles%20reset
20 changes: 20 additions & 0 deletions docs/pages/guide/modularized/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,23 @@ import { Button } from 'rsuite';
require('rsuite/lib/Button/styles/themes/dark.less');
var _Button = require('rsuite/lib/Button');
```

## 禁用 HTML 相关样式的 reset

在 rsuite 中我们默认修改了一些 HTML 样式,如果您不需要这些样式,则需要[配置不引入这些样式][config-reset-import],这里以 `less-loader` 配置为例:

```
{
test: /\.less$/,
loader: 'less-loader',
options: {
// 如果使用 less-loader@5 或者更老的版本 ,请移除 lessOptions 这一级直接配置选项。
lessOptions: {
javascriptEnabled: true,
modifyVars: { '@reset-import': false }
}
}
}
```

[config-reset-import]: /guide/themes#禁用%20reset%20相关样式引用
12 changes: 12 additions & 0 deletions docs/pages/guide/themes/en/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ Information, successes, warnings, errors, respectively, the corresponding color,
@button-ripple: false;
```

### Disable IE polyfill

```less
@ie-polyfill: false;
```

### Disable HTML styles reset

```less
@reset-import: false;
```

### More Custom Configurations

We provide a rich [variable][variables.less], if still unable to meet your customized needs, welcome to our [issue][issue].
Expand Down
12 changes: 12 additions & 0 deletions docs/pages/guide/themes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@ React Suite 的样式使用了 [Less][less] 作为样式的预处理,并且定
@button-ripple: false;
```

### 禁用 IE polyfill

```less
@ie-polyfill: false;
```

### 禁用 reset 相关样式引用

```less
@reset-import: false;
```

### 更多自定义配置

我们提供了[各种场景的变量][variables.less],如果依然不能满足您的定制需求,欢迎给我们提 [issue][issue]
Expand Down
11 changes: 11 additions & 0 deletions docs/utils/component.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -591,5 +591,16 @@
"name": "DOMHelper",
"title": "DOM 助手",
"apis": ["DOMHelper"]
},
{
"group": true,
"id": "css-packs",
"name": "CSS Packs",
"title": "CSS 相关"
},
{
"id": "css-reset",
"name": "CSS Reset",
"title": "基础样式"
}
]
Loading

0 comments on commit e439ab4

Please sign in to comment.