Affected files:
A [revision details]
A app/assets/images/inspector-charm-error.png
A app/assets/images/inspector-charm-pending-list.png
A app/assets/images/inspector-charm-pending.png
A app/assets/images/inspector-charm-running.png
A app/assets/images/inspector-charm-scale-up.png
A app/assets/images/inspector-charm-upgrade.png
M app/views/service.js
M lib/views/juju-inspector.less
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
},
/**
.html( Templates[ 'unit-action- buttons' ]());
@@ -1683,14 +1684,14 @@
- .html('•');
-
- unitStatusHeade
+ unitStatusHeade r.append( 'span')
categoryWrappe rNodes. select( '.unit- qty')
.text(function( d) {
+ .classed('chevron', true);
+
// D3 header update section
Index: lib/views/ juju-inspector. less juju-inspector. less' juju-inspector. less 2013-07-18 15:54:20 +0000 juju-inspector. less 2013-07-18 18:22:12 +0000
=== modified file 'lib/views/
--- lib/views/
+++ lib/views/
@@ -314,6 +314,7 @@
.content {
border- bottom: 1px solid @inspector- divider- bottom; divider- top;
margin: 0;
padding: 10px;
+ border-top: 1px solid @inspector-
}
@@ -340,12 +341,13 @@
- padding: 15px;
+ padding: 15px 15px 15px 40px;
-
+ background-
+ background-repeat: no-repeat;
span {
}
@@ -353,12 +355,34 @@
ul {
}
+
+ .chevron {
+ display: inline-block;
+ height: 9px;
+ margin-left: 5px;
+ width: 12px;
+ background: url("/juju-
no-repeat;
+ }
+ }
+
+ .closed-unit-list .chevron {
+ background: url("/juju-
no-repeat;
+ }
+
+ .status-
+ background-image:
url("/juju-
+ }
+ .status-
+ background-image:
url("/juju-
+ }
+ .status-
+ background-image:
url("/juju-
}
- -moz-transition: .5s, max-height .5s;
- -webkit-transition: .5s, max-height .5s;
- transition: .5s, max-height .5s;
+ -moz-transition: .3s, max-height .3s;
+ -webkit-transition: .25s, max-height .3s;
+ transition: .3s, max-height .3s;
/* max height is being set inline in views/service.js.
@@ -386,7 +410,7 @@
}
- margin-right: 10px;
+ margin-right: 30px;
}
@@ -407,6 +431,16 @@
}
}
+
+ .status-
+ background:
url("/juju-
35px center;
+ }
+ .status-
+ background:
url("/juju-
scroll 35px center;
+ }
+ .status-
+ background:
url("/juju-
35px center;
+ }
}
}