author | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 21:30:29 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 21:30:29 (UTC) |
commit | 758bd68eee9c0ae1d3ad8dc50481c78557bd6228 (patch) (unidiff) | |
tree | 42fe98603849248c0d3943fd1d79135a734811c9 /frontend | |
parent | 288b8df03a499a2e68ebaad48e687d1eac9df0ff (diff) | |
parent | 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (diff) | |
download | clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.zip clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.gz clipperz-758bd68eee9c0ae1d3ad8dc50481c78557bd6228.tar.bz2 |
Merge pull request #35 from gcsolaroli/master
Merged pull request #33
-rw-r--r-- | frontend/beta/properties/beta.properties.json | 5 | ||||
-rw-r--r-- | frontend/gamma/properties/gamma.properties.json | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/frontend/beta/properties/beta.properties.json b/frontend/beta/properties/beta.properties.json index 476becd..810215b 100644 --- a/frontend/beta/properties/beta.properties.json +++ b/frontend/beta/properties/beta.properties.json | |||
@@ -174,14 +174,17 @@ | |||
174 | 174 | ||
175 | "Clipperz/PM/Main.js" | 175 | "Clipperz/PM/Main.js" |
176 | ], | 176 | ], |
177 | 177 | ||
178 | "css": [ | 178 | "css": [ |
179 | "yui-extensions/reset-min.css", | 179 | "yui-extensions/reset-min.css", |
180 | "yui-extensions/core.css", | 180 | "yui-extensions/core.css", |
181 | "yui-extensions/basic-dialog.css", | 181 | "yui-extensions/basic-dialog.css", |
182 | "yui-extensions/button.css", | 182 | "yui-extensions/button.css", |
183 | "clipperz/clipperz.css", | 183 | "clipperz/clipperz.css", |
184 | "clipperz/compact.css", | 184 | "clipperz/compact.css", |
185 | "clipperz/ytheme-clipperz.css" | 185 | "clipperz/ytheme-clipperz.css" |
186 | ] | 186 | ], |
187 | |||
188 | "html.template": "index_template.html" | ||
189 | |||
187 | } | 190 | } |
diff --git a/frontend/gamma/properties/gamma.properties.json b/frontend/gamma/properties/gamma.properties.json index 0a513e8..c847812 100644 --- a/frontend/gamma/properties/gamma.properties.json +++ b/frontend/gamma/properties/gamma.properties.json | |||
@@ -179,13 +179,13 @@ | |||
179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", | 179 | "Clipperz/PM/UI/Web/Controllers/CardsController.js", |
180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", | 180 | "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", |
181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", | 181 | "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", |
182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", | 182 | "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", |
183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", | 183 | "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", |
184 | 184 | ||
185 | "main.js" | 185 | "main.js" |
186 | ], | 186 | ], |
187 | 187 | ||
188 | "css": [ | 188 | "css": [ |
189 | "web.css" | 189 | "web.css" |
190 | ] | 190 | ] |
191 | } \ No newline at end of file | 191 | } |