Merge lp://staging/~gary/juju-gui/antdillon into lp://staging/juju-gui/experimental
Proposed by
Gary Poster
Status: | Merged |
---|---|
Merged at revision: | 870 |
Proposed branch: | lp://staging/~gary/juju-gui/antdillon |
Merge into: | lp://staging/juju-gui/experimental |
Diff against target: |
133 lines (+44/-9) 2 files modified
app/views/service.js (+4/-3) lib/views/juju-inspector.less (+40/-6) |
To merge this branch: | bzr merge lp://staging/~gary/juju-gui/antdillon |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Merge antdillon's inspector styling branch
To post a comment you must log in.
Reviewers: mp+175647_ code.launchpad. net,
Message:
Please take a look.
Description:
Merge antdillon's inspector styling branch
https:/ /code.launchpad .net/~gary/ juju-gui/ antdillon/ +merge/ 175647
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/11532044/
Affected files: images/ inspector- charm-error. png images/ inspector- charm-pending- list.png images/ inspector- charm-pending. png images/ inspector- charm-running. png images/ inspector- charm-scale- up.png images/ inspector- charm-upgrade. png service. js juju-inspector. less
A [revision details]
A app/assets/
A app/assets/
A app/assets/
A app/assets/
A app/assets/
A app/assets/
M app/views/
M lib/views/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: app/assets/ images/ inspector- charm-error. png images/ inspector- charm-error. png' images/ inspector- charm-error. png 1970-01-01 images/ inspector- charm-error. png 2013-07-18
=== added file 'app/assets/
Binary files app/assets/
00:00:00 +0000 and app/assets/
15:37:42 +0000 differ
Index: app/assets/ images/ inspector- charm-pending- list.png images/ inspector- charm-pending- list.png' images/ inspector- charm-pending- list.png 1970-01-01 images/ inspector- charm-pending- list.png
=== added file 'app/assets/
Binary files app/assets/
00:00:00 +0000 and app/assets/
2013-07-18 15:37:42 +0000 differ
Index: app/assets/ images/ inspector- charm-pending. png images/ inspector- charm-pending. png' images/ inspector- charm-pending. png 1970-01-01 images/ inspector- charm-pending. png 2013-07-18
=== added file 'app/assets/
Binary files app/assets/
00:00:00 +0000 and app/assets/
15:37:42 +0000 differ
Index: app/assets/ images/ inspector- charm-running. png images/ inspector- charm-running. png' images/ inspector- charm-running. png 1970-01-01 images/ inspector- charm-running. png 2013-07-18
=== added file 'app/assets/
Binary files app/assets/
00:00:00 +0000 and app/assets/
15:37:42 +0000 differ
Index: app/assets/ images/ inspector- charm-scale- up.png images/ inspector- charm-scale- up.png' images/ inspector- charm-scale- up.png 1970-01-01 images/ inspector- charm-scale- up.png
=== added file 'app/assets/
Binary files app/assets/
00:00:00 +0000 and app/assets/
2013-07-18 15:37:42 +0000 differ
Index: app/assets/ images/ inspector- charm-upgrade. png images/ inspector- charm-upgrade. png' images/ inspector- charm-upgrade. png 1970-01-01 images/ inspector- charm-upgrade. png 2013-07-18
=== added file 'app/assets/
Binary files app/assets/
00:00:00 +0000 and app/assets/
15:37:42 +0000 differ
Index: app/views/ service. js service. js' service. js 2013-07-18 17:53:08 +0000 service. js 2013-07-18 18:30:48 +0000 tHeader: function(e) {
e.currentTarge t.siblings( '.status- unit-content' )
.toggleClass( 'close- unit'); .toggleClass( 'closed- unit-list' );
=== modified file 'app/views/
--- app/views/
+++ app/views/
@@ -1556,6 +1556,7 @@
toggleUni
+ e.currentTarget
}...