Commit 3c77a71a364d27dbfd3e6765768b8b18fc509519

Authored by Tetranoir
1 parent c138ea0909

Settings icon more in line with what it does

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