diff --git a/README.md b/README.md index c967bc19..bd05a8d7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@
- View Demo | Download ZIP + View Demo | Download ZIP
[ModularAdmin](http://modularcode.github.io/modular-admin-html/) is an open source dashboard theme built in a modular way. That makes it extremely easy to scale, modify and maintain. @@ -21,9 +21,9 @@ ## Download -You can download this project in 2 different ways: download zip or ```git clone https://github.com/modularcode/modular-admin-html.git ```. +You can download this project in 2 different ways: download zip or ```git clone https://github.com/modularcode/modular-admin-html.git ```. -#### [Download ZIP](https://github.com/modularcode/modular-admin-html/releases/download/v1.0.1/modular-admin-html-1.0.1.zip) +#### [Download ZIP](https://github.com/modularcode/modular-admin-html/releases/download/v1.1.0/modular-admin-html-1.1.0.zip) The downloaded zip file will contain ```dist/``` folder which is compiled version of the project (with all scripts are merged together, processed styles and templates). You can use it as final result, but for development you should use aplication sources locaed in ```src/``` folder and rebuild the project. See [development](#development). diff --git a/bower.json b/bower.json index 9ae69fc3..7de0d1dc 100644 --- a/bower.json +++ b/bower.json @@ -1,10 +1,10 @@ { "name": "modular-admin-html", - "version": "1.0.1", + "version": "1.1.0", "devDependencies": {}, "dependencies": { "animate.css": "~3.4.0", - "bootstrap": "v4.0.0-alpha.2", + "bootstrap": "v4.0.0-alpha.5", "font-awesome": "~4.3.0", "jquery": "~2.1.4", "jquery-flot": "~0.8.3", @@ -18,7 +18,7 @@ "quill": "~0.20.1", "responsive-bootstrap-toolkit": "~2.5.0", "Sortable": "~1.4.2", - "tether": "~1.1.1", + "tether": "~1.3.7", "tinycolor": "~1.2.1", "dropzone": "~4.2.0" }, diff --git a/package.json b/package.json index 57524a90..2a1da360 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "modular-admin-html", - "version": "1.0.1", + "version": "1.1.0", "description": "ModularAdmin: Free Dashboard Theme; html version", "repository": { "type": "git", diff --git a/src/_common/_styles/layout.scss b/src/_common/_styles/layout.scss index 9f242747..6b100d21 100644 --- a/src/_common/_styles/layout.scss +++ b/src/_common/_styles/layout.scss @@ -1,7 +1,7 @@ .row { .col { - padding-left: $grid-gutter-width/2; - padding-right: $grid-gutter-width/2; + padding-left: $grid-gutter-width-base/2; + padding-right: $grid-gutter-width-base/2; float: left; } }