Skip to content

Commit

Permalink
Update bootstrap version
Browse files Browse the repository at this point in the history
Update app version
  • Loading branch information
modularcoder committed Dec 4, 2016
1 parent 295720b commit ae4a451
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<p align="center">
<strong>
<a href="http://modularcode.github.io/modular-admin-html/" target="_blank">View Demo</a> | <a href="https://github.com/modularcode/modular-admin-html/releases/download/v1.0.1/modular-admin-html-1.0.1.zip" target="_blank">Download ZIP</a>
<a href="http://modularcode.github.io/modular-admin-html/" target="_blank">View Demo</a> | <a href="https://github.com/modularcode/modular-admin-html/releases/download/v1.1.0/modular-admin-html-1.1.0.zip" target="_blank">Download ZIP</a>
</strong>
</p>
[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.
Expand All @@ -21,9 +21,9 @@

## Download

You can download this project in 2 different ways: <a href="https://github.com/modularcode/modular-admin-html/releases/download/v1.0.1/modular-admin-html-1.0.1.zip" target="_blank">download zip</a> or ```git clone https://github.com/modularcode/modular-admin-html.git ```.
You can download this project in 2 different ways: <a href="https://github.com/modularcode/modular-admin-html/releases/download/v1.1.0/modular-admin-html-1.1.0.zip" target="_blank">download zip</a> 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).

Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/_common/_styles/layout.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
Expand Down

0 comments on commit ae4a451

Please sign in to comment.