110swag / flashy-frontend

Commit a77847e1597cd66ee108f98ac0e0311a1b608f43

Authored by Rachel Lee 2015-05-31 17:50:51 -0700

FAQ and CSS things

Showing 4 changed files with 50 additions and 34 deletions Side-by-side Diff

scripts/HelpController.js
scripts/RootController.js
styles/flashy.css
templates/help.html

1	1	angular.module('flashy.HelpController', ['ui.router']).
2		- controller('HelpController', ['$scope', '$state', '$http', '$timeout', 'UserService',
3		- function($scope, $state, $http, $timeout, UserService) {
4	2
5		- }
6		- ]);
	3	+controller('HelpController', ['$scope', '$state', '$http', '$timeout', 'UserService',
	4	+ function($scope, $state, $http, $timeout, UserService) {
	5	+
	6	+ $(document).ready(function(){
	7	+ });
	8	+
	9	+ }
	10	+]);

...	...	@@ -17,6 +17,11 @@
17	17	closeOnClick: true // Closes side-nav on <a> clicks, useful for Angular/Meteor
18	18	}
19	19	);
	20	+
	21	+ $('.collapsible').collapsible({
	22	+ accordion : false // A setting that changes the collapsible behavior to expandable instead of the default accordion style
	23	+ });
	24	+
20	25	var postlogin = function(data) {
21	26	$scope.user = data;
22	27	//UserService.redirectToDefaultState($state);

...	...	@@ -423,23 +423,19 @@
423	423	background-color: #f6f6f6;
424	424	height: 100%;
425	425	overflow: hidden;
426		- transition: all 1.2s cubic-bezier(0, 0, 0.6, 1);
	426	+ transition: all 0.45s cubic-bezier(0, 0, 0.6, 1);
427	427	will-change: opacity;
428	428	}
429	429	.dropping.ng-enter {
430		- height: 0%;
431		- opacity: 0;
	430	+ max-height: 0vh;
432	431	}
433	432	.dropping.ng-enter-active {
434		- height: 100%;
435		- opacity: 1;
	433	+ max-height: 100vh;
436	434	}
437	435	.dropping.ng-leave {
438		- height: 100%;
439		- opacity: 1;
	436	+ max-height: 100vh;
440	437	}
441	438	.dropping.ng-leave-active {
442		- opacity: 0;
443		- height: 0%;
	439	+ max-height: 0vh;
444	440	}

1	1	<div class="container">
2	2	<div class="row">
3	3	<h2>FAQ</h2>
4		- <a id="whatis"></a>
5		- <h4>What is Flashy?</h4>
6	4
7		- <p>Flashy is a service for creating, sharing, and reviewing flashcards for courses. We combine two solutions to
8		- shortcomings of other flashcard services. </p>
	5	+ <ul class="collapsible" data-collapsible="expandable">
	6	+ <li>
	7	+ <div class="collapsible-header"><i class="mdi-image-filter-drama"></i>What is Flashy?</div>
	8	+ <div class="collapsible-body">
	9	+ <p>Flashy is a service for creating, sharing, and reviewing flashcards for courses. We combine two solutions to
	10	+ shortcomings of other flashcard services.
9	11
10		- <p>Flashy is optimized for contributing cards in real time during lecture to a shared live feed. Don't want to
11		- contribute cards? That's fine! By choosing others' cards to add to your deck, you help us identify high-quality
12		- cards which should remain at the top of the feed.</p>
	12	+ Flashy is optimized for contributing cards in real time during lecture to a shared live feed. Don't want to
	13	+ contribute cards? That's fine! By choosing others' cards to add to your deck, you help us identify high-quality
	14	+ cards which should remain at the top of the feed.
13	15
14		- <p>Based on the principles of spaced repetition, Flashy also intelligently determines which cards you are most at
15		- risk of forgetting, based on your review history. You can also enable push notifications on Android in Chrome without
16		- installing an app! We'll notify you when you have a few cards which need to be reviewed.</p>
	16	+ Based on the principles of spaced repetition, Flashy also intelligently determines which cards you are most at
	17	+ risk of forgetting, based on your review history. You can also enable push notifications on Android in Chrome without
	18	+ installing an app! We'll notify you when you have a few cards which need to be reviewed.</p>
	19	+ </div>
	20	+ </li>
17	21
18		- <h4>Does Flashy work outside of UCSD?</h4>
	22	+ <li>
	23	+ <div class="collapsible-header"><i class="mdi-image-filter-drama"></i>Does Flashy work outside of UCSD?</div>
	24	+ <div class="collapsible-body">
	25	+ <p>To simplify development, Flashy was configured only for courses at UCSD. If you'd like Flashy for your school,
	26	+ please send us an email to let us know!</p>
	27	+ </div>
	28	+ </li>
19	29
20		- <p>To simplify development, Flashy was configured only for courses at UCSD. If you'd like Flashy for your school,
21		- please send us an email to let us know!</p>
22		- <a id="verification"></a>
23		- <h4>How do registration & verification work? </h4>
24		-
25		- <p>An account is required to use Flashy. We store the cards you save to your deck with your account.
26		- When you register, you'll be able to use the site immediately, but you must
27		- verify ownership of your email address within 24 hours. After 24 hours have passed, you'll need to verify your
28		- address before continuing to use the site. Don't worry, your cards and deck won't be deleted.</p>
	30	+ <li>
	31	+ <div class="collapsible-header"><i class="mdi-image-filter-drama"></i>How do registration & verification work?</div>
	32	+ <div class="collapsible-body">
	33	+ <p>An account is required to use Flashy. We store the cards you save to your deck with your account.
	34	+ When you register, you'll be able to use the site immediately, but you must
	35	+ verify ownership of your email address within 24 hours. After 24 hours have passed, you'll need to verify your
	36	+ address before continuing to use the site. Don't worry, your cards and deck won't be deleted.</p>
	37	+ </div>
	38	+ </li>
	39	+ </ul>
29	40	</div>
30	41	</div>