added login animation, cleaned up shitty code, rearranged variables f…

…ile, added some ie compaitability
haileys · Jun 18, 2012 · 64a64d2 · 64a64d2
1 parent ae690b9
commit 64a64d2
Show file tree

Hide file tree

Showing 23 changed files with 319 additions and 73 deletions.
diff --git a/rails/app/assets/images/icons/arrow-big-right.svg b/rails/app/assets/images/icons/arrow-big-right.svg
diff --git a/rails/app/assets/images/icons/arrow-down.svg b/rails/app/assets/images/icons/arrow-down.svg
diff --git a/rails/app/assets/images/icons/download.svg b/rails/app/assets/images/icons/download.svg
diff --git a/rails/app/assets/images/icons/home.svg b/rails/app/assets/images/icons/home.svg
diff --git a/rails/app/assets/images/icons/lock.svg b/rails/app/assets/images/icons/lock.svg
diff --git a/rails/app/assets/images/icons/pencil.svg b/rails/app/assets/images/icons/pencil.svg
diff --git a/rails/app/assets/images/icons/ratio.svg b/rails/app/assets/images/icons/ratio.svg
diff --git a/rails/app/assets/images/icons/search-active.svg b/rails/app/assets/images/icons/search-active.svg
diff --git a/rails/app/assets/images/icons/search-hover.svg b/rails/app/assets/images/icons/search-hover.svg
diff --git a/rails/app/assets/images/icons/search.svg b/rails/app/assets/images/icons/search.svg
diff --git a/rails/app/assets/images/icons/showcase.html b/rails/app/assets/images/icons/showcase.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Icon test</title>
+</head>
+<body style="background: #1a1a1a">
+	<img src="arrow-big-right.svg">
+	<img src="arrow-down.svg">
+	<img src="download.svg">
+	<img src="home.svg">
+	<img src="lock.svg">
+	<img src="pencil.svg">
+	<img src="ratio.svg">
+	<img src="search-active.svg">
+	<img src="search-hover.svg">
+	<img src="search-normal.svg">
+	<img src="upload.svg">
+	<img src="user.svg">
+
+</body>
+</html>
diff --git a/rails/app/assets/images/icons/upload.svg b/rails/app/assets/images/icons/upload.svg
diff --git a/rails/app/assets/images/icons/user.svg b/rails/app/assets/images/icons/user.svg
diff --git a/rails/app/assets/javascripts/sessions.js.coffee b/rails/app/assets/javascripts/sessions.js.coffee
@@ -1,9 +1,16 @@
 return false if not do $('section.sessions').size
 
+flash = (elem, opacity=0.5, times=1, time=200) ->
+    next = ->
+        elem.animate opacity: opacity, time, ->
+            elem.animate opacity: 1, time, ->
+                do next if --times isnt 0
+    do next
+
 $('form.new').bind 'ajax:before', ->
     $('input[type=submit]').attr 'disabled', true
     do $('.icon.loading').show
-    $(".error").slideUp 100, ->
+    $('.error').slideUp 250, ->
         do $(this).remove
 
 $('form.new').bind 'ajax:success', (ev, response) ->
@@ -18,4 +25,5 @@ $('form.new').bind 'ajax:success', (ev, response) ->
             </div>
         """
         $(error).hide().insertAfter('strong').slideDown 250
+        flash $ 'section.sessions'
         do $('form.new div.input:first input').focus
diff --git a/rails/app/assets/stylesheets/animate.css b/rails/app/assets/stylesheets/animate.css
diff --git a/rails/app/assets/stylesheets/forms.css.scss b/rails/app/assets/stylesheets/forms.css.scss
@@ -3,6 +3,7 @@
 
 button, .button, input, textarea {
     font-family: inherit;
+    -webkit-appearance: none;
 }
 
 form {
@@ -60,7 +61,8 @@ button, .button, input[type=submit] {
             box-shadow: $button-blue-active-box-shadow;
             border: $button-blue-active-border;
         }
-        &[disabled] {
+        &[disabled], &:disabled {
+            border-radius: inherit;
             background: $button-blue-disabled-back;
             box-shadow: none;
             text-shadow: none;
@@ -83,10 +85,8 @@ input[type=text], input[type=password], textarea {
 		outline: none;
 		box-shadow: $input-text-focus-box-shadow;
 	}
-	&.error {
-		&:focus {
-			box-shadow: $input-text-focus-error-box-shadow;
-		}
+	&.error &:focus {
+		box-shadow: $input-text-focus-error-box-shadow;
 	}
 }
 

diff --git a/rails/app/assets/stylesheets/global.css.scss b/rails/app/assets/stylesheets/global.css.scss
@@ -16,15 +16,21 @@ html, body {
 }
 
 .icon {
-    background-image: url($icon-path);
     @include box($icon-size);
-    &.dropdown-arrow { @include sprite(1, 4); }
-    &.download { @include sprite(1, 5); }
-    &.upload { @include sprite(1, 6); }
-    &.current_ratio { @include sprite(1, 7); }
-    &.required_ratio { @include sprite(1, 8); }
-    &.user { @include sprite(1, 10); }
-    &.lock { @include sprite(1, 11); }
+    &.arrow-big-right { background-image: url($icon-arrow-big-right-path); }
+    &.arrow-down { background-image: url($icon-arrow-down-path); }
+    &.download { background-image: url($icon-download-path); }
+    &.home { background-image: url($icon-home-path); }
+    &.lock { background-image: url($icon-lock-path); }
+    &.pencil { background-image: url($icon-pencil-path); }
+    &.ratio { background-image: url($icon-ratio-path); }
+    &.search {
+        background-image: url($icon-search-path);
+        &:hover { background-image: url($icon-search-hover-path); }
+        &:active { background-image: url($icon-search-active-path); }
+    }
+    &.upload { background-image: url($icon-upload-path); }
+    &.user { background-image: url($icon-user-path); }
 }
 
 a, input, textarea {

diff --git a/rails/app/assets/stylesheets/helpers.css.scss b/rails/app/assets/stylesheets/helpers.css.scss
@@ -100,4 +100,4 @@
         display: block;
         clear: both;
     }
-}
+}
diff --git a/rails/app/assets/stylesheets/layout.css.scss b/rails/app/assets/stylesheets/layout.css.scss
@@ -92,12 +92,6 @@ header {
             .good {
                 color: $header-user-ratio-good-color;
             }
-            .current_ratio {
-
-            }
-            .required_ratio {
-
-            }
         }
     }
 }
@@ -112,4 +106,4 @@ body > nav {
 
 footer {
     text-align: center;
-}
+}