juju-gui

Merge lp:~hatch/juju-gui/1125424-loading-visuals into lp:juju-gui/experimental

  1. 1125424-loading-visuals
  2. Merge into trunk
Proposed by Jeff Pihach
Status: Merged
Merged at revision: 410
Proposed branch: lp:~hatch/juju-gui/1125424-loading-visuals
Merge into: lp:juju-gui/experimental
Diff against target: 82 lines (+38/-3)
3 files modified
app/index.html (+1/-1)
app/templates/login.handlebars (+1/-1)
lib/views/stylesheet.less (+36/-1)
To merge this branch: bzr merge lp:~hatch/juju-gui/1125424-loading-visuals
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+151081@code.launchpad.net

Description of the change

Fixed layout issues as per design

https://codereview.appspot.com/7452043/

To post a comment you must log in.
Revision history for this message
Jeff Pihach (hatch) wrote :

Reviewers: mp+151081_code.launchpad.net,

Message:
Please take a look.

Description:
Fixed layout issues as per design

https://code.launchpad.net/~hatch/juju-gui/1125424-loading-visuals/+merge/151081

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/7452043/

Affected files:
   A [revision details]
   M app/index.html
   M app/templates/login.handlebars
   M lib/views/stylesheet.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: app/index.html
=== modified file 'app/index.html'
--- app/index.html 2013-02-21 19:02:43 +0000
+++ app/index.html 2013-02-28 19:27:47 +0000
@@ -43,7 +43,7 @@
              <div class="header">
                <div class="error">
                  <span><i class="sprite alert_icon2"></i>
- Your browser is not fully supported</span>
+ <h4>Your browser is not fully supported</h4></span>
                </div>
              </div>
              <p>

Index: app/templates/login.handlebars
=== modified file 'app/templates/login.handlebars'
--- app/templates/login.handlebars 2013-02-18 17:02:09 +0000
+++ app/templates/login.handlebars 2013-02-28 19:27:47 +0000
@@ -1,4 +1,4 @@
-<div class="centered-column">
+<div class="centered-column in-main">
    <i class="sprite juju_logo" title="Juju GUI"></i>
    <div id="login-form" class="panel">
      <div class="header">

Index: lib/views/stylesheet.less
=== modified file 'lib/views/stylesheet.less'
--- lib/views/stylesheet.less 2013-02-27 14:49:14 +0000
+++ lib/views/stylesheet.less 2013-02-28 19:27:47 +0000
@@ -224,7 +224,7 @@
              &.control {
                  display: none;
              }
-
+
              .landscape-icon {
                  margin: 10px 0 0 16px;
              }
@@ -1514,6 +1514,12 @@
      width: 420px;
      margin-left: -210px;

+ /* This enables us to use the .centered-column
+ class inside of the main application */
+ &.in-main {
+ top: 0;
+ }
+
      div {
          width: 280px;
          text-align: left;
@@ -1596,4 +1602,33 @@
      #loading-spinner {
          height: 100px;
      }
+
+ #loading-message-text {
+ font-family: Ubuntu Medium, Helvetica, Arial;
+ font-size: 10pt;
+ }
+
+ #login-form {
+ .header {
+ font-size: 10pt;
+ font-family: Ubuntu Medium, Helvetica, Arial;
+ }
+ }
+
+ .header .error span {
+ color: #DD4814;
+ i {
+ margin-right: 5px;
+ float: left;
+ }
+ h4 {
+ font-family: Ubuntu Medium, Helvetica, Arial;
+ font-size: 10pt;
+ line-height: 10pt;
+ }
+ }
+
+ p {
+ font-size: 8pt;
+ }
  }

Revision history for this message
Nicholas Boettcher (notrebene) wrote :

LGTM. Sign off from Design

https://codereview.appspot.com/7452043/

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

LGTM. Thank you!

Gary

https://codereview.appspot.com/7452043/

Revision history for this message
Madison Scott-Clary (makyo) wrote :

LGTM - a super-minor and a note.

https://codereview.appspot.com/7452043/diff/1/lib/views/stylesheet.less
File lib/views/stylesheet.less (right):

https://codereview.appspot.com/7452043/diff/1/lib/views/stylesheet.less#newcode1607
lib/views/stylesheet.less:1607: font-family: Ubuntu Medium, Helvetica,
Arial;
Perhaps a task for later, but we might want an @ubuntu-font at some
point.

