mirror of https://github.com/twbs/bootstrap.git
				
				
				
			
							parent
							
								
									364925f951
								
							
						
					
					
						commit
						608dead1fe
					
				| 
						 | 
					@ -48,6 +48,9 @@ scss-lint-report.xml
 | 
				
			||||||
# grunt-contrib-sass cache
 | 
					# grunt-contrib-sass cache
 | 
				
			||||||
.sass-cache
 | 
					.sass-cache
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Jekyll metadata
 | 
				
			||||||
 | 
					docs/.jekyll-metadata
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Folders to ignore
 | 
					# Folders to ignore
 | 
				
			||||||
bower_components
 | 
					bower_components
 | 
				
			||||||
node_modules
 | 
					node_modules
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										5
									
								
								Gemfile
								
								
								
								
							
							
						
						
									
										5
									
								
								Gemfile
								
								
								
								
							| 
						 | 
					@ -4,10 +4,9 @@
 | 
				
			||||||
source 'https://rubygems.org'
 | 
					source 'https://rubygems.org'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
group :development, :test do
 | 
					group :development, :test do
 | 
				
			||||||
  gem 'jekyll', '~> 2.5.3'
 | 
					  gem 'jekyll', '~> 3.0.0'
 | 
				
			||||||
  gem 'jekyll-redirect-from', '~> 0.8.0'
 | 
					  gem 'jekyll-redirect-from', '~> 0.9.0'
 | 
				
			||||||
  gem 'jekyll-sitemap', '~> 0.9.0'
 | 
					  gem 'jekyll-sitemap', '~> 0.9.0'
 | 
				
			||||||
  gem 'rouge', '~> 1.10.1'
 | 
					 | 
				
			||||||
  gem 'sass', '~> 3.4.19'
 | 
					  gem 'sass', '~> 3.4.19'
 | 
				
			||||||
  gem 'scss_lint', '~> 0.42.2'
 | 
					  gem 'scss_lint', '~> 0.42.2'
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										44
									
								
								Gemfile.lock
								
								
								
								
							
							
						
						
									
										44
									
								
								Gemfile.lock
								
								
								
								
							| 
						 | 
					@ -1,37 +1,18 @@
 | 
				
			||||||
GEM
 | 
					GEM
 | 
				
			||||||
  remote: https://rubygems.org/
 | 
					  remote: https://rubygems.org/
 | 
				
			||||||
  specs:
 | 
					  specs:
 | 
				
			||||||
    blankslate (2.1.2.4)
 | 
					 | 
				
			||||||
    classifier-reborn (2.0.3)
 | 
					 | 
				
			||||||
      fast-stemmer (~> 1.0)
 | 
					 | 
				
			||||||
    coffee-script (2.4.1)
 | 
					 | 
				
			||||||
      coffee-script-source
 | 
					 | 
				
			||||||
      execjs
 | 
					 | 
				
			||||||
    coffee-script-source (1.9.1.1)
 | 
					 | 
				
			||||||
    colorator (0.1)
 | 
					    colorator (0.1)
 | 
				
			||||||
    execjs (2.6.0)
 | 
					 | 
				
			||||||
    fast-stemmer (1.0.2)
 | 
					 | 
				
			||||||
    ffi (1.9.10)
 | 
					    ffi (1.9.10)
 | 
				
			||||||
    jekyll (2.5.3)
 | 
					    jekyll (3.0.0)
 | 
				
			||||||
      classifier-reborn (~> 2.0)
 | 
					 | 
				
			||||||
      colorator (~> 0.1)
 | 
					      colorator (~> 0.1)
 | 
				
			||||||
      jekyll-coffeescript (~> 1.0)
 | 
					 | 
				
			||||||
      jekyll-gist (~> 1.0)
 | 
					 | 
				
			||||||
      jekyll-paginate (~> 1.0)
 | 
					 | 
				
			||||||
      jekyll-sass-converter (~> 1.0)
 | 
					      jekyll-sass-converter (~> 1.0)
 | 
				
			||||||
      jekyll-watch (~> 1.1)
 | 
					      jekyll-watch (~> 1.1)
 | 
				
			||||||
      kramdown (~> 1.3)
 | 
					      kramdown (~> 1.3)
 | 
				
			||||||
      liquid (~> 2.6.1)
 | 
					      liquid (~> 3.0)
 | 
				
			||||||
      mercenary (~> 0.3.3)
 | 
					      mercenary (~> 0.3.3)
 | 
				
			||||||
      pygments.rb (~> 0.6.0)
 | 
					      rouge (~> 1.7)
 | 
				
			||||||
      redcarpet (~> 3.1)
 | 
					 | 
				
			||||||
      safe_yaml (~> 1.0)
 | 
					      safe_yaml (~> 1.0)
 | 
				
			||||||
      toml (~> 0.1.0)
 | 
					    jekyll-redirect-from (0.9.0)
 | 
				
			||||||
    jekyll-coffeescript (1.0.1)
 | 
					 | 
				
			||||||
      coffee-script (~> 2.2)
 | 
					 | 
				
			||||||
    jekyll-gist (1.3.4)
 | 
					 | 
				
			||||||
    jekyll-paginate (1.1.0)
 | 
					 | 
				
			||||||
    jekyll-redirect-from (0.8.0)
 | 
					 | 
				
			||||||
      jekyll (>= 2.0)
 | 
					      jekyll (>= 2.0)
 | 
				
			||||||
    jekyll-sass-converter (1.3.0)
 | 
					    jekyll-sass-converter (1.3.0)
 | 
				
			||||||
      sass (~> 3.2)
 | 
					      sass (~> 3.2)
 | 
				
			||||||
