Small visual changes

Hopefully final fix for hellocard color rendering Tweaked background transparency
CompuIves · May 5, 2015 · 5cc1864 · 5cc1864
1 parent 292706e
commit 5cc1864
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/js/controller/controller.js b/src/js/controller/controller.js
@@ -127,7 +127,7 @@ app.controller("MainController", ["$scope", "uiGmapGoogleMapApi", "ColorService"
             $(".ultradarkbgcolor").css("background-color", ColorService.rgbToString(secondColor)).data("bgcolor", secondColor);
             $(".bgcolor-transparent").css("background-color", ColorService.rgbToString(contentColor, 0.75)).data("bgcolor", contentColor);
             $(".darkbgcolor-transparent").css("background-color", ColorService.rgbToString(ultimateRgb, 0.7)).data("bgcolor", ultimateRgb);
-            $(".ultradarkbgcolor-transparent").css("background-color", ColorService.rgbToString(secondColor, 0.7)).data("bgcolor", secondColor);
+            $(".ultradarkbgcolor-transparent").css("background-color", ColorService.rgbToString(secondColor, 0.75)).data("bgcolor", secondColor);
             $(".ultradarkcolor").css("color", ColorService.rgbToString(secondColor)).data("color", secondColor);
             $(".darkcolor").css("color", ColorService.rgbToString(ultimateRgb)).data("color", ultimateRgb);
             $(".lightcolor").css("color", ColorService.rgbToString(thirdColor)).data("color", thirdColor);

diff --git a/src/js/directives/hellocarddirective.js b/src/js/directives/hellocarddirective.js
@@ -21,12 +21,12 @@ app.directive("ngHello", ["ColorService",
                     }
                 }, true);
 
-                $(element).load(function() {
+                $(window).load(function() {
                     loadColors();
-                });
-
-                //Just to be sure, pretty dumb...
-                setTimeout(loadColors, 2000);
+                    $(element).css({
+                        opacity: 1
+                    });
+                })
 
                 function loadColors() {
                     $(element).find('.darkcolor').css({

diff --git a/src/scss/_header.scss b/src/scss/_header.scss
@@ -10,7 +10,7 @@
 .header {
     position: relative;
     width: 100%;
-    height:100vh;
+    height: 100vh;
 
     $circlessize: 275px;
     .circles {

diff --git a/src/scss/_hellocard.scss b/src/scss/_hellocard.scss
@@ -24,7 +24,10 @@ ng-hello {
     transform-style: preserve-3d;
     transform-origin: 50% 50%;
     overflow: hidden;
-
+
+    //Animation
+    opacity: 0;
+
     &.backactive {
         width: $backwidth;
         height: $backheight;