https://codereview.appspot.com/7452043/diff/1/lib/views/stylesheet.less#newcode1631
lib/views/stylesheet.less:1631: p {
Something wonky with indenting here.

https://codereview.appspot.com/7452043/

Revision history for this message
Jeff Pihach (hatch) wrote :

Thanks for the reviews! Reply's below.

https://codereview.appspot.com/7452043/diff/1/lib/views/stylesheet.less
File lib/views/stylesheet.less (right):

https://codereview.appspot.com/7452043/diff/1/lib/views/stylesheet.less#newcode1607
lib/views/stylesheet.less:1607: font-family: Ubuntu Medium, Helvetica,
Arial;
On 2013/02/28 23:12:43, matthew.scott wrote:
> Perhaps a task for later, but we might want an @ubuntu-font at some
 point.
Yeah would be nice if it was a local asset

https://codereview.appspot.com/7452043/diff/1/lib/views/stylesheet.less#newcode1631
lib/views/stylesheet.less:1631: p {
On 2013/02/28 23:12:43, matthew.scott wrote:
> Something wonky with indenting here.
 Hmm that there is - I'll fix up

https://codereview.appspot.com/7452043/

Revision history for this message
Jeff Pihach (hatch) wrote :

*** Submitted:

Fixed layout issues as per design

R=goodspud, gary.poster, matthew.scott
CC=
https://codereview.appspot.com/7452043

https://codereview.appspot.com/7452043/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/index.html'
--- app/index.html 2013-02-21 19:02:43 +0000
+++ app/index.html 2013-02-28 19:30:28 +0000
@@ -43,7 +43,7 @@
43 <div class="header">43 <div class="header">
44 <div class="error">44 <div class="error">
45 <span><i class="sprite alert_icon2"></i>45 <span><i class="sprite alert_icon2"></i>
46 Your browser is not fully supported</span>46 <h4>Your browser is not fully supported</h4></span>
47 </div>47 </div>
48 </div>48 </div>
49 <p>49 <p>
5050
=== modified file 'app/templates/login.handlebars'
--- app/templates/login.handlebars 2013-02-18 17:02:09 +0000
+++ app/templates/login.handlebars 2013-02-28 19:30:28 +0000
@@ -1,4 +1,4 @@
1<div class="centered-column">1<div class="centered-column in-main">
2 <i class="sprite juju_logo" title="Juju GUI"></i>2 <i class="sprite juju_logo" title="Juju GUI"></i>
3 <div id="login-form" class="panel">3 <div id="login-form" class="panel">
4 <div class="header">4 <div class="header">
55
=== modified file 'lib/views/stylesheet.less'
--- lib/views/stylesheet.less 2013-02-27 14:49:14 +0000
+++ lib/views/stylesheet.less 2013-02-28 19:30:28 +0000
@@ -224,7 +224,7 @@
224 &.control {224 &.control {
225 display: none;225 display: none;
226 }226 }
227 227
228 .landscape-icon {228 .landscape-icon {
229 margin: 10px 0 0 16px;229 margin: 10px 0 0 16px;
230 }230 }
@@ -1514,6 +1514,12 @@
1514 width: 420px;1514 width: 420px;
1515 margin-left: -210px;1515 margin-left: -210px;
15161516
1517 /* This enables us to use the .centered-column
1518 class inside of the main application */
1519 &.in-main {
1520 top: 0;
1521 }
1522
1517 div {1523 div {
1518 width: 280px;1524 width: 280px;
1519 text-align: left;1525 text-align: left;
@@ -1596,4 +1602,33 @@
1596 #loading-spinner {1602 #loading-spinner {
1597 height: 100px;1603 height: 100px;
1598 }1604 }
1605
1606 #loading-message-text {
1607 font-family: Ubuntu Medium, Helvetica, Arial;
1608 font-size: 10pt;
1609 }
1610
1611 #login-form {
1612 .header {
1613 font-size: 10pt;
1614 font-family: Ubuntu Medium, Helvetica, Arial;
1615 }
1616 }
1617
1618 .header .error span {
1619 color: #DD4814;
1620 i {
1621 margin-right: 5px;
1622 float: left;
1623 }
1624 h4 {
1625 font-family: Ubuntu Medium, Helvetica, Arial;
1626 font-size: 10pt;
1627 line-height: 10pt;
1628 }
1629 }
1630
1631 p {
1632 font-size: 8pt;
1633 }
1599}1634}

Subscribers

People subscribed via source and target branches