Skip to content

Commit 52e86cf

Browse files
tobegit3hubtobegit3hub
committed
Add bootstrap-material-design
1 parent d1683f0 commit 52e86cf

File tree

132 files changed

+100300
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+100300
-4
lines changed

‎controllers/default.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@ type PgStat struct {
274274

275275
func (c *MainController) Get() {
276276

277-
baseUrl := "http://127.0.0.1:5000/api/v0.1"
277+
//baseUrl := "http://127.0.0.1:5000/api/v0.1"
278+
baseUrl := "http://192.168.99.100:5000/api/v0.1"
278279

279280
// Request health
280281
body := RequestJson(baseUrl + "/health")

‎static/bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
],
1616
"dependencies": {
1717
"jquery": "~2.1.4",
18-
"bootstrap": "~3.3.5"
18+
"bootstrap": "~3.3.5",
19+
"bootstrap-material-design": "~0.3.0"
1920
}
2021
}

‎static/bower_components/bootstrap-material-design/.bower.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"name": "bootstrap-material-design",
3+
"version": "0.3.0",
4+
"homepage": "http://fezvrasta.github.io/bootstrap-material-design",
5+
"authors": [
6+
"Federico Zivolo <info@mywebexpression.com>"
7+
],
8+
"description": "Material Design theme for Bootstrap 3",
9+
"main": [
10+
"dist/css/material.css",
11+
"dist/js/material.js",
12+
"dist/css/ripples.css",
13+
"dist/js/ripples.js",
14+
"dist/fonts/Material-Design-Icons.eot",
15+
"dist/fonts/Material-Design-Icons.svg",
16+
"dist/fonts/Material-Design-Icons.ttf",
17+
"dist/fonts/Material-Design-Icons.woff"
18+
],
19+
"ignore": [
20+
"test",
21+
"screenshots",
22+
"demo",
23+
".editorconfig",
24+
".gitignore",
25+
".jshintrc",
26+
".travis.yml",
27+
"CONTRIBUTING.md",
28+
"Gruntfile.json",
29+
"index.html",
30+
"**/.*",
31+
"node_modules",
32+
"bower_components",
33+
"test",
34+
"tests"
35+
],
36+
"keywords": [
37+
"material",
38+
"design",
39+
"bootstrap",
40+
"theme",
41+
"google",
42+
"android"
43+
],
44+
"license": "https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md",
45+
"dependencies": {
46+
"jquery": "~2.1.1"
47+
},
48+
"_release": "0.3.0",
49+
"_resolution": {
50+
"type": "version",
51+
"tag": "0.3.0",
52+
"commit": "f40aa0a6e6b5fa19912f10b182f7fab4ab950861"
53+
},
54+
"_source": "git://github.com/FezVrasta/bootstrap-material-design.git",
55+
"_target": "~0.3.0",
56+
"_originalSource": "bootstrap-material-design",
57+
"_direct": true
58+
}

‎static/bower_components/bootstrap-material-design/CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Changelog
2+
3+
## v 0.3.0
4+
5+
- Implemented full color palette from Material Design specifications (thanks @korgan00)
6+
- Reformat of `ripples.js` (thanks @grvcoelho)
7+
- Autofill option of `material.js` is now set to false by default
8+
- Deprecated `material-wfont.css`, now to include web fonts you should include roboto.css
9+
- Now `material.css` supports only the primary shades of the material color palette (lightweight! about 200KB)
10+
- `material-fullpalette.css` supports every shade of the material color palette (huge size! ~ 2MB)
11+
- Adjusted padding on dialog(modal) to be more inline with standards (thanks @GradyD)
12+
- Added jQuery 1.9.1 and Bootstrap 3.0 as dependencies (thanks @GradyD)
13+
- fixed #468 (thanks @MatrixZ)
14+
- Added :hover, :focus, :active and .active states on buttons
15+
- Added color variations on toggles
16+
- Improved shadows to better fit Material Design specs
17+
- Improved hover state of buttons
18+
- Material Checkboxes now are a single inline element `.checkbox-material`, this helps when you need to vertical align them
19+
- Fixed Material Design icons
20+
- Fixed behavior of floating labels and inputs
21+
- Fixed several bugs
22+
- Updated Meteor packages
23+
24+
## v 0.2.1
25+
26+
- Fixed well sizes
27+
- Fixed $.ripple that needed two clicks to effectively "click" an element
28+
- Added $.ripple support to browsers that don't support CSS transitions (eg. IE9)
29+
- Arrive.js integration is now complete, it inits correctly every Material Design element dynamically added
30+
- Arrive.js is now faster, it run directly on the new element instead of scan the entire document
31+
- $.material.autofill() is now configurable, you can set $.material.options.autofill = false to disable it
32+
- Every $.material.init() options is now configurable, you can disable them setting false in the $.material.options.\<feature\>
33+
34+
## v 0.2.0
35+
36+
- The master branch is now the development branch, if you want to use a "stable" release use the releases provided by GitHub.
37+
- New demo page
38+
- Primary color is now a subtle teal to follow the Material Design specifications.
39+
- Ripples.js is now completely rewritten with jQuery.
40+
- Fixed thousands of bugs.
41+

0 commit comments

Comments
 (0)