mirror of
https://github.com/mdbootstrap/mdb-ui-kit.git
synced 2025-02-02 12:54:13 +03:00
syncing some updates from bootstrap v4
This commit is contained in:
parent
8cb4f02d63
commit
d652c7b90b
13
.travis.yml
13
.travis.yml
|
@ -4,7 +4,7 @@ git:
|
|||
depth: 10
|
||||
node_js:
|
||||
- "4"
|
||||
- "stable"
|
||||
- "5"
|
||||
before_install:
|
||||
- rvm install 2.2.2
|
||||
- rvm use 2.2.2 --fuzzy
|
||||
|
@ -22,11 +22,12 @@ install:
|
|||
- npm install -g bower
|
||||
- bower install
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- node_modules
|
||||
- vendor/bundle
|
||||
- bower-components
|
||||
# Caching disabled due to https://github.com/travis-ci/travis-ci/issues/5092
|
||||
#cache:
|
||||
# directories:
|
||||
# - node_modules
|
||||
# - vendor/bundle
|
||||
# - bower-components
|
||||
|
||||
addons:
|
||||
sauce_connect:
|
||||
|
|
4
Gemfile
4
Gemfile
|
@ -1,9 +1,9 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
group :development, :test do
|
||||
gem 'jekyll', '~> 3.0.0'
|
||||
gem 'jekyll', '~> 3.0.1'
|
||||
gem 'jekyll-redirect-from', '~> 0.9.0'
|
||||
gem 'jekyll-sitemap', '~> 0.9.0'
|
||||
gem 'sass', '~> 3.4.19'
|
||||
gem 'scss_lint', '~> 0.42.2'
|
||||
gem 'scss_lint', '~> 0.43'
|
||||
end
|
||||
|
|
|
@ -32,7 +32,7 @@ GEM
|
|||
rouge (1.10.1)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.4.19)
|
||||
scss_lint (0.42.2)
|
||||
scss_lint (0.43.2)
|
||||
rainbow (~> 2.0)
|
||||
sass (~> 3.4.15)
|
||||
|
||||
|
@ -40,8 +40,8 @@ PLATFORMS
|
|||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
jekyll (~> 3.0.0)
|
||||
jekyll (~> 3.0.1)
|
||||
jekyll-redirect-from (~> 0.9.0)
|
||||
jekyll-sitemap (~> 0.9.0)
|
||||
sass (~> 3.4.19)
|
||||
scss_lint (~> 0.42.2)
|
||||
scss_lint (~> 0.43)
|
||||
|
|
26
Gruntfile.js
26
Gruntfile.js
|
@ -16,19 +16,33 @@ module.exports = function (grunt) {
|
|||
var mq4HoverShim = require('mq4-hover-shim');
|
||||
var autoprefixer = require('autoprefixer')({
|
||||
browsers: [
|
||||
'Android 2.3',
|
||||
'Android >= 4',
|
||||
'Chrome >= 35',
|
||||
'Firefox >= 31',
|
||||
//
|
||||
// Official browser support policy:
|
||||
// http://v4-alpha.getbootstrap.com/getting-started/browsers-devices/#supported-browsers
|
||||
//
|
||||
'Chrome >= 35', // Exact version number here is kinda arbitrary
|
||||
// Rather than using Autoprefixer's native "Firefox ESR" version specifier string,
|
||||
// we deliberately hardcode the number. This is to avoid unwittingly severely breaking the previous ESR in the event that:
|
||||
// (a) we happen to ship a new Bootstrap release soon after the release of a new ESR,
|
||||
// such that folks haven't yet had a reasonable amount of time to upgrade; and
|
||||
// (b) the new ESR has unprefixed CSS properties/values whose absence would severely break webpages
|
||||
// (e.g. `box-sizing`, as opposed to `background: linear-gradient(...)`).
|
||||
// Since they've been unprefixed, Autoprefixer will stop prefixing them,
|
||||
// thus causing them to not work in the previous ESR (where the prefixes were required).
|
||||
'Firefox >= 31', // Current Firefox Extended Support Release (ESR)
|
||||
// Note: Edge versions in Autoprefixer & Can I Use refer to the EdgeHTML rendering engine version,
|
||||
// NOT the Edge app version shown in Edge's "About" screen.
|
||||
// For example, at the time of writing, Edge 20 on an up-to-date system uses EdgeHTML 12.
|
||||
// See also https://github.com/Fyrd/caniuse/issues/1928
|
||||
'Edge >= 12',
|
||||
'Explorer >= 9',
|
||||
// Out of leniency, we prefix these 1 version further back than the official policy.
|
||||
'iOS >= 7',
|
||||
'Opera >= 12',
|
||||
'Safari >= 7.1'
|
||||
'Safari >= 7.1',
|
||||
// The following remain NOT officially supported, but we're lenient and include their prefixes to avoid severely breaking in them.
|
||||
'Android 2.3',
|
||||
'Android >= 4',
|
||||
'Opera >= 12'
|
||||
]
|
||||
});
|
||||
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
#baseurl: "/bootstrap-material-design"
|
||||
#url: "http://fezvrasta.github.io"
|
||||
#url: "http://rosskevin.github.io"
|
||||
|
||||
include:
|
||||
- .nojekyll
|
||||
|
||||
|
@ -24,8 +20,10 @@ source: docs
|
|||
destination: _gh_pages
|
||||
host: 0.0.0.0
|
||||
port: 9001
|
||||
url: http://fezvrasta.github.io/bootstrap-material-design
|
||||
#baseurl: "/bootstrap-material-design"
|
||||
#url: "http://fezvrasta.github.io"
|
||||
encoding: UTF-8
|
||||
exclude: [assets/scss/]
|
||||
|
||||
gems:
|
||||
- jekyll-redirect-from
|
||||
|
|
|
@ -108,6 +108,20 @@ Buttons in input groups are a bit different and require one extra level of nesti
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<div class="row">
|
||||
<div class="col-lg-offset-3 col-lg-6">
|
||||
<div class="input-group">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-secondary" type="button">Hate it</button>
|
||||
</span>
|
||||
<input type="text" class="form-control" placeholder="Product name">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-secondary" type="button">Love it</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endexample %}
|
||||
|
||||
## Buttons with dropdowns
|
||||
|
|
12
grunt/npm-shrinkwrap.json
generated
12
grunt/npm-shrinkwrap.json
generated
|
@ -159,8 +159,8 @@
|
|||
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.34.tgz"
|
||||
},
|
||||
"babel-eslint": {
|
||||
"version": "4.1.5",
|
||||
"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-4.1.5.tgz"
|
||||
"version": "4.1.6",
|
||||
"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-4.1.6.tgz"
|
||||
},
|
||||
"babel-jscs": {
|
||||
"version": "2.0.5",
|
||||
|
@ -231,8 +231,8 @@
|
|||
"resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.34.tgz"
|
||||
},
|
||||
"balanced-match": {
|
||||
"version": "0.2.1",
|
||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz"
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
|
||||
},
|
||||
"basic-auth": {
|
||||
"version": "1.0.3",
|
||||
|
@ -265,8 +265,8 @@
|
|||
"resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.1.tgz"
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz"
|
||||
},
|
||||
"breakable": {
|
||||
"version": "1.0.0",
|
||||
|
|
Loading…
Reference in New Issue
Block a user