mirror of
https://github.com/mdbootstrap/mdb-ui-kit.git
synced 2025-02-18 04:30:38 +03:00
publish: fix: bug #1278 - reverts lineheight to default 1.5 and uses padding to control layout. (#1291)
generated from commit 5aefc24fbe
This commit is contained in:
parent
28723392c4
commit
339fa2f3df
|
@ -10150,6 +10150,11 @@ fieldset[disabled][disabled] .has-danger .form-control, fieldset[disabled][disab
|
|||
.bmd-form-group label,
|
||||
.bmd-form-group input::placeholder {
|
||||
line-height: 1; }
|
||||
.bmd-form-group input.form-control, .bmd-form-group input.custom-file-control,
|
||||
.bmd-form-group input.form-control::placeholder,
|
||||
.bmd-form-group input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
.bmd-form-group .radio label,
|
||||
.bmd-form-group label.radio-inline,
|
||||
.bmd-form-group .checkbox label,
|
||||
|
@ -10204,6 +10209,11 @@ fieldset[disabled][disabled] .has-danger .form-control, fieldset[disabled][disab
|
|||
.bmd-form-group.bmd-form-group-sm label,
|
||||
.bmd-form-group.bmd-form-group-sm input::placeholder {
|
||||
line-height: 1; }
|
||||
.bmd-form-group.bmd-form-group-sm input.form-control, .bmd-form-group.bmd-form-group-sm input.custom-file-control,
|
||||
.bmd-form-group.bmd-form-group-sm input.form-control::placeholder,
|
||||
.bmd-form-group.bmd-form-group-sm input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
.bmd-form-group.bmd-form-group-sm .radio label,
|
||||
.bmd-form-group.bmd-form-group-sm label.radio-inline,
|
||||
.bmd-form-group.bmd-form-group-sm .checkbox label,
|
||||
|
@ -10258,6 +10268,11 @@ fieldset[disabled][disabled] .has-danger .form-control, fieldset[disabled][disab
|
|||
.bmd-form-group.bmd-form-group-lg label,
|
||||
.bmd-form-group.bmd-form-group-lg input::placeholder {
|
||||
line-height: 1; }
|
||||
.bmd-form-group.bmd-form-group-lg input.form-control, .bmd-form-group.bmd-form-group-lg input.custom-file-control,
|
||||
.bmd-form-group.bmd-form-group-lg input.form-control::placeholder,
|
||||
.bmd-form-group.bmd-form-group-lg input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
.bmd-form-group.bmd-form-group-lg .radio label,
|
||||
.bmd-form-group.bmd-form-group-lg label.radio-inline,
|
||||
.bmd-form-group.bmd-form-group-lg .checkbox label,
|
||||
|
@ -10312,6 +10327,12 @@ label,
|
|||
input::placeholder {
|
||||
line-height: 1; }
|
||||
|
||||
input.form-control, input.custom-file-control,
|
||||
input.form-control::placeholder,
|
||||
input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
|
||||
.radio label,
|
||||
label.radio-inline,
|
||||
.checkbox label,
|
||||
|
|
2
assets/css/docs.min.css
vendored
2
assets/css/docs.min.css
vendored
File diff suppressed because one or more lines are too long
21
dist/css/bootstrap-material-design.css
vendored
21
dist/css/bootstrap-material-design.css
vendored
|
@ -10143,6 +10143,11 @@ fieldset[disabled][disabled] .has-danger .form-control, fieldset[disabled][disab
|
|||
.bmd-form-group label,
|
||||
.bmd-form-group input::placeholder {
|
||||
line-height: 1; }
|
||||
.bmd-form-group input.form-control, .bmd-form-group input.custom-file-control,
|
||||
.bmd-form-group input.form-control::placeholder,
|
||||
.bmd-form-group input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
.bmd-form-group .radio label,
|
||||
.bmd-form-group label.radio-inline,
|
||||
.bmd-form-group .checkbox label,
|
||||
|
@ -10197,6 +10202,11 @@ fieldset[disabled][disabled] .has-danger .form-control, fieldset[disabled][disab
|
|||
.bmd-form-group.bmd-form-group-sm label,
|
||||
.bmd-form-group.bmd-form-group-sm input::placeholder {
|
||||
line-height: 1; }
|
||||
.bmd-form-group.bmd-form-group-sm input.form-control, .bmd-form-group.bmd-form-group-sm input.custom-file-control,
|
||||
.bmd-form-group.bmd-form-group-sm input.form-control::placeholder,
|
||||
.bmd-form-group.bmd-form-group-sm input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
.bmd-form-group.bmd-form-group-sm .radio label,
|
||||
.bmd-form-group.bmd-form-group-sm label.radio-inline,
|
||||
.bmd-form-group.bmd-form-group-sm .checkbox label,
|
||||
|
@ -10251,6 +10261,11 @@ fieldset[disabled][disabled] .has-danger .form-control, fieldset[disabled][disab
|
|||
.bmd-form-group.bmd-form-group-lg label,
|
||||
.bmd-form-group.bmd-form-group-lg input::placeholder {
|
||||
line-height: 1; }
|
||||
.bmd-form-group.bmd-form-group-lg input.form-control, .bmd-form-group.bmd-form-group-lg input.custom-file-control,
|
||||
.bmd-form-group.bmd-form-group-lg input.form-control::placeholder,
|
||||
.bmd-form-group.bmd-form-group-lg input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
.bmd-form-group.bmd-form-group-lg .radio label,
|
||||
.bmd-form-group.bmd-form-group-lg label.radio-inline,
|
||||
.bmd-form-group.bmd-form-group-lg .checkbox label,
|
||||
|
@ -10305,6 +10320,12 @@ label,
|
|||
input::placeholder {
|
||||
line-height: 1; }
|
||||
|
||||
input.form-control, input.custom-file-control,
|
||||
input.form-control::placeholder,
|
||||
input.custom-file-control::placeholder {
|
||||
padding: 0.28125rem 0;
|
||||
line-height: 1.5; }
|
||||
|
||||
.radio label,
|
||||
label.radio-inline,
|
||||
.checkbox label,
|
||||
|
|
2
dist/css/bootstrap-material-design.min.css
vendored
2
dist/css/bootstrap-material-design.min.css
vendored
File diff suppressed because one or more lines are too long
|
@ -1260,9 +1260,6 @@
|
|||
<li class="toc-entry toc-h2"><a href="#package-managers">Package managers</a>
|
||||
<ul>
|
||||
<li class="toc-entry toc-h3"><a href="#npm">npm</a></li>
|
||||
<li class="toc-entry toc-h3"><a href="#rubygems">RubyGems</a></li>
|
||||
<li class="toc-entry toc-h3"><a href="#composer">Composer</a></li>
|
||||
<li class="toc-entry toc-h3"><a href="#nuget">NuGet</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
@ -1318,45 +1315,64 @@
|
|||
|
||||
<h3 id="npm">npm</h3>
|
||||
|
||||
<p>Install Bootstrap in your Node.js powered apps with <a href="https://www.npmjs.com/package/bootstrap">the npm package</a>:</p>
|
||||
<p>Install Bootstrap Material Design in your Node.js powered apps with <a href="https://www.npmjs.com/package/bootstrap-material-design">the npm package</a>:</p>
|
||||
|
||||
<figure class="highlight"><pre><code class="language-sh" data-lang="sh">npm install bootstrap</code></pre></figure>
|
||||
<figure class="highlight"><pre><code class="language-sh" data-lang="sh">npm install bootstrap-material-design@4.1.1</code></pre></figure>
|
||||
|
||||
<p><code class="highlighter-rouge">require('bootstrap')</code> will load all of Bootstrap’s jQuery plugins onto the jQuery object. The <code class="highlighter-rouge">bootstrap</code> module itself does not export anything. You can manually load Bootstrap’s jQuery plugins individually by loading the <code class="highlighter-rouge">/js/*.js</code> files under the package’s top-level directory.</p>
|
||||
<p><code class="highlighter-rouge">require('bootstrap-material-design')</code> will load all of Bootstrap Material Design’s jQuery plugins onto the jQuery object. The <code class="highlighter-rouge">bootstrap-material-design</code> module itself does not export anything. You can manually load Bootstrap’s jQuery plugins individually by loading the <code class="highlighter-rouge">/js/*.js</code> files under the package’s top-level directory.</p>
|
||||
|
||||
<p>Bootstrap’s <code class="highlighter-rouge">package.json</code> contains some additional metadata under the following keys:</p>
|
||||
<p>Bootstrap Material Design’s <code class="highlighter-rouge">package.json</code> contains some additional metadata under the following keys:</p>
|
||||
|
||||
<ul>
|
||||
<li><code class="highlighter-rouge">sass</code> - path to Bootstrap’s main <a href="http://sass-lang.com/">Sass</a> source file</li>
|
||||
<li><code class="highlighter-rouge">style</code> - path to Bootstrap’s non-minified CSS that’s been precompiled using the default settings (no customization)</li>
|
||||
<li><code class="highlighter-rouge">sass</code> - path to Bootstrap Material Design’s main <a href="http://sass-lang.com/">Sass</a> source file</li>
|
||||
<li><code class="highlighter-rouge">style</code> - path to Bootstrap Material Design’s non-minified CSS that’s been precompiled using the default settings (no customization)</li>
|
||||
</ul>
|
||||
|
||||
<h3 id="rubygems">RubyGems</h3>
|
||||
<!--- ### RubyGems --->
|
||||
|
||||
<p>Install Bootstrap in your Ruby apps using <a href="https://bundler.io/">Bundler</a> (<strong>recommended</strong>) and <a href="https://rubygems.org/">RubyGems</a> by adding the following line to your <a href="https://bundler.io/gemfile.html"><code class="highlighter-rouge">Gemfile</code></a>:</p>
|
||||
<!--- Install Bootstrap in your Ruby apps using [Bundler](https://bundler.io/) (**recommended**) and [RubyGems](https://rubygems.org/) by adding the following line to your [`Gemfile`](https://bundler.io/gemfile.html): --->
|
||||
|
||||
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="n">gem</span> <span class="s1">'bootstrap'</span><span class="p">,</span> <span class="s1">'~> '</span></code></pre></figure>
|
||||
<!---
|
||||
<figure class="highlight"><pre><code class="language-ruby" data-lang="ruby"> <span class="o">---></span>
|
||||
<span class="o"><!---</span> <span class="n">gem</span> <span class="s1">'bootstrap'</span><span class="p">,</span> <span class="s1">'~> '</span> <span class="o">---></span>
|
||||
<span class="o"><!---</span> </code></pre></figure>
|
||||
--->
|
||||
|
||||
<p>Alternatively, if you’re not using Bundler, you can install the gem by running this command:</p>
|
||||
<!--- Alternatively, if you're not using Bundler, you can install the gem by running this command: --->
|
||||
|
||||
<figure class="highlight"><pre><code class="language-sh" data-lang="sh">gem install bootstrap -v </code></pre></figure>
|
||||
<!---
|
||||
<figure class="highlight"><pre><code class="language-sh" data-lang="sh"> --->
|
||||
<!--- gem install bootstrap -v 4.1.1 --->
|
||||
<!--- </code></pre></figure>
|
||||
--->
|
||||
|
||||
<p><a href="https://github.com/twbs/bootstrap-rubygem/blob/master/README.md">See the gem’s README</a> for further details.</p>
|
||||
<!--- [See the gem's README](https://github.com/twbs/bootstrap-rubygem/blob/master/README.md) for further details. --->
|
||||
|
||||
<h3 id="composer">Composer</h3>
|
||||
<!--- ### Composer --->
|
||||
|
||||
<p>You can also install and manage Bootstrap’s Sass and JavaScript using <a href="https://getcomposer.org/">Composer</a>:</p>
|
||||
<!--- You can also install and manage Bootstrap's Sass and JavaScript using [Composer](https://getcomposer.org/): --->
|
||||
|
||||
<figure class="highlight"><pre><code class="language-sh" data-lang="sh">composer require twbs/bootstrap:4.1.1</code></pre></figure>
|
||||
<!---
|
||||
<figure class="highlight"><pre><code class="language-sh" data-lang="sh"> --->
|
||||
<!--- composer require twbs/bootstrap:4.1.1 --->
|
||||
<!--- </code></pre></figure>
|
||||
--->
|
||||
|
||||
<h3 id="nuget">NuGet</h3>
|
||||
<!--- ### NuGet --->
|
||||
|
||||
<p>If you develop in .NET, you can also install and manage Bootstrap’s <a href="https://www.nuget.org/packages/bootstrap/">CSS</a> or <a href="https://www.nuget.org/packages/bootstrap.sass/">Sass</a> and JavaScript using <a href="https://www.nuget.org/">NuGet</a>:</p>
|
||||
<!--- If you develop in .NET, you can also install and manage Bootstrap's [CSS](https://www.nuget.org/packages/bootstrap/) or [Sass](https://www.nuget.org/packages/bootstrap.sass/) and JavaScript using [NuGet](https://www.nuget.org/): --->
|
||||
|
||||
<figure class="highlight"><pre><code class="language-powershell" data-lang="powershell">Install-Package bootstrap</code></pre></figure>
|
||||
|
||||
<figure class="highlight"><pre><code class="language-powershell" data-lang="powershell">Install-Package bootstrap.sass</code></pre></figure>
|
||||
<!---
|
||||
<figure class="highlight"><pre><code class="language-powershell" data-lang="powershell"> --->
|
||||
<!--- Install-Package bootstrap --->
|
||||
<!--- </code></pre></figure>
|
||||
--->
|
||||
|
||||
<!---
|
||||
<figure class="highlight"><pre><code class="language-powershell" data-lang="powershell"> --->
|
||||
<!--- Install-Package bootstrap.sass --->
|
||||
<!--- </code></pre></figure>
|
||||
--->
|
||||
|
||||
</main>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue
Block a user