Fixes the static asset generator for new pkg path, updates assets.

This commit is contained in:
James Phillips 2016-01-15 10:21:42 -08:00
parent 8683896465
commit f24a044755
5 changed files with 85 additions and 108 deletions

View File

@ -72,7 +72,7 @@ generate: deps
# generates the static web ui
static-assets: deps
@echo "--> Generating static assets"
@go-bindata-assetfs -pkg agent -prefix ui ./ui/dist/...
@go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/...
@mv bindata_assetfs.go command/agent
$(MAKE) format

File diff suppressed because one or more lines are too long

View File

@ -56,7 +56,7 @@ development configuration.
`make dist`
The `dist` folder will contain the files you should use for deployment.
The `../pkg/web_ui` folder will contain the files you should use for deployment.
###Acknowledgements
cog icon by useiconic.com from the [Noun Project](https://thenounproject.com/term/setting/45865/)
@ -67,7 +67,7 @@ The UI is compiled and shipped with the Consul go binary. The generated bindata
file lives in the `command/agent/bindata_assetfs.go` file and is checked into
source control. This is useful so that not every Consul developer needs to set
up bundler etc. To re-generate the file, first follow the compilation steps
above to build the UI assets into the `dist/` folder. With that done, from the
above to build the UI assets into the `pkg/web_ui` folder. With that done, from the
root of the Consul repo, run:
```

0
ui/dist/.gitkeep vendored
View File

View File

@ -4,4 +4,4 @@
"sources": ["../styles/_type.scss","../styles/_variables.scss","../styles/_mixins.scss","../styles/_panels.scss","../styles/_nav.scss","../styles/_buttons.scss","../styles/_lists.scss","../styles/_forms.scss","../styles/_notifications.scss","../styles/base.scss"],
"names": [],
"file": "base.css"
}
}