Skip to content

Commit

Permalink
Merge branch 'master' of github.com:squidit/css into production
Browse files Browse the repository at this point in the history
  • Loading branch information
vinimarcili committed Jun 9, 2021
2 parents ba3e148 + c7998c6 commit 62c5616
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 18 deletions.
25 changes: 18 additions & 7 deletions dist/css/squid.css
Original file line number Diff line number Diff line change
Expand Up @@ -16948,31 +16948,37 @@ h2,
h3,
h4,
h5,
h6 {
h6,
.h1,
.h2,
.h3,
.h4,
.h5,
.h6 {
margin: 0 auto 1rem;
font-weight: 700; }

h1 {
h1, .h1 {
font-size: 26px;
line-height: 28px; }

h2 {
h2, .h2 {
font-size: 24px;
line-height: 26px; }

h3 {
h3, .h3 {
font-size: 22px;
line-height: 24px; }

h4 {
h4, .h4 {
font-size: 20px;
line-height: 22px; }

h5 {
h5, .h5 {
font-size: 18px;
line-height: 20px; }

h6 {
h6, .h6 {
font-size: 16px;
line-height: 18px; }

Expand Down Expand Up @@ -17029,6 +17035,11 @@ i {
text-overflow: ellipsis;
white-space: nowrap; }

.text-ellipsis-more {
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical; }

.box-shadow, .tag-box:hover, .box, .card, .dropdown, .modal-content, .tabs-header li.active, .toast {
box-shadow: 0px 4px 12px -5px var(--gray); }

Expand Down
2 changes: 1 addition & 1 deletion dist/css/squid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/squid.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@squidit/css",
"version": "1.0.80",
"version": "1.0.81",
"scripts": {
"start": "gulp watch",
"css": "sass src/scss/squid.scss:dist/css/squid.min.css --style compressed",
Expand Down
80 changes: 79 additions & 1 deletion src/docs/src/content/typography.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,91 @@ route: /content/typography

# Typography

Documentation and examples for typography.

## Heading

| Heading | Exemple |
|---------|------------------|
| h1 | <h1>Title 1</h1> |
| h2 | <h2>Title 2</h2> |
| h3 | <h3>Title 3</h3> |
| h4 | <h4>Title 4</h4> |
| h5 | <h5>Title 5</h5> |
| h6 | <h6>Title 6</h6> |

Code, using Html Tags or using classes:

```html
<h1> Heading 1 </h1>
<h2> Heading 2 <h2>
<h2> Heading 2 </h2>
<h3> Heading 3 </h3>
<h4> Heading 4 </h4>
<h5> Heading 5 </h5>
<h6> Heading 6 </h6>
```
---
```html
<p class='h1'> Heading 1 </p>
<p class='h2'> Heading 2 </p>
<p class='h3'> Heading 3 </p>
<p class='h4'> Heading 4 </p>
<p class='h5'> Heading 5 </p>
<p class='h6'> Heading 6 </p>
```

## Alignment

Text-align are available like:

<p class='text-center'>I`m a centered text</p>

```html
<p class='text-center'>I`m a centered text</p>
```

Some values for `text-align` are available with classes:

| Property | Class |
|----------|------------------|
| center | text-center |
| left | text-left |
| right | text-right |
| justify | text-justify |

## Weight

Text-weight are available like:

<p class='text-bold'>I`m a bold text</p>

```html
<p class='text-bold'>I`m a bold text</p>
```

Some values for `text-weight` are available with classes:

| Value | Class |
|-------|--------------|
| 100 | text-thin |
| 300 | text-light |
| 400 | text-regular |
| 500 | text-medium |
| 700 | text-bold |
| 900 | text-black |

## Elipsis

To add an ellipsis at the end of the text use the following classes:

<p class='text-ellipsis'>I`m a One line ellipsis</p>

```html
<p class='text-ellipsis'>I`m a One line ellipsis</p>
```

<p class='text-ellipsis-more'>I`m a More than line ellipsis</p>

```html
<p class='text-ellipsis-more'>I`m a More than line ellipsis</p>
```
20 changes: 13 additions & 7 deletions src/scss/general/_defaults.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,37 +103,43 @@ h2,
h3,
h4,
h5,
h6 {
h6,
.h1,
.h2,
.h3,
.h4,
.h5,
.h6 {
margin: 0 auto 1rem;
font-weight: 700;
}

h1 {
h1, .h1 {
font-size: 26px;
line-height: 28px;
}

h2 {
h2, .h2 {
font-size: 24px;
line-height: 26px;
}

h3 {
h3, .h3 {
font-size: 22px;
line-height: 24px;
}

h4 {
h4, .h4 {
font-size: 20px;
line-height: 22px;
}

h5 {
h5, .h5 {
font-size: 18px;
line-height: 20px;
}

h6 {
h6, .h6 {
font-size: 16px;
line-height: 18px;
}
Expand Down
6 changes: 6 additions & 0 deletions src/scss/helpers/_texts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,9 @@ $weights: (
text-overflow: ellipsis;
white-space: nowrap;
}

.text-ellipsis-more {
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}

0 comments on commit 62c5616

Please sign in to comment.