diff --git a/css/style.css b/css/style.css index da900cf..ed7caa2 100644 --- a/css/style.css +++ b/css/style.css @@ -102,16 +102,24 @@ h2 { background: #306896 !important; } +.mouseover { + border-radius: 10px; + background: rgba(240, 129, 131, 0.0); + padding: 5px; + padding-left: 10px; + padding-right: 10px; +} + #begin { width: 100%; - padding: 10px; + padding: 20px; margin: 1.1em auto; font-size: 1.3em; - /* Button shadow for 3D effect */ + /* Button shadow for 3D effect box-shadow: 0 9px 0 #264064; -webkit-box-shadow: 0 9px 0 #264064; - -moz-box-shadow: 0 9px 0 #264064; + -moz-box-shadow: 0 9px 0 #264064; */ } /* Centers the Begin button */ @@ -294,4 +302,30 @@ md-select { .md-select-label { text-align: right !important; +} + +.tagline { + margin-top: 10px; + font-size: 1.5em; +} + +.italic { + font-style: italic; + padding-right: 0.3em; +} + +footer { + font-size: 1.2em; + margin-top: 60px; + margin-bottom: 10px; + text-align: center; + width: 100%; +} + +.ucb_logo { + width: 3%; + height: 3%; + max-width: 20px; + max-height: 20px; + opacity: 0.75; } \ No newline at end of file diff --git a/index.html b/index.html index ce6fe54..9b41a23 100644 --- a/index.html +++ b/index.html @@ -46,9 +46,9 @@ @@ -57,6 +57,11 @@

Jester 5.0

+
+
+ Jokes For Your Sense of Humor +
+
Note: Some jokes may be considered offensive. If you are offended by mild ethnic, sexist or religious jokes, please @@ -73,6 +78,14 @@

Jester 5.0

+ + diff --git a/js/script.js b/js/script.js index d2b3c49..97334c3 100644 --- a/js/script.js +++ b/js/script.js @@ -58,6 +58,13 @@ function RegisterController($scope, $mdDialog) { } +function PrivacyController($scope, $mdDialog) { + $scope.submit = function() { + $mdDialog.cancel(); + } +} + + /** * Controller for the logout dialog * @param $scope @@ -92,6 +99,18 @@ $(document).ready(function () { $(window).resize(function () { justifyNavbar(); }); + var item = $('.item'); + item.mouseenter(function() { + if ($(this).hasClass('.active-item') == true) { + console.log("Hi"); + $(this).children('.mouseover').css('background', 'rgba(240, 129, 131, 0.65)'); + } + }); + item.mouseleave(function() { + if ($(this).hasClass('.active-item')) { + $(this).children('.mouseover').css('background', 'rgba(240, 129, 131, 0.0)'); + } + }); }); @@ -135,6 +154,15 @@ angular.module('jester', ['ngMaterial']) }); }; }) + .controller('jester-homepage-controller', function($scope, $mdDialog) { + $scope.showPrivacyAlert = function(ev) { + $mdDialog.show({ + controller: PrivacyController, + templateUrl: 'privacy.tmpl.html', + targetEvent: event + }); + }; + }) .controller('joke-controller', function ($scope, $http, $mdDialog) { // Set default rating $scope.rating = 0; @@ -176,6 +204,7 @@ angular.module('jester', ['ngMaterial']) logSliderMovement($scope, $http); } }); + }) // Directly inject html .filter('unsafe', function ($sce) { diff --git a/privacy.tmpl.html b/privacy.tmpl.html new file mode 100644 index 0000000..9bdfeb9 --- /dev/null +++ b/privacy.tmpl.html @@ -0,0 +1,10 @@ + + + +

Comments and suggestions will be scanned to omit identifiable information. + We respect your privacy and will not share your email address with third parties.

+
+ Got it! +
+
+
\ No newline at end of file diff --git a/register.tmpl.html b/register.tmpl.html index 470266a..25fdf09 100644 --- a/register.tmpl.html +++ b/register.tmpl.html @@ -7,7 +7,7 @@
- + Search Engine Social Network Advertisment