juju-gui

Merge lp:~huwshimi/juju-gui/ie-fixes into lp:juju-gui/experimental

  1. ie-fixes
  2. Merge into trunk
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
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.

https://codereview.appspot.com/11431043/

To post a comment you must log in.
Revision history for this message
Huw Wilkins (huwshimi) wrote :
Download full text (3.2 KiB)

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:
   A [revision details]
   M lib/views/browser/charm-full.less
   M lib/views/browser/charm-token.less

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
=== modified file 'lib/views/browser/charm-full.less'
--- lib/views/browser/charm-full.less 2013-07-16 20:09:51 +0000
+++ lib/views/browser/charm-full.less 2013-07-17 07:26:54 +0000
@@ -35,7 +35,7 @@
          padding: 0 70px 0 80px;
      }
      .yui3-tabview-list {
- width: 590px;
+ padding-right: 20px;
      }
      .yui3-tabview-panel {
          .border-box;

Index: lib/views/browser/charm-token.less
=== modified file 'lib/views/browser/charm-token.less'
--- lib/views/browser/charm-token.less 2013-07-16 14:25:33 +0000
+++ lib/views/browser/charm-token.less 2013-07-17 07:26:54 +0000
@@ -15,10 +15,17 @@
              .charm-icon,
              .category-icon,
              .icon {
+ margin-right: 12px;
+ position: relative;
+ }
+ .charm-icon,
+ .charm-icon img,
+ .category-icon,
+ .category-icon img,
+ .icon,
+ .icon img {
                  width: 48px;
                  height: 48px;
- margin-right: 12px;
- position: relative;
              }
              .charm-icon {
                  background: transparent
@@ -34,10 +41,17 @@
              .charm-icon,
              .category-icon,
              .icon {
+ margin-right: 10px;
+ position: relative;
+ }
+ .charm-icon,
+ .charm-icon img,
+ .category-icon,
+ .category-icon img,
+ .icon,
+ .icon img {
                  width: 50px;
                  height: 50px;
- margin-right: 10px;
- position: relative;
              }
              .charm-icon {
                  background: transparent
@@ -49,10 +63,17 @@
              .charm-icon,
              .category-icon,
              .icon {
+ margin-right: 16px;
+ position: relative;
+ }
+ .charm-icon,
+ .charm-icon img,
+ .category-icon,
+ .category-icon img,
+ .icon,
+ .icon img {
                  width: 96px;
                  height: 96px;
- margin-right: 16px;
- ...

Read more...

Revision history for this message
Gary Poster (gary) wrote :

LGTM. I don't have an IE on my laptop, but it looks fine on Chrome and
Firefox

https://codereview.appspot.com/11431043/

Revision history for this message
Gary Poster (gary) wrote :

*** Submitted:

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.

R=gary.poster
CC=
https://codereview.appspot.com/11431043

https://codereview.appspot.com/11431043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/views/browser/charm-full.less'
--- lib/views/browser/charm-full.less 2013-07-16 20:09:51 +0000
+++ lib/views/browser/charm-full.less 2013-07-17 07:36:43 +0000
@@ -35,7 +35,7 @@
35 padding: 0 70px 0 80px;35 padding: 0 70px 0 80px;
36 }36 }
37 .yui3-tabview-list {37 .yui3-tabview-list {
38 width: 590px;38 padding-right: 20px;
39 }39 }
40 .yui3-tabview-panel {40 .yui3-tabview-panel {
41 .border-box;41 .border-box;
4242
=== modified file 'lib/views/browser/charm-token.less'
--- lib/views/browser/charm-token.less 2013-07-16 14:25:33 +0000
+++ lib/views/browser/charm-token.less 2013-07-17 07:36:43 +0000
@@ -15,10 +15,17 @@
15 .charm-icon,15 .charm-icon,
16 .category-icon,16 .category-icon,
17 .icon {17 .icon {
18 margin-right: 12px;
19 position: relative;
20 }
21 .charm-icon,
22 .charm-icon img,
23 .category-icon,
24 .category-icon img,
25 .icon,
26 .icon img {
18 width: 48px;27 width: 48px;
19 height: 48px;28 height: 48px;
20 margin-right: 12px;
21 position: relative;
22 }29 }
23 .charm-icon {30 .charm-icon {
24 background: transparent31 background: transparent
@@ -34,10 +41,17 @@
34 .charm-icon,41 .charm-icon,
35 .category-icon,42 .category-icon,
36 .icon {43 .icon {
44 margin-right: 10px;
45 position: relative;
46 }
47 .charm-icon,
48 .charm-icon img,
49 .category-icon,
50 .category-icon img,
51 .icon,
52 .icon img {
37 width: 50px;53 width: 50px;
38 height: 50px;54 height: 50px;
39 margin-right: 10px;
40 position: relative;
41 }55 }
42 .charm-icon {56 .charm-icon {
43 background: transparent57 background: transparent
@@ -49,10 +63,17 @@
49 .charm-icon,63 .charm-icon,
50 .category-icon,64 .category-icon,
51 .icon {65 .icon {
66 margin-right: 16px;
67 position: relative;
68 }
69 .charm-icon,
70 .charm-icon img,
71 .category-icon,
72 .category-icon img,
73 .icon,
74 .icon img {
52 width: 96px;75 width: 96px;
53 height: 96px;76 height: 96px;
54 margin-right: 16px;
55 position: relative;
56 }77 }
57 .charm-icon {78 .charm-icon {
58 background: transparent79 background: transparent

Subscribers

People subscribed via source and target branches