Merge lp://staging/~gary/juju-gui/cssfixes into lp://staging/juju-gui/experimental
Proposed by
Gary Poster
| Status: | Merged |
|---|---|
| Merged at revision: | 873 |
| Proposed branch: | lp://staging/~gary/juju-gui/cssfixes |
| Merge into: | lp://staging/juju-gui/experimental |
| Diff against target: |
267 lines (+123/-78) 5 files modified
app/models/charm.js (+2/-2) app/templates/charm.handlebars (+78/-76) app/views/charm.js (+31/-0) lib/views/browser/charm-token.less (+6/-0) lib/views/stylesheet.less (+6/-0) |
| To merge this branch: | bzr merge lp://staging/~gary/juju-gui/cssfixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Juju GUI Hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
Tweak CSS for OSCON
This branch has three visual fixes. Two of them are supposed to last, and the other is throw-away.
- GOOD: commits were not pluralizing correctly. This is because they were strings, not ints. I changed the code to send ints.
- GOOD: on the charm token, the download and commit line was not floating propoerly for some charms because the line was getting too long. I tweaked the CSS to force a width, with ellipses.
- THROW-AWAY: in the old, old charm page, the page was no longer scrollable. I added code to set the height as we have done on other pages. This should actually destroy subscriptions and do other nice clean up things, but this page will be destroyed as soon as we get the inspector.
To post a comment you must log in.
Revision history for this message
| Gary Poster (gary) wrote | # |
Revision history for this message
| Jeff Pihach (hatch) wrote | # |
Revision history for this message
| Gary Poster (gary) wrote | # |
Revision history for this message
| Gary Poster (gary) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Reviewers: mp+175910_
Message:
Please take a look.
Description:
Tweak CSS for OSCON
This branch has three visual fixes. Two of them are supposed to last,
and the other is throw-away.
- GOOD: commits were not pluralizing correctly. This is because they
were strings, not ints. I changed the code to send ints.
- GOOD: on the charm token, the download and commit line was not
floating propoerly for some charms because the line was getting too
long. I tweaked the CSS to force a width, with ellipses.
- THROW-AWAY: in the old, old charm page, the page was no longer
scrollable. I added code to set the height as we have done on other
pages. This should actually destroy subscriptions and do other nice
clean up things, but this page will be destroyed as soon as we get the
inspector.
https:/
(do not edit description out of merge proposal)
Please review this at https:/
Affected files:
A [revision details]
M app/models/charm.js
M app/templates/
M app/views/charm.js
M lib/views/
M lib/views/