| 
						 | 
					@ -39,40 +20,29 @@ GEM
 | 
				
			||||||
    jekyll-watch (1.3.0)
 | 
					    jekyll-watch (1.3.0)
 | 
				
			||||||
      listen (~> 3.0)
 | 
					      listen (~> 3.0)
 | 
				
			||||||
    kramdown (1.9.0)
 | 
					    kramdown (1.9.0)
 | 
				
			||||||
    liquid (2.6.3)
 | 
					    liquid (3.0.6)
 | 
				
			||||||
    listen (3.0.3)
 | 
					    listen (3.0.3)
 | 
				
			||||||
      rb-fsevent (>= 0.9.3)
 | 
					      rb-fsevent (>= 0.9.3)
 | 
				
			||||||
      rb-inotify (>= 0.9)
 | 
					      rb-inotify (>= 0.9)
 | 
				
			||||||
    mercenary (0.3.5)
 | 
					    mercenary (0.3.5)
 | 
				
			||||||
    parslet (1.5.0)
 | 
					 | 
				
			||||||
      blankslate (~> 2.0)
 | 
					 | 
				
			||||||
    posix-spawn (0.3.11)
 | 
					 | 
				
			||||||
    pygments.rb (0.6.3)
 | 
					 | 
				
			||||||
      posix-spawn (~> 0.3.6)
 | 
					 | 
				
			||||||
      yajl-ruby (~> 1.2.0)
 | 
					 | 
				
			||||||
    rainbow (2.0.0)
 | 
					    rainbow (2.0.0)
 | 
				
			||||||
    rb-fsevent (0.9.6)
 | 
					    rb-fsevent (0.9.6)
 | 
				
			||||||
    rb-inotify (0.9.5)
 | 
					    rb-inotify (0.9.5)
 | 
				
			||||||
      ffi (>= 0.5.0)
 | 
					      ffi (>= 0.5.0)
 | 
				
			||||||
    redcarpet (3.3.3)
 | 
					 | 
				
			||||||
    rouge (1.10.1)
 | 
					    rouge (1.10.1)
 | 
				
			||||||
    safe_yaml (1.0.4)
 | 
					    safe_yaml (1.0.4)
 | 
				
			||||||
    sass (3.4.19)
 | 
					    sass (3.4.19)
 | 
				
			||||||
    scss_lint (0.42.2)
 | 
					    scss_lint (0.42.2)
 | 
				
			||||||
      rainbow (~> 2.0)
 | 
					      rainbow (~> 2.0)
 | 
				
			||||||
      sass (~> 3.4.15)
 | 
					      sass (~> 3.4.15)
 | 
				
			||||||
    toml (0.1.2)
 | 
					 | 
				
			||||||
      parslet (~> 1.5.0)
 | 
					 | 
				
			||||||
    yajl-ruby (1.2.1)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
PLATFORMS
 | 
					PLATFORMS
 | 
				
			||||||
  ruby
 | 
					  ruby
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEPENDENCIES
 | 
					DEPENDENCIES
 | 
				
			||||||
  jekyll (~> 2.5.3)
 | 
					  jekyll (~> 3.0.0)
 | 
				
			||||||
  jekyll-redirect-from (~> 0.8.0)
 | 
					  jekyll-redirect-from (~> 0.9.0)
 | 
				
			||||||
  jekyll-sitemap (~> 0.9.0)
 | 
					  jekyll-sitemap (~> 0.9.0)
 | 
				
			||||||
  rouge (~> 1.10.1)
 | 
					 | 
				
			||||||
  sass (~> 3.4.19)
 | 
					  sass (~> 3.4.19)
 | 
				
			||||||
  scss_lint (~> 0.42.2)
 | 
					  scss_lint (~> 0.42.2)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -325,7 +325,8 @@ module.exports = function (grunt) {
 | 
				
			||||||
    jekyll: {
 | 
					    jekyll: {
 | 
				
			||||||
      options: {
 | 
					      options: {
 | 
				
			||||||
        bundleExec: true,
 | 
					        bundleExec: true,
 | 
				
			||||||
        config: '_config.yml'
 | 
					        config: '_config.yml',
 | 
				
			||||||
 | 
					        incremental: false
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      docs: {},
 | 
					      docs: {},
 | 
				
			||||||
      github: {
 | 
					      github: {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,7 +17,7 @@ module Jekyll
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      def render(context)
 | 
					      def render(context)
 | 
				
			||||||
        site = context.registers[:site]
 | 
					        site = context.registers[:site]
 | 
				
			||||||
        converter = site.getConverterImpl(::Jekyll::Converters::Markdown)
 | 
					        converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
 | 
				
			||||||
        output = converter.convert(super(context))
 | 
					        output = converter.convert(super(context))
 | 
				
			||||||
        "<div class=\"bd-callout bd-callout-#{@type}\">#{output}</div>"
 | 
					        "<div class=\"bd-callout bd-callout-#{@type}\">#{output}</div>"
 | 
				
			||||||
      end
 | 
					      end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,7 +11,7 @@ module Jekyll
 | 
				
			||||||
    #
 | 
					    #
 | 
				
			||||||
    def render(context)
 | 
					    def render(context)
 | 
				
			||||||
      site = context.registers[:site]
 | 
					      site = context.registers[:site]
 | 
				
			||||||
      converter = site.getConverterImpl(::Jekyll::Converters::Markdown)
 | 
					      converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
 | 
				
			||||||
      converter.convert(render_block(context))
 | 
					      converter.convert(render_block(context))
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue