Commit 7dc4ba21576b8d87c0c55333213866193aef9187

Authored by Rohan Rangray
1 parent df5215d652

Fixed the google font fetch url

Showing 1 changed file with 3 additions and 5 deletions Inline Diff

<!DOCTYPE html> 1 1 <!DOCTYPE html>
<html ng-app="flashy"> 2 2 <html ng-app="flashy">
<base href="/app/"> 3 3 <base href="/app/">
<head> 4 4 <head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/> 5 5 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<link rel="stylesheet" 6 6 <link rel="stylesheet"
href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css"> 7 7 href="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.css">
8 8
<link 9
href='http://fonts.googleapis.com/css?family=Lobster|Great+Vibes|Pacifico|Satisfy|Damion|Playball' 10
rel='stylesheet' type='text/css'> 11
<link rel="stylesheet" href="styles/flashier.css"/> 12 9 <link rel="stylesheet" href="styles/flashier.css"/>
<link rel="stylesheet" href="styles/flashy.css"/> 13 10 <link rel="stylesheet" href="styles/flashy.css"/>
<link href='https://fonts.googleapis.com/css?family=Titillium+Web:200,200italic,300,600,400,900,700,400italic,700italic,300italic,600italic' 14 11 <link
rel='stylesheet' type='text/css'> 15 12 href='http://fonts.googleapis.com/css?family=Lobster|Titillium+Web:400,200,200italic,300,600,700,900,700italic,600italic,400italic,300italic'
13 rel='stylesheet' type='text/css'>
<title>Flashy</title> 16 14 <title>Flashy</title>
</head> 17 15 </head>
<body ng-controller="RootController"> 18 16 <body ng-controller="RootController">
<header> 19 17 <header>
<nav> 20 18 <nav>
<div class="nav-wrapper"> 21 19 <div class="nav-wrapper">
<a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo" 22 20 <a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo"
class="left button-collapse hide-on-med-and-up"><i 23 21 class="left button-collapse hide-on-med-and-up"><i
class="mdi-navigation-menu"></i></a> 24 22 class="mdi-navigation-menu"></i></a>
<!-- User's classes dropdown --> 25 23 <!-- User's classes dropdown -->
<ul id="classDropdown" class="dropdown-content"> 26 24 <ul id="classDropdown" class="dropdown-content">
<li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections"> 27 25 <li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections">
<a ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a> 28 26 <a ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a>
</li> 29 27 </li>
<li class="divider"></li> 30 28 <li class="divider"></li>
<li><a ui-sref="addclass">Add Class</a></li> 31 29 <li><a ui-sref="addclass">Add Class</a></li>
</ul> 32 30 </ul>
<ul ng-show="UserService.isLoggedIn()" class="left hide-on-small-and-down"> 33 31 <ul ng-show="UserService.isLoggedIn()" class="left hide-on-small-and-down">
<li><a style="font-size:20px; font-weight:700" class="dropdown-button ng-cloak hide-on-small-and-down" 34 32 <li><a style="font-size:20px; font-weight:700" class="dropdown-button ng-cloak hide-on-small-and-down"
href="#!" 35 33 href="#!"
data-activates="classDropdown">{{currentSection.id?currentSection.short_name:"Classes"}}<i 36 34 data-activates="classDropdown">{{currentSection.id?currentSection.short_name:"Classes"}}<i
class="mdi-navigation-arrow-drop-down right"></i></a></li> 37 35 class="mdi-navigation-arrow-drop-down right"></i></a></li>
<li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" 38 36 <li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})"
class="tooltipped" 39 37 class="tooltipped"
data-position="bottom" 40 38 data-position="bottom"
data-delay="50" data-tooltip="Feed"><i 41 39 data-delay="50" data-tooltip="Feed"><i
class="mdi-action-view-module"></i></a></li> 42 40 class="mdi-action-view-module"></i></a></li>
<li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" 43 41 <li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})"
class="tooltipped" 44 42 class="tooltipped"
data-position="bottom" 45 43 data-position="bottom"
data-delay="50" data-tooltip="Deck"><i 46 44 data-delay="50" data-tooltip="Deck"><i
class="mdi-action-view-carousel"></i></a></li> 47 45 class="mdi-action-view-carousel"></i></a></li>
<li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" 48 46 <li ng-show="currentSection.id" ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})"
class="tooltipped" 49 47 class="tooltipped"
data-position="bottom" 50 48 data-position="bottom"
data-delay="50" data-tooltip="Card List"><i 51 49 data-delay="50" data-tooltip="Card List"><i
class="mdi-action-view-list"></i></a></li> 52 50 class="mdi-action-view-list"></i></a></li>
</ul> 53 51 </ul>
<a href="#" class="brand-logo center">Flashy</a> 54 52 <a href="#" class="brand-logo center">Flashy</a>
55 53
<ul ng-show="UserService.isLoggedIn()" ng-cloak id="nav-mobile" class="right hide-on-small-and-down"> 56 54 <ul ng-show="UserService.isLoggedIn()" ng-cloak id="nav-mobile" class="right hide-on-small-and-down">
57 55
<li ui-sref-active="active"><a ui-sref="study" class="tooltipped" data-position="bottom" data-delay="50" 58 56 <li ui-sref-active="active"><a ui-sref="study" class="tooltipped" data-position="bottom" data-delay="50"
data-tooltip="Study"> 59 57 data-tooltip="Study">
<i class="tiny mdi-action-pageview"></i></a></li> 60 58 <i class="tiny mdi-action-pageview"></i></a></li>
61 59
<!-- Settings Dropdown --> 62 60 <!-- Settings Dropdown -->
<ul id="settingsDropdown" class="dropdown-content"> 63 61 <ul id="settingsDropdown" class="dropdown-content">
64 62
65 63
</ul> 66 64 </ul>
67 65
<li ui-sref-active="active"><a ui-sref="help"><i class="tiny mdi-action-help tooltipped" 68 66 <li ui-sref-active="active"><a ui-sref="help"><i class="tiny mdi-action-help tooltipped"
data-position="bottom" 69 67 data-position="bottom"
data-delay="50" data-tooltip="Help"></i></a></li> 70 68 data-delay="50" data-tooltip="Help"></i></a></li>
<li ui-sref-active="active"><a ui-sref="settings"><i data-position="bottom" data-delay="50" 71 69 <li ui-sref-active="active"><a ui-sref="settings"><i data-position="bottom" data-delay="50"
data-tooltip="Settings" 72 70 data-tooltip="Settings"
class="mdi-action-settings tooltipped"></i></a></li> 73 71 class="mdi-action-settings tooltipped"></i></a></li>
<li><a ui-sref="logout"><i data-position="bottom" data-delay="50" data-tooltip="Logout" 74 72 <li><a ui-sref="logout"><i data-position="bottom" data-delay="50" data-tooltip="Logout"
class="mdi-content-forward tooltipped"></i></a></li> 75 73 class="mdi-content-forward tooltipped"></i></a></li>
76 74
77 75
</ul> 78 76 </ul>
79 77
<!-- Slide-in side-nav for small screens --> 80 78 <!-- Slide-in side-nav for small screens -->
<ul ng-show="UserService.isLoggedIn()" class="side-nav" id="mobile-demo"> 81 79 <ul ng-show="UserService.isLoggedIn()" class="side-nav" id="mobile-demo">
<span ng-show="currentSection.id"> 82 80 <span ng-show="currentSection.id">
<li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped"> 83 81 <li ui-sref-active="active"><a ui-sref="feed({sectionId:currentSection.id})" class="tooltipped">
<i class="mdi-action-view-module left"></i> 84 82 <i class="mdi-action-view-module left"></i>
Feed</a> 85 83 Feed</a>
</li> 86 84 </li>
<li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped"> 87 85 <li ui-sref-active="active"><a ui-sref="deck({sectionId:currentSection.id})" class="tooltipped">
<i class="mdi-action-view-carousel left"> </i> 88 86 <i class="mdi-action-view-carousel left"> </i>
Deck 89 87 Deck
</a> 90 88 </a>
</li> 91 89 </li>
<li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped"> 92 90 <li ui-sref-active="active"><a ui-sref="cardlist({sectionId:currentSection.id})" class="tooltipped">
<i class="mdi-action-view-list left"></i> 93 91 <i class="mdi-action-view-list left"></i>
Card List 94 92 Card List
</a> 95 93 </a>
</li> 96 94 </li>
<hr> 97 95 <hr>
</span> 98 96 </span>
<!-- Collapsible menu for all the User's classes --> 99 97 <!-- Collapsible menu for all the User's classes -->
<ul class="collapsible" data-collapsible="accordion"> 100 98 <ul class="collapsible" data-collapsible="accordion">
<li class="bold"> 101 99 <li class="bold">
<a class="collapsible-header black-text"> 102 100 <a class="collapsible-header black-text">
Classes 103 101 Classes
<i class="mdi-navigation-arrow-drop-down right"></i> 104 102 <i class="mdi-navigation-arrow-drop-down right"></i>
</a> 105 103 </a>
</li> 106 104 </li>
<div class="collapsible-body" style="display: block"> 107 105 <div class="collapsible-body" style="display: block">
<ul> 108 106 <ul>
<li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections"> 109 107 <li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections">
<a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a> 110 108 <a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a>
</li> 111 109 </li>
<hr> 112 110 <hr>
<li><a ui-sref="addclass"><i class="tiny mdi-content-add">Add Class</i></a></li> 113 111 <li><a ui-sref="addclass"><i class="tiny mdi-content-add">Add Class</i></a></li>
</ul> 114 112 </ul>
</div> 115 113 </div>
</ul> 116 114 </ul>
<li><a ui-sref="study">Study</a></li> 117 115 <li><a ui-sref="study">Study</a></li>
<li><a ui-sref="settings">Settings</a></li> 118 116 <li><a ui-sref="settings">Settings</a></li>
<li><a ui-sref="logout">Logout</a></li> 119 117 <li><a ui-sref="logout">Logout</a></li>
</ul> 120 118 </ul>
</div> 121 119 </div>
</nav> 122 120 </nav>
123 121
</header> 124 122 </header>
125 123
126 124
<!-- Menu Bar --> 127 125 <!-- Menu Bar -->
128 126
<div class="wrapper"> 129 127 <div class="wrapper">
130 128
<main ui-view></main> 131 129 <main ui-view></main>
132 130
<div class="push"></div> 133 131 <div class="push"></div>
</div> 134 132 </div>
135 133
136 134
<footer class="page-footer"> 137 135 <footer class="page-footer">
<div class="footer-copyright"> 138 136 <div class="footer-copyright">
<div class="container"> 139 137 <div class="container">
&copy; 2015 Team Swag 140 138 &copy; 2015 Team Swag
<a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by 141 139 <a class="grey-text text-lighten-4 right" id="contact" href="mailto:halp@flashy.cards">Concerns? Contact us by
email!</a> 142 140 email!</a>
</div> 143 141 </div>
144 142
</div> 145 143 </div>
</footer> 146 144 </footer>
147 145
</body> 148 146 </body>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script> 149 147 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script> 150 148 <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.14/angular-ui-router.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script> 151 149 <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-cookies.js"></script>
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script> 152 150 <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="scripts/materialize.js"></script> 153 151 <script type="text/javascript" src="scripts/materialize.js"></script>
<script type="text/javascript" src="scripts/jquery.collapsible.js"></script> 154 152 <script type="text/javascript" src="scripts/jquery.collapsible.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script> 155 153 <script src="https://ajax.googleapis.com/ajax/libs/angular_material/0.9.0/angular-material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script> 156 154 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script> 157 155 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-resource.min.js"></script> 158 156 <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-resource.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.4/angular-filter.js"></script> 159 157 <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-filter/0.5.4/angular-filter.js"></script>
160 158
161 159
<script src="config.js"></script> 162 160 <script src="config.js"></script>
163 161
<!-- Controllers --> 164 162 <!-- Controllers -->