Merge lp:~hatch/juju-gui/ellipsis-unit-list into lp:juju-gui/experimental
Proposed by
Jeff Pihach
Status: | Merged |
---|---|
Merged at revision: | 1211 |
Proposed branch: | lp:~hatch/juju-gui/ellipsis-unit-list |
Merge into: | lp:juju-gui/experimental |
Diff against target: |
58 lines (+27/-2) 1 file modified
lib/views/juju-inspector.less (+27/-2) |
To merge this branch: | bzr merge lp:~hatch/juju-gui/ellipsis-unit-list |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Adds ellipsis to unit list headers
The unit list headers could overflow pushing the chevron onto the next line
when the unit status name is too long. This branch maintains the unit number
and chevron in their appropriate places while limiting the length of the
unit type when closed.
To post a comment you must log in.
Reviewers: mp+196622_ code.launchpad. net,
Message:
Please take a look.
Description:
Adds ellipsis to unit list headers
The unit list headers could overflow pushing the chevron onto the next
line
when the unit status name is too long. This branch maintains the unit
number
and chevron in their appropriate places while limiting the length of the
unit type when closed.
To QA (Chrome, Firefox, IE10):
Deploy service in simulator with 100 units
Wait until either an error status or landscape status gets
shortened with an ellipsis.
Disable the simulator (ctrl+s)
Clck the header of the truncated status and it should wrap
while keeping the chevron and coloured icon in the appropriate
location.
https:/ /code.launchpad .net/~hatch/ juju-gui/ ellipsis- unit-list/ +merge/ 196622
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/32260044/
Affected files (+29, -2 lines): juju-inspector. less
A [revision details]
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: lib/views/ juju-inspector. less juju-inspector. less' juju-inspector. less 2013-11-25 18:58:13 +0000 juju-inspector. less 2013-11-25 20:54:17 +0000
border- top: 1px solid @inspector- divider- top;
background- position: 20px center;
background- repeat: no-repeat;
=== modified file 'lib/views/
--- lib/views/
+++ lib/views/
@@ -886,6 +886,11 @@
+ display: -ms-flexbox;
+ -ms-flex-align: baseline;
+ display: flex;
+ align-content: stretch;
+ align-items: baseline;
@@ -895,20 +900,40 @@
}
+ .category-label { user-select: none;
.chevron {
display: inline-block;
width: 10px;
margin- left: 5px;
background: ui/assets/ images/ chevron_ up.png" ) no-repeat;
+ text-overflow: ellipsis;
+ white-space: normal;
+ overflow: hidden;
+ -webkit-
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ }
+
- vertical-align: 15%;
+ /* The above rule is required because IE10 does not
support
+ the flexbox rules that we need. It has no effect in the
+ other supported browsers. */
- height: 3px;
+ height: 5px;
url("/juju-
}
}
+ .closed-unit-list .category-label {
.closed- unit-list .chevron {
background: url("/juju-ui/as...
+ white-space: nowrap;
+ }
+