Skip to content

Commit caa9e19

Browse files
committed
Docs + line ripple
1 parent dfc3707 commit caa9e19

24 files changed

+627
-592
lines changed

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99

1010
## 4.6.0 - RC2
1111

12-
- **New** Changed version numbers to NPM compatible ones for updates
13-
- **New** `modal-xl` is Full-screen dialog MD component
14-
- **New** Documentation search is back thanks to Algolia Docsearch
12+
- **New** `modal-xl` is the equivalent for the *Full-screen dialog* of Material Design components.
13+
- **New** Documentation search is back thanks to Algolia Docsearch.
1514
- **Fixed** `modal` documentation updated to reflect max sizes.
1615
- **Fixed** `card` overflow behavior reverted to standard BS4.
1716
- **Fixed** `Form-group`: Removed label color on form-group:focus-within.
1817
- **Fixed** Most components with text overflow are now with an ellipsis ...
19-
- **Fixed** `Table-cell` word break
18+
- **Fixed** `Table-cell` word break.
2019
- **Fixed** Various bugs related to IE11 (`card-img` aspect ratio, Material Icons, Select2 items alignment, chip close icon).
2120
- **Fixed** Datatables.net search displays suitable number of results.
2221
- **Fixed** Various minor changes.
2322
- **Improved** Datatables.net responsive rendering.
2423
- **Improved** JavaScript compilation.
24+
- Updated build dependencies.
2525

2626
## 4.6.0 - RC1
2727

assets/scss/material/_text-field-box.scss

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,30 @@
111111
// Ripple
112112

113113
@if ($enable-form-ripple) {
114-
.floating-label.textfield-box::before {
114+
.textfield-box.form-ripple-nolabel::before,
115+
.floating-label.textfield-box.form-ripple::before {
115116
top: calc(#{($textfield-box-height)} - #{(2*$textfield-border-width)});
116117
}
117118

118-
.floating-label-lg.textfield-box::before {
119-
top: calc(#{($textfield-box-height-lg)} - #{(2*$textfield-border-width)});
119+
.textfield-box-lg.form-ripple-nolabel::before,
120+
.floating-label-lg.textfield-box.form-ripple::before {
121+
top: calc(#{($textfield-box-height-lg)} - #{($textfield-border-width)});
120122
}
121123

122-
.floating-label-sm.textfield-box::before {
124+
.textfield-box-sm.form-ripple-nolabel::before,
125+
.floating-label-sm.textfield-box.form-ripple::before {
123126
top: calc(#{($textfield-box-height-sm)} - #{(2*$textfield-border-width)});
124127
}
128+
129+
.textfield-box.form-ripple::before {
130+
top: calc(85px - 2px);
131+
}
132+
133+
.textfield-box-lg.form-ripple::before {
134+
top: calc(98px - 2px);
135+
}
136+
137+
.textfield-box-sm.form-ripple::before {
138+
top: calc(73px - 2px);
139+
}
125140
}

assets/scss/material/_text-field.scss

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -345,18 +345,16 @@ textarea {
345345
padding-right: calc(1.5rem + 0.5rem);
346346
}
347347

348-
// Line ripple + label color on focus
349-
350-
[class*='form-ripple'] {
351-
&:focus-within label:not(.custom-control-label):not(.form-check-label):not(.btn) {
352-
color: selection-theme-color();
348+
@if ($enable-form-ripple) {
349+
// Line ripple + label color on focus
350+
[class*='form-ripple'] {
351+
&:focus-within label:not(.custom-control-label):not(.form-check-label):not(.btn) {
352+
color: selection-theme-color();
353+
}
353354
}
354-
}
355355

356-
@if ($enable-form-ripple) {
357356
[class*='form-ripple'],
358-
.floating-label,
359-
.textfield-box {
357+
.floating-label {
360358
position: relative;
361359

362360
&::before {
@@ -378,9 +376,7 @@ textarea {
378376
}
379377
}
380378

381-
[class*='form-ripple']:focus-within::before,
382-
.floating-label.is-focused::before,
383-
.textfield-box:focus-within::before {
379+
[class*='form-ripple']:focus-within::before {
384380
transform: scaleX(1);
385381
}
386382

@@ -390,7 +386,7 @@ textarea {
390386
}
391387

392388
.form-ripple-lg::before {
393-
top: calc(81px - 2px);
389+
top: calc(82px - 2px);
394390
}
395391

396392
.form-ripple-sm::before {
@@ -402,10 +398,14 @@ textarea {
402398
}
403399

404400
.form-ripple-lg-nolabel::before {
405-
top: calc(60px - 2px);
401+
top: calc(61px - 2px);
406402
}
407403

408404
.form-ripple-sm-nolabel::before {
409405
top: calc(32px - 2px);
410406
}
407+
408+
.form-ripple-bottom::before {
409+
bottom: 0 !important; // stylelint-disable-line declaration-no-important
410+
}
411411
}

assets/scss/utilities/_webkit-custom.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// TODO: doc
2-
31
// Clear icon
42
::-webkit-search-cancel-button,
53
::-webkit-clear-button {

css/material.css

Lines changed: 31 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/material.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/material.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/material.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/4.6/material/dialogs.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,36 @@ You'll notice that the modal-body has a custom scrollbar on both Firefox and Chr
182182
</div>
183183
{% endhighlight %}
184184

185+
### Full-screen dialog
186+
187+
Full-screen dialogs group a series of tasks, such as creating a calendar entry with the event title, date, location, and time. Because they take up the entire screen, full-screen dialogs are the only dialogs over which other dialogs can appear.
188+
189+
Modal-xl is adapted to reproduce Full screen material dialog.
190+
191+
<div class="bd-example">
192+
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalXl">Extra large modal</button>
193+
</div>
194+
195+
{% highlight html %}
196+
<div class="modal-dialog modal-xl">...</div>
197+
{% endhighlight %}
198+
199+
<div class="modal fade" id="exampleModalXl" tabindex="-1" aria-labelledby="exampleModalXlLabel" aria-hidden="true">
200+
<div class="modal-dialog modal-xl">
201+
<div class="modal-content">
202+
<div class="modal-header">
203+
<h5 class="modal-title h4" id="exampleModalXlLabel">Extra large modal</h5>
204+
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
205+
<span aria-hidden="true">&times;</span>
206+
</button>
207+
</div>
208+
<div class="modal-body">
209+
...
210+
</div>
211+
</div>
212+
</div>
213+
</div>
214+
185215
## Buttons
186216

187217
### Side-by-side buttons

0 commit comments

Comments
 (0)