Merge lp:~huwshimi/juju-gui/ie-fixes into lp:juju-gui/experimental
Proposed by
Huw Wilkins
Status: | Merged |
---|---|
Merged at revision: | 866 |
Proposed branch: | lp:~huwshimi/juju-gui/ie-fixes |
Merge into: | lp:juju-gui/experimental |
Diff against target: |
76 lines (+28/-7) 2 files modified
lib/views/browser/charm-full.less (+1/-1) lib/views/browser/charm-token.less (+27/-6) |
To merge this branch: | bzr merge lp:~huwshimi/juju-gui/ie-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+175211@code.launchpad.net |
Description of the change
Fix presentation issues in IE10
FIXES:
- Charm details last tabs wrapping onto new line.
- Charmtoken icons stretching on screen - they are new clipped in some cases,
but this also solves issues with additional scrollbars appearing.
To post a comment you must log in.
Reviewers: mp+175211_ code.launchpad. net,
Message:
Please take a look.
Description:
Fix presentation issues in IE10
FIXES:
- Charm details last tabs wrapping onto new line.
- Charmtoken icons stretching on screen - they are new clipped in some
cases,
but this also solves issues with additional scrollbars appearing.
https:/ /code.launchpad .net/~huwshimi/ juju-gui/ ie-fixes/ +merge/ 175211
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/11431043/
Affected files: browser/ charm-full. less browser/ charm-token. less
A [revision details]
M lib/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: lib/views/ browser/ charm-full. less browser/ charm-full. less' browser/ charm-full. less 2013-07-16 20:09:51 +0000 browser/ charm-full. less 2013-07-17 07:26:54 +0000 yui3-tabview- list { yui3-tabview- panel {
.border- box;
=== modified file 'lib/views/
--- lib/views/
+++ lib/views/
@@ -35,7 +35,7 @@
padding: 0 70px 0 80px;
}
.
- width: 590px;
+ padding-right: 20px;
}
.
Index: lib/views/ browser/ charm-token. less browser/ charm-token. less' browser/ charm-token. less 2013-07-16 14:25:33 +0000 browser/ charm-token. less 2013-07-17 07:26:54 +0000
.charm- icon,
.category- icon,
width: 48px;
height: 48px;
.charm- icon {
background: transparent
.charm- icon,
.category- icon,
width: 50px;
height: 50px;
.charm- icon {
background: transparent
.charm- icon,
.category- icon,
width: 96px;
height: 96px;
=== modified file 'lib/views/
--- lib/views/
+++ lib/views/
@@ -15,10 +15,17 @@
.icon {
+ margin-right: 12px;
+ position: relative;
+ }
+ .charm-icon,
+ .charm-icon img,
+ .category-icon,
+ .category-icon img,
+ .icon,
+ .icon img {
- margin-right: 12px;
- position: relative;
}
@@ -34,10 +41,17 @@
.icon {
+ margin-right: 10px;
+ position: relative;
+ }
+ .charm-icon,
+ .charm-icon img,
+ .category-icon,
+ .category-icon img,
+ .icon,
+ .icon img {
- margin-right: 10px;
- position: relative;
}
@@ -49,10 +63,17 @@
.icon {
+ margin-right: 16px;
+ position: relative;
+ }
+ .charm-icon,
+ .charm-icon img,
+ .category-icon,
+ .category-icon img,
+ .icon,
+ .icon img {
- margin-right: 16px;
- ...