110swag / flashy-frontend

Download as
Browse Code ยป

Commit 9436dc71d2136f3db9667c5cbc8cb9af37bce0bd

Authored by Andrew Buss
1 parent 26c38d230f
Exists in master and in 1 other branch ef9f9dd363e92d55eb4d80d036193be39572172b

remove footer; move email onto FAQ page

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

home.html View file @ 9436dc7
... ... @@ -9,8 +9,8 @@
9 9 <link rel="stylesheet" href="styles/flashier.css"/>
10 10 <link rel="stylesheet" href="styles/flashy.css"/>
11 11 <link
12   - href='https://fonts.googleapis.com/css?family=Satisfy|Titillium+Web:400,200,200italic,300,600,700,900,700italic,600italic,400italic,300italic'
13   - rel='stylesheet' type='text/css'>
  12 + href='https://fonts.googleapis.com/css?family=Satisfy|Titillium+Web:400,200,200italic,300,600,700,900,700italic,600italic,400italic,300italic'
  13 + rel='stylesheet' type='text/css'>
14 14 <title>Flashy</title>
15 15 </head>
16 16 <body ng-controller="RootController">
17 17  
18 18  
19 19  
... ... @@ -123,25 +123,19 @@
123 123  
124 124  
125 125 <!-- Menu Bar -->
  126 +<main ui-view></main>
126 127  
127   -<div class="wrapper">
128 128  
129   - <main ui-view></main>
  129 +<!--<footer class="page-footer">-->
  130 +<!--<div class="footer-copyright">-->
  131 +<!--<div class="container">-->
  132 +<!--&copy; 2015 Team Swag-->
  133 +<!--<a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by-->
  134 +<!--email!</a>-->
  135 +<!--</div>-->
130 136  
131   - <div class="push"></div>
132   -</div>
133   -
134   -
135   -<footer class="page-footer">
136   - <div class="footer-copyright">
137   - <div class="container">
138   - &copy; 2015 Team Swag
139   - <a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by
140   - email!</a>
141   - </div>
142   -
143   - </div>
144   -</footer>
  137 +<!--</div>-->
  138 +<!--</footer>-->
145 139  
146 140 </body>
147 141 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
scripts/HelpController.js View file @ 9436dc7
... ... @@ -24,7 +24,14 @@
24 24 {
25 25 icon: 'mdi-editor-insert-emoticon',
26 26 question: 'What is Flashy?',
27   - 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>"
  27 + answer: '<p>Flashy is a service for creating, sharing, and reviewing flashcards for your courses.' +
  28 + '</p><p>Flashy is optimized for contributing cards in real time during lecture to a shared live' +
  29 + " feed. Don't want to contribute cards? That's fine! By adding others' cards to your deck, you" +
  30 + ' help identify high-quality cards which should remain at the top of the feed for others to choose.' +
  31 + '</p><p>Based on the principles of spaced repetition, Flashy also intelligently determines which' +
  32 + ' cards you are most at risk of forgetting, based on your review history. Recieve push ' +
  33 + "notifications on your Android device's Chrome browser without installing any other app," +
  34 + " and we'll notify you when you have a few cards which need to be reviewed.</p>"
28 35 },
29 36 {
30 37 icon: 'mdi-file-cloud-queue',
styles/flashy.css View file @ 9436dc7
... ... @@ -380,11 +380,11 @@
380 380 margin: 0;
381 381 }
382 382  
383   -.wrapper {
384   - min-height: 100%;
385   - height: 100%;
386   - margin: 0 auto -4em;
387   -}
  383 +/*.wrapper {*/
  384 + /*min-height: 100%;*/
  385 + /*height: 100%;*/
  386 + /*/!*margin: 0 auto -4em;*!/*/
  387 +/*}*/
388 388  
389 389 .container, .push {
390 390 height: 4em;
templates/help.html View file @ 9436dc7
... ... @@ -2,22 +2,26 @@
2 2 <div class="row">
3 3 <h2>FAQ</h2>
4 4 <button class="btn waves-effect waves-light" ng-click="expandAllContent()">
5   - Expand all
  5 + Expand all
6 6 </button>
7 7 <button class="btn waves-effect waves-light" ng-click="collapseAllContent()">
8   - Collapse all
  8 + Collapse all
9 9 </button>
10 10  
11 11 <!-- Please enter entries in JSON format in HelpController.js -->
12 12 <ul class="collection st-accordion">
13 13 <li class="st-accordion--item" ng-repeat="entry in entries">
14 14 <div class="st-accordion--header" ng-click="toggleContent($event, $index)">
15   - <i class="{{entry.icon}}"></i>
16   - {{entry.question}}</div>
  15 + <i class="{{entry.icon}}"></i>
  16 + {{entry.question}}
  17 + </div>
17 18 <div id="content-{{$index}}" class="st-accordion--content"
18   - ng-bind-html="entry.answer"></div>
  19 + ng-bind-html="entry.answer"></div>
19 20 </li>
20 21 </ul>
21 22 </div>
  23 + <h2>More questions?</h2>
  24 +
  25 + <p><a href="mailto:or.so.help.me@flashy.cards">Contact us by email! </a></p>
22 26 </div>