Commit 9589c9b728e1672671d7713732401b2d0628a23a
Exists in
master
and in
1 other branch
Merge branch 'master' of https://git.ucsd.edu/110swag/flashy-frontend
Showing 3 changed files Side-by-side Diff
home.html
View file @
9589c9b
| ... | ... | @@ -11,6 +11,8 @@ |
| 11 | 11 | rel='stylesheet' type='text/css'> |
| 12 | 12 | </head> |
| 13 | 13 | <header> |
| 14 | + <a href="#" style="position:absolute;top:0;left:0;" data-activates="sidebar" class="button-collapse"><i | |
| 15 | + class="medium mdi-navigation-menu"></i></a> | |
| 14 | 16 | <ul ng-show="isLoggedIn" id="sidebar" class="side-nav fixed"> |
| 15 | 17 | <li class="logo"><a href="//flashy.cards/" id="logo-container"> |
| 16 | 18 | |
| ... | ... | @@ -40,7 +42,7 @@ |
| 40 | 42 | <li class="bold"><a ui-sref="study">Study</a></li> |
| 41 | 43 | <li class="bold"><a ui-sref="logout">Logout</a></li> |
| 42 | 44 | </ul> |
| 43 | - <a href="#" data-activates="sidebar" class="button-collapse"><i class="medium mdi-navigation-menu"></i></a> | |
| 45 | + | |
| 44 | 46 | </header> |
| 45 | 47 | <body ng-controller="RootController"> |
| 46 | 48 |
styles/flashy.css
View file @
9589c9b
templates/feed.html
View file @
9589c9b
| ... | ... | @@ -15,13 +15,6 @@ |
| 15 | 15 | <a data-target="newCard" class="btn-floating btn-large modal-trigger" href="#newCard"> |
| 16 | 16 | <i class="large mdi-content-add"></i> |
| 17 | 17 | </a> |
| 18 | - <!--Maybe this will come in handy later? Floating bubbles on mouseover--> | |
| 19 | - <ul> | |
| 20 | - <li><a class="btn-floating red"><i class="large mdi-editor-insert-chart"></i></a></li> | |
| 21 | - <li><a class="btn-floating yellow darken-1"><i class="large mdi-editor-format-quote"></i></a></li> | |
| 22 | - <li><a class="btn-floating green"><i class="large mdi-editor-publish"></i></a></li> | |
| 23 | - <li><a class="btn-floating blue"><i class="large mdi-editor-attach-file"></i></a></li> | |
| 24 | - </ul> | |
| 25 | 18 | </div> |
| 26 | 19 | |
| 27 | 20 | <form> |