From 9436dc71d2136f3db9667c5cbc8cb9af37bce0bd Mon Sep 17 00:00:00 2001
From: Andrew Buss <abuss@ucsd.edu>
Date: Mon, 1 Jun 2015 00:53:40 -0700
Subject: [PATCH] remove footer; move email onto FAQ page
---
home.html | 30 ++++++++++++------------------
scripts/HelpController.js | 9 ++++++++-
styles/flashy.css | 10 +++++-----
templates/help.html | 14 +++++++++-----
4 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/home.html b/home.html
index f0134d9..86b042a 100644
--- a/home.html
+++ b/home.html
@@ -9,8 +9,8 @@
<link rel="stylesheet" href="styles/flashier.css"/>
<link rel="stylesheet" href="styles/flashy.css"/>
<link
- href='https://fonts.googleapis.com/css?family=Satisfy|Titillium+Web:400,200,200italic,300,600,700,900,700italic,600italic,400italic,300italic'
- rel='stylesheet' type='text/css'>
+ href='https://fonts.googleapis.com/css?family=Satisfy|Titillium+Web:400,200,200italic,300,600,700,900,700italic,600italic,400italic,300italic'
+ rel='stylesheet' type='text/css'>
<title>Flashy</title>
</head>
<body ng-controller="RootController">
@@ -123,25 +123,19 @@
<!-- Menu Bar -->
+<main ui-view></main>
-<div class="wrapper">
- <main ui-view></main>
+<!--<footer class="page-footer">-->
+<!--<div class="footer-copyright">-->
+<!--<div class="container">-->
+<!--© 2015 Team Swag-->
+<!--<a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by-->
+<!--email!</a>-->
+<!--</div>-->
- <div class="push"></div>
-</div>
-
-
-<footer class="page-footer">
- <div class="footer-copyright">
- <div class="container">
- © 2015 Team Swag
- <a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by
- email!</a>
- </div>
-
- </div>
-</footer>
+<!--</div>-->
+<!--</footer>-->
</body>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
diff --git a/scripts/HelpController.js b/scripts/HelpController.js
index 44eafbd..a375add 100644
--- a/scripts/HelpController.js
+++ b/scripts/HelpController.js
@@ -24,7 +24,14 @@ angular.module('flashy.HelpController', ['ui.router']).
{
icon: 'mdi-editor-insert-emoticon',
question: 'What is Flashy?',
- answer: "<p>Flashy is a service for creating, sharing, and reviewing flashcards for your courses.</p><p>Flashy is optimized for contributing cards in real time during lecture to a shared live feed. Don't want to contribute cards? That's fine! By adding others' cards to your deck, you help identify high-quality cards which should remain at the top of the feed for others to choose.</p><p>Based on the principles of spaced repetition, Flashy also intelligently determines which cards you are most at risk of forgetting, based on your review history. Recieve push notifications on your Android device's Chrome browser without installing any other app, and we'll notify you when you have a few cards which need to be reviewed.</p>"
+ answer: '<p>Flashy is a service for creating, sharing, and reviewing flashcards for your courses.' +
+ '</p><p>Flashy is optimized for contributing cards in real time during lecture to a shared live' +
+ " feed. Don't want to contribute cards? That's fine! By adding others' cards to your deck, you" +
+ ' help identify high-quality cards which should remain at the top of the feed for others to choose.' +
+ '</p><p>Based on the principles of spaced repetition, Flashy also intelligently determines which' +
+ ' cards you are most at risk of forgetting, based on your review history. Recieve push ' +
+ "notifications on your Android device's Chrome browser without installing any other app," +
+ " and we'll notify you when you have a few cards which need to be reviewed.</p>"
},
{
icon: 'mdi-file-cloud-queue',
diff --git a/styles/flashy.css b/styles/flashy.css
index 8b316dd..6ed89b0 100644
--- a/styles/flashy.css
+++ b/styles/flashy.css
@@ -380,11 +380,11 @@ md-content.md-default-theme {
margin: 0;
}
-.wrapper {
- min-height: 100%;
- height: 100%;
- margin: 0 auto -4em;
-}
+/*.wrapper {*/
+ /*min-height: 100%;*/
+ /*height: 100%;*/
+ /*/!*margin: 0 auto -4em;*!/*/
+/*}*/
.container, .push {
height: 4em;
diff --git a/templates/help.html b/templates/help.html
index cb9720f..28da198 100644
--- a/templates/help.html
+++ b/templates/help.html
@@ -2,21 +2,25 @@
<div class="row">
<h2>FAQ</h2>
<button class="btn waves-effect waves-light" ng-click="expandAllContent()">
- Expand all
+ Expand all
</button>
<button class="btn waves-effect waves-light" ng-click="collapseAllContent()">
- Collapse all
+ Collapse all
</button>
<!-- Please enter entries in JSON format in HelpController.js -->
<ul class="collection st-accordion">
<li class="st-accordion--item" ng-repeat="entry in entries">
<div class="st-accordion--header" ng-click="toggleContent($event, $index)">
- <i class="{{entry.icon}}"></i>
- {{entry.question}}</div>
+ <i class="{{entry.icon}}"></i>
+ {{entry.question}}
+ </div>
<div id="content-{{$index}}" class="st-accordion--content"
- ng-bind-html="entry.answer"></div>
+ ng-bind-html="entry.answer"></div>
</li>
</ul>
</div>
+ <h2>More questions?</h2>
+
+ <p><a href="mailto:or.so.help.me@flashy.cards">Contact us by email! </a></p>
</div>
--
1.9.1