110swag / flashy-frontend

Commit bd83bd63c59cc4f5f2177509b0ae040fbc87592f

Authored by Andrew Buss 2015-05-25 16:08:53 -0700

tweaks

Showing 3 changed files with 10 additions and 6 deletions Side-by-side Diff

home.html
styles/flashy.css
templates/feed.html

...	...	@@ -15,7 +15,7 @@
15	15	<body ng-controller="RootController">
16	16	<header>
17	17	<nav>
18		- <div class="nav-wrapper" ng-cloak>
	18	+ <div class="nav-wrapper">
19	19	<a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo"
20	20	class="left button-collapse hide-on-med-and-up"><i
21	21	class="mdi-navigation-menu"></i></a>
22	22
23	23
...	...	@@ -35,16 +35,16 @@
35	35	</ul>
36	36	<a href="#" class="brand-logo center">Flashy</a>
37	37
38		- <ul ng-show="UserService.isLoggedIn()" id="nav-mobile" class="right hide-on-small-and-down">
	38	+ <ul ng-show="UserService.isLoggedIn()" ng-cloak id="nav-mobile" class="right hide-on-small-and-down">
39	39	<!-- User's classes dropdown -->
40	40	<ul id="dropdown1" class="dropdown-content">
41	41	<li ui-sref-active="active" ng-repeat="section in UserService.getUserData().sections">
42		- <a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}</a>
	42	+ <a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}<span class="badge">hi</span></a>
43	43	</li>
44	44	<li class="divider"></li>
45	45	<li><a ui-sref="addclass">Add Class</a></li>
46	46	</ul>
47		- <li><a class="dropdown-button ng-cloak" href="#!" data-activates="dropdown1">{{currentSection.id?currentSection.short_name:"Classes"}}<i
	47	+ <li><a style="width:150px;" class="dropdown-button ng-cloak" href="#!" data-activates="dropdown1">{{currentSection.id?currentSection.short_name:"Classes"}}<i
48	48	class="mdi-navigation-arrow-drop-down right"></i></a></li>
49	49	<li><a ui-sref="study">Study</a></li>
50	50	<li><a ui-sref="logout">Logout</a></li>

...	...	@@ -290,10 +290,14 @@
290	290	}
291	291
292	292	.toast {
293		- height:100px;
	293	+ height: 100px;
294	294	width: 300px;
295	295	line-height: 20px;
296	296	max-height: 100px;
297	297	word-wrap: normal;
	298	+}
	299	+
	300	+[ng-cloak] {
	301	+ display: none !important;
298	302	}

1	1	<div class="row">
2	2	<h2 ng-cloak ng-show="cards.length == 0">No cards. Be the first one to add a card!</h2>
3	3
4		- <div class="progress center-align" style="margin: 32px auto auto;width:50%;" ng-show="!cards">
	4	+ <div class="progress center-align" style="margin: 70px auto auto;width:50%;" ng-show="!cards">
5	5	<div class="indeterminate"></div>
6	6	</div>
7	7	<div ng-repeat="card in cards">