lp:~bac/juju-gui/1078723

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:juju-gui/experimental at revision 266

Juju GUI Hackers: Pending requested 2012-12-04

Diff: 81 lines (+41/-0) (has conflicts)

2 files modified

Makefile (+26/-0)
bin/merge-files (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1078723: changes to third party files and bin/merge-files do not cause regeneration of combined files

High

Fix Released

Link a bug report

Related blueprints

268. By Brad Crittenden on 2012-12-05

Remove debug line before commit

267. By Brad Crittenden on 2012-12-04

Un-renamed generateTemplates due to issues with lint

266. By Brad Crittenden on 2012-12-04

Add THIRD_PARTY_JS as a build dependency

265. By Brad Crittenden on 2012-12-04

Merge from trunk

264. By Brad Crittenden on 2012-12-04

Makefile cleanup

263. By Brad Crittenden on 2012-12-04

Benji's branch

262. By Brad Crittenden on 2012-12-03

Add the required charm filter dropdown.

The original design for the charm search results panel had a dropdown
that was to be used to filter the results. After some consideration
the three sets were chosen to be 'all', 'deployed', and 'subordinate'.

This branch implements the dropdown and filter mechanism. The widget
was based on the graph/list picker on the bottom of the page. It was
refactored into a generic LESS function and supports both uses.

The design for the existing picker had a 1px wide design element to
provide the background. It was not tall enough for a picker with
three items. As a work-around an 'outset' mitred HTML border is
used. It will be easy to replace with the proper asset when it is
produced.

If the picker is open and a click outside closes the charm panel then
the picker remains open. That is a wart that needs to be fixed.

R=benji, frankban
CC=
https://codereview.appspot.com/6842119

261. By Benjamin Saller on 2012-11-29

D3 Components Documentation

This make an effort to provide a high level modules writer guide. As a
concession it refers the reader to portions of the YUI event and D3 data
binding docs.

R=teknico, benjamin.saller, gary.poster
CC=
https://codereview.appspot.com/6858085

260. By Madison Scott-Clary on 2012-11-28

Ignore editor files.

Watch functions will throw noisy errors on files not part of the distribution, making debugging watched files (templates, LESS stylesheet) difficult in `make debug`; an ifValidFile function was created to ignore these and slim down useless errors. Quick slack task.

R=benji, gary.poster
CC=
https://codereview.appspot.com/6842104

259. By Madison Scott-Clary on 2012-11-27

Charm panel border improvements

From Matt C.: Shadow should be darker on darker areas in the panel (such as the charm name and search result headings), and the border should extend all the way down to the bottom of the view (was 1px short).

Per UX review, colors updated and inset box-shadow on bottom.

R=
CC=
https://codereview.appspot.com/6855049