Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JohnnyTheTank/bootstrap-block-grid
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.7
Choose a base ref
...
head repository: JohnnyTheTank/bootstrap-block-grid
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jun 30, 2016

  1. chore: updated packages

    @JohnnyTheTank
    JohnnyTheTank committed Jun 30, 2016
    Copy the full SHA
    a3fe937 View commit details

Commits on Sep 5, 2017

  1. Update jsDelivr links

    @LukasDrgon
    LukasDrgon authored Sep 5, 2017
    Copy the full SHA
    cd8f30e View commit details

  2. Merge pull request #9 from LukasDrgon/patch-1

    @JohnnyTheTank
    JohnnyTheTank authored Sep 5, 2017
    Copy the full SHA
    198cf1c View commit details

Commits on Apr 6, 2020

  1. Update README.md

    @JohnnyTheTank
    JohnnyTheTank authored Apr 6, 2020
    Copy the full SHA
    cb49045 View commit details
Showing with 4 additions and 7 deletions.
  1. +2 −5 README.md
  2. +1 −1 bower.json
  3. +1 −1 package.json
7 changes: 2 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -4,9 +4,6 @@
[![npm version](https://badge.fury.io/js/bootstrap-block-grid.png)](https://badge.fury.io/js/bootstrap-block-grid)
[![Bower version](https://badge.fury.io/bo/bootstrap-block-grid.png)](https://badge.fury.io/bo/bootstrap-block-grid)

## demo
[demo on plnkr](http://plnkr.co/qkyOlC)

## usage

1. Install via either [bower](http://bower.io/), [npm](https://www.npmjs.com/), CND or downloaded files:
@@ -34,9 +31,9 @@
3. when using CDN files from jsdelivr
```html
<!-- bootstrap 3 -->
<link rel="stylesheet" href="//cdn.jsdelivr.net/bootstrap.block-grid/latest/bootstrap3-block-grid.min.css">
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap-block-grid@latest/dist/bootstrap3-block-grid.min.css">
<!-- bootstrap 4 -->
<link rel="stylesheet" href="//cdn.jsdelivr.net/bootstrap.block-grid/latest/bootstrap4-block-grid.min.css">
<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap-block-grid@latest/dist/bootstrap4-block-grid.min.css">
```

4. when using downloaded files
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
],
"version": "1.1.7",
"description": "block grid for bootstrap",
"main": "dist/bootstrap3-block-grid.min.css",
"main": "dist/bootstrap3-block-grid.css",
"moduleType": [
"globals"
],
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "bootstrap-block-grid",
"version": "1.1.7",
"description": "block grid for bootstrap",
"main": "Gruntfile.js",
"main": "dist/bootstrap3-block-grid.css",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},