diff --git a/home.html b/home.html index f8fb95a..9f63cd8 100644 --- a/home.html +++ b/home.html @@ -15,7 +15,7 @@ <body ng-controller="RootController"> <header> <nav> - <div class="nav-wrapper" ng-cloak> + <div class="nav-wrapper"> <a ng-show="UserService.isLoggedIn()" href="#" data-activates="mobile-demo" class="left button-collapse hide-on-med-and-up"><i class="mdi-navigation-menu"></i></a> @@ -35,16 +35,16 @@ </ul> <a href="#" class="brand-logo center">Flashy</a> - <ul ng-show="UserService.isLoggedIn()" id="nav-mobile" class="right hide-on-small-and-down"> + <ul ng-show="UserService.isLoggedIn()" ng-cloak id="nav-mobile" class="right hide-on-small-and-down"> <!-- User's classes dropdown --> <ul id="dropdown1" class="dropdown-content"> <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> + <a class="class bold" ui-sref="feed({sectionId:section.id})">{{section.short_name}}<span class="badge">hi</span></a> </li> <li class="divider"></li> <li><a ui-sref="addclass">Add Class</a></li> </ul> - <li><a class="dropdown-button ng-cloak" href="#!" data-activates="dropdown1">{{currentSection.id?currentSection.short_name:"Classes"}}<i + <li><a style="width:150px;" class="dropdown-button ng-cloak" href="#!" data-activates="dropdown1">{{currentSection.id?currentSection.short_name:"Classes"}}<i class="mdi-navigation-arrow-drop-down right"></i></a></li> <li><a ui-sref="study">Study</a></li> <li><a ui-sref="logout">Logout</a></li> diff --git a/styles/flashy.css b/styles/flashy.css index ac4c60f..9afc3f7 100644 --- a/styles/flashy.css +++ b/styles/flashy.css @@ -290,9 +290,13 @@ md-content.md-default-theme { } .toast { - height:100px; + height: 100px; width: 300px; line-height: 20px; max-height: 100px; word-wrap: normal; +} + +[ng-cloak] { + display: none !important; } \ No newline at end of file diff --git a/templates/feed.html b/templates/feed.html index 60f7081..e8322e1 100644 --- a/templates/feed.html +++ b/templates/feed.html @@ -1,7 +1,7 @@ <div class="row"> <h2 ng-cloak ng-show="cards.length == 0">No cards. Be the first one to add a card!</h2> - <div class="progress center-align" style="margin: 32px auto auto;width:50%;" ng-show="!cards"> + <div class="progress center-align" style="margin: 70px auto auto;width:50%;" ng-show="!cards"> <div class="indeterminate"></div> </div> <div ng-repeat="card in cards">