Merge branch 'master' into c-cleanup-server-code

transparencyint · Nov 1, 2012 · 98a50b9 · 98a50b9
2 parents c76e5c6 + b48b7a3
commit 98a50b9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/app/styles/_controls.styl b/app/styles/_controls.styl
@@ -14,9 +14,13 @@
     box-shadow 0 1px hsl(213,10%,80%) inset, 0 1px hsl(213,55%,53%)
     outline none
     border-radius 3px
+    &:-moz-placeholder
+      color gray
     &:focus
-      border-color hsl(310, 57%, 31%)
-      box-shadow 0 0 2px hsl(280, 100%, 55%) inset
+      padding 7px
+      border-width 2px
+      border-color #222
+      box-shadow 0 0 2px hsl(0, 0%, 55%) inset
   &.top
     top 0
     border-top none

diff --git a/app/styles/_login.styl b/app/styles/_login.styl
@@ -1,10 +1,18 @@
 .login
   &.controls
-    padding 11px 13px
-    text-align right
+    width 300px
+    padding 21px
     overflow hidden
-
-    h1
-      text-align center
-  .username
-    margin-right 8px
+    position relative
+  h1 span
+    display block
+    line-height 1.21
+  form
+    input
+      padding 8px
+      margin-bottom 5px
+      width 100%
+      display block
+    [type=submit]
+      margin-top 5px
+      float right
diff --git a/app/styles/main.styl b/app/styles/main.styl
@@ -59,6 +59,7 @@ h1
   margin 0 0 21px
   font-size 34px
   line-height 1
+  font-weight normal
   text-shadow 0 1px 5px rgba(0,0,0,.55)
 
 button

diff --git a/app/views/templates/login.eco b/app/views/templates/login.eco
@@ -1,4 +1,9 @@
-<h1>Login required</h1>
+<h1>
+  <span>Climate</span> 
+  <span>Governance</span>
+  <span>Integrity</span>
+  <span>Program</span>
+</h1>
 <form>
   <input type="text" placeholder="username" id="username-input" tabindex="1" autofocus />
   <input type="password" placeholder="password" id="password-input" tabindex="2" />