mirror of
				https://github.com/richard-loafle/fuse-angular.git
				synced 2025-10-31 01:33:33 +00:00 
			
		
		
		
	Merge branch 'master' into v5
This commit is contained in:
		
						commit
						2509ad4e71
					
				| @ -7,16 +7,16 @@ | ||||
|     <h4 class="secondary-text">Demo Content</h4> | ||||
| 
 | ||||
|     <p> | ||||
|         One morning, when Gregor Samsa woke from troubled dreams, he found himself transformed in his bed into a | ||||
|         horrible vermin. He lay on his armour-like back, and if he lifted his head a little he could see his | ||||
|         brown belly, slightly domed and divided by arches into stiff sections. | ||||
|         Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse tortor nibh, convallis sed purus nec, | ||||
|         auctor venenatis nisl. Suspendisse potenti. Nullam sagittis nulla in diam finibus, sed pharetra velit | ||||
|         vestibulum. Suspendisse euismod in urna eu posuere. | ||||
|     </p> | ||||
| 
 | ||||
|     <blockquote> | ||||
|         <p> | ||||
|             The bedding was hardly able to cover it and seemed ready to slide off any moment. His many legs, | ||||
|             pitifully thin compared with the size of the rest of him, waved about helplessly as he looked. "What's | ||||
|             happened to me? " he thought. It wasn't a dream. | ||||
|             Nunc vel lacinia lorem. Nullam tincidunt sed purus eu placerat. Donec id dictum erat. Etiam enim ex, dapibus | ||||
|             et tortor id, posuere pretium est. Maecenas fringilla ipsum vitae neque elementum, at eleifend ante | ||||
|             sollicitudin. Donec viverra augue dolor, a venenatis tellus consectetur sit amet. | ||||
|         </p> | ||||
|         <footer> | ||||
|             John Doe | ||||
| @ -24,52 +24,52 @@ | ||||
|     </blockquote> | ||||
| 
 | ||||
|     <p> | ||||
|         His room, a proper human room although a little too small, lay peacefully between its four familiar | ||||
|         walls. A collection of textile samples lay spread out on the table - Samsa was a travelling salesman - | ||||
|         and above it there hung a picture that he had recently cut out of an illustrated magazine and housed in | ||||
|         a nice, gilded frame. | ||||
|         Ut ornare sit amet velit vel congue. Ut nec tristique eros. Lorem ipsum dolor sit amet, consectetur adipiscing | ||||
|         elit. Vivamus sed lorem quis nibh porta iaculis. Vestibulum ut eleifend ante, at semper mi. Nam imperdiet est | ||||
|         nisi, quis hendrerit tellus convallis et. Morbi in luctus neque. Curabitur elementum ut est et gravida. In hac | ||||
|         habitasse platea dictumst. | ||||
|     </p> | ||||
| 
 | ||||
|     <p> | ||||
|         It showed a lady fitted out with a fur hat and fur boa who sat upright, raising a heavy fur muff that | ||||
|         covered the whole of her lower arm towards the viewer. Gregor then turned to look out the window at the | ||||
|         dull weather. Drops of rain could be heard hitting the pane, which made him feel quite sad. | ||||
|         In et placerat eros, eu tempor turpis. Curabitur ac felis finibus, elementum lectus vitae, venenatis est. | ||||
|         Integer mollis nisl a eros scelerisque varius. Etiam venenatis lectus vel erat condimentum tristique vel vel mi. | ||||
|         Nulla id euismod mi, et mollis tellus. | ||||
|     </p> | ||||
| 
 | ||||
|     <p> | ||||
|         "How about if I sleep a little bit longer and forget all this nonsense", he thought, but that was | ||||
|         something he was unable to do because he was used to sleeping on his right, and in his present state | ||||
|         couldn't get into that position. However hard he threw himself onto his right, he always rolled back to | ||||
|         where he was. | ||||
|         Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Class aptent taciti | ||||
|         sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur vitae sagittis odio. | ||||
|         Suspendisse ullamcorper nunc non pellentesque laoreet. Curabitur eu tortor id quam pretium mattis. Proin ut quam | ||||
|         velit. | ||||
|     </p> | ||||
| 
 | ||||
|     <p> | ||||
|         He must have tried it a hundred times, shut his eyes so that he wouldn't have to look at the floundering | ||||
|         legs, and only stopped when he began to feel a mild, dull pain there that he had never felt before. "Oh, | ||||
|         God", he thought, "what a strenuous career it is that I've chosen! | ||||
|         Quisque sit amet risus enim. Aliquam sit amet interdum justo, at ultricies sapien. Suspendisse et semper urna, | ||||
|         in gravida eros. Quisque id nibh iaculis, euismod urna sed, egestas nisi. Donec eros metus, congue a imperdiet | ||||
|         feugiat, sagittis nec ipsum. Quisque dapibus mollis felis non tristique. | ||||
|     </p> | ||||
| 
 | ||||
|     <p> | ||||
|         Travelling day in and day out. Doing business like this takes much more effort than doing your own | ||||
|         business at home, and on top of that there's the curse of travelling, worries about making train | ||||
|         connections, bad and irregular food, contact with different people all the time so that you can never | ||||
|         get to know anyone or become friendly with them. | ||||
|         Ut auctor, metus sed dapibus tempus, urna diam auctor odio, in malesuada odio risus vitae nisi. Etiam blandit | ||||
|         ante urna, vitae placerat massa mollis in. Duis nec urna ac purus semper dictum ut eget justo. Aenean non | ||||
|         sagittis augue. Sed venenatis rhoncus enim eget ornare. Donec viverra sed felis at venenatis. Mauris aliquam | ||||
|         fringilla nulla, sit amet congue felis dignissim at. | ||||
|     </p> | ||||
| 
 | ||||
|     <p> | ||||
|         "He felt a slight itch up on his belly; pushed himself slowly up on his back towards the headboard so | ||||
|         that he could lift his head better; found where the itch was, and saw that it was covered with lots of | ||||
|         little white spots which he didn't know what to make of; and when he tried to feel the place with one of | ||||
|         his legs he drew it quickly back because as soon as he touched it he was overcome by a cold shudder. He | ||||
|         slid back into his former position. | ||||
|         Quisque accumsan augue tempor ante mollis, sed placerat diam porttitor. Vestibulum dignissim sem vel velit | ||||
|         eleifend, non pellentesque quam convallis. Pellentesque est dolor, dignissim ac tortor tristique, hendrerit | ||||
|         iaculis metus. Praesent pulvinar quam eu leo consectetur faucibus. Vestibulum purus diam, gravida sagittis | ||||
|         feugiat sit amet, tincidunt in ligula. Sed semper vestibulum magna. Lorem ipsum dolor sit amet, consectetur | ||||
|         adipiscing elit. Suspendisse tortor nibh, convallis sed purus nec, auctor venenatis nisl. Suspendisse potenti. | ||||
|     </p> | ||||
| 
 | ||||
|     <p> | ||||
|         "Getting up early all the time", he thought, "it makes you stupid. You've got to get enough sleep. Other | ||||
|         travelling salesmen live a life of luxury. For instance, whenever I go back to the guest house during | ||||
|         the morning to copy out the contract, these gentlemen are always still sitting there eating their | ||||
|         breakfasts. I ought to just try that with my boss; I'd get kicked out on the spot. But who knows, maybe | ||||
|         that would be the best thing for me... | ||||
|         Nullam sagittis nulla in diam finibus, sed pharetra velit vestibulum. Suspendisse euismod in urna eu posuere. | ||||
|         Etiam blandit nunc arcu, et consectetur orci blandit a. Aliquam condimentum pharetra quam at ultricies. Nunc vel | ||||
|         lacinia lorem. Nullam tincidunt sed purus eu placerat. Donec id dictum erat. Etiam enim ex, dapibus et tortor | ||||
|         id, posuere pretium est. Maecenas fringilla ipsum vitae neque elementum, at eleifend ante sollicitudin. Donec | ||||
|         viverra augue dolor, a venenatis tellus consectetur sit amet... | ||||
|     </p> | ||||
| </div> | ||||
| <!-- / DEMO CONTENT --> | ||||
|  | ||||
| @ -231,9 +231,11 @@ $top-bg-image: url('assets/images/backgrounds/header-bg.png'); | ||||
|                     > .mat-sidenav-content, | ||||
|                     > .mat-drawer-content { | ||||
|                         width: calc(100% - 240px); | ||||
|                         min-width: 0; | ||||
| 
 | ||||
|                         .center { | ||||
|                             width: calc(100% - 32px); | ||||
|                             min-width: 0; | ||||
| 
 | ||||
|                             @include media-breakpoint-down('md') { | ||||
|                                 width: calc(100% - 64px); | ||||
|  | ||||
| @ -6,21 +6,21 @@ export class ChatFakeDb | ||||
|             'name'  : 'Alice Freeman', | ||||
|             'avatar': 'assets/images/avatars/alice.jpg', | ||||
|             'status': 'online', | ||||
|             'mood'  : 'I never sign anything until I pretend to read it first..' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680606588342058356d', | ||||
|             'name'  : 'Arnold', | ||||
|             'avatar': 'assets/images/avatars/Arnold.jpg', | ||||
|             'status': 'do-not-disturb', | ||||
|             'mood'  : 'Looks like Andrew Jackson\'s been tossed to the back of the bus.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a68009e20d0a9e9acf2a', | ||||
|             'name'  : 'Barrera', | ||||
|             'avatar': 'assets/images/avatars/Barrera.jpg', | ||||
|             'status': 'do-not-disturb', | ||||
|             'mood'  : 'Love is going to bed early.Marriage is going to sleep early.', | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...', | ||||
|             'unread': null | ||||
|         }, | ||||
|         { | ||||
| @ -28,7 +28,7 @@ export class ChatFakeDb | ||||
|             'name'  : 'Blair', | ||||
|             'avatar': 'assets/images/avatars/Blair.jpg', | ||||
|             'status': 'offline', | ||||
|             'mood'  : 'I would be unstoppable. If i could just get started.', | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...', | ||||
|             'unread': 3 | ||||
|         }, | ||||
|         { | ||||
| @ -36,112 +36,112 @@ export class ChatFakeDb | ||||
|             'name'  : 'Boyle', | ||||
|             'avatar': 'assets/images/avatars/Boyle.jpg', | ||||
|             'status': 'offline', | ||||
|             'mood'  : '\'GOOD MORNING COFFEE\'....Meet your maker!!!!' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a68031fdbb1db2c1af47', | ||||
|             'name'  : 'Christy', | ||||
|             'avatar': 'assets/images/avatars/Christy.jpg', | ||||
|             'status': 'offline', | ||||
|             'mood'  : 'We always hold hands. If I let go, she shops.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680bc670af746c435e2', | ||||
|             'name'  : 'Copeland', | ||||
|             'avatar': 'assets/images/avatars/Copeland.jpg', | ||||
|             'status': 'online', | ||||
|             'mood'  : 'I get enough exercise just pushing my luck.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680e7eb988a58ddf303', | ||||
|             'name'  : 'Estes', | ||||
|             'avatar': 'assets/images/avatars/Estes.jpg', | ||||
|             'status': 'away', | ||||
|             'mood'  : 'What comes after the man bun hairstyle? The he-hive!' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680dcb077889f758961', | ||||
|             'name'  : 'Harper', | ||||
|             'avatar': 'assets/images/avatars/Harper.jpg', | ||||
|             'status': 'offline', | ||||
|             'mood'  : 'Always try to be modest and be proud of it!' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a6806acf030f9341e925', | ||||
|             'name'  : 'Helen', | ||||
|             'avatar': 'assets/images/avatars/Helen.jpg', | ||||
|             'status': 'away', | ||||
|             'mood'  : 'Why are there stitch marks on zombies? Who\'s giving them medical attention?' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680ae1ae9a3c960d487', | ||||
|             'name'  : 'Henderson', | ||||
|             'avatar': 'assets/images/avatars/Henderson.jpg', | ||||
|             'status': 'offline', | ||||
|             'mood'  : 'I can\'t decide if people who wear pajamas in public have given up on life or are living it to the fullest.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680b8d240c011dd224b', | ||||
|             'name'  : 'Josefina', | ||||
|             'avatar': 'assets/images/avatars/Josefina.jpg', | ||||
|             'status': 'online', | ||||
|             'mood'  : 'The fastest way to being happy is to make other people happy. You go first' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a68034cb3968e1f79eac', | ||||
|             'name'  : 'Katina', | ||||
|             'avatar': 'assets/images/avatars/Katina.jpg', | ||||
|             'status': 'away', | ||||
|             'mood'  : 'If I was a rat,,, I wouldn\'t give anyone my ass.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a6801146cce777df2a08', | ||||
|             'name'  : 'Lily', | ||||
|             'avatar': 'assets/images/avatars/Lily.jpg', | ||||
|             'status': 'do-not-disturb', | ||||
|             'mood'  : 'A zip line but from the sofa to the fridge' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a6808a178bfd034d6ecf', | ||||
|             'name'  : 'Mai', | ||||
|             'avatar': 'assets/images/avatars/Mai.jpg', | ||||
|             'status': 'away', | ||||
|             'mood'  : 'If a girl tells you she has a nipple ring, the only correct response is \'I don\'t believe you.\'' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680653c265f5c79b5a9', | ||||
|             'name'  : 'Nancy', | ||||
|             'avatar': 'assets/images/avatars/Nancy.jpg', | ||||
|             'status': 'do-not-disturb', | ||||
|             'mood'  : 'Prison counts as a gated community, right?' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680bbcec3cc32a8488a', | ||||
|             'name'  : 'Nora', | ||||
|             'avatar': 'assets/images/avatars/Nora.jpg', | ||||
|             'status': 'do-not-disturb', | ||||
|             'mood'  : 'I never date left handed women. Righty tighty, lefty loosey.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a6803d87f1b77e17b62b', | ||||
|             'name'  : 'Odessa', | ||||
|             'avatar': 'assets/images/avatars/Odessa.jpg', | ||||
|             'status': 'away', | ||||
|             'mood'  : 'A day without sunshine is like, night.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680e87cb319bd9bd673', | ||||
|             'name'  : 'Reyna', | ||||
|             'avatar': 'assets/images/avatars/Reyna.jpg', | ||||
|             'status': 'offline', | ||||
|             'mood'  : 'I can\'t wait for summer in Canada...' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a6802d10e277a0f35775', | ||||
|             'name'  : 'Shauna', | ||||
|             'avatar': 'assets/images/avatars/Shauna.jpg', | ||||
|             'status': 'online', | ||||
|             'mood'  : 'My take home pay doesn’t ven take me home.', | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...', | ||||
|             'unread': null | ||||
|         }, | ||||
|         { | ||||
| @ -149,7 +149,7 @@ export class ChatFakeDb | ||||
|             'name'  : 'Shepard', | ||||
|             'avatar': 'assets/images/avatars/Shepard.jpg', | ||||
|             'status': 'online', | ||||
|             'mood'  : 'I don\'t speak Spanish, but I\'m pretty sure \'Dora\' means \'annoying\'' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a680cd7efa56a45aea5d', | ||||
| @ -163,21 +163,21 @@ export class ChatFakeDb | ||||
|             'name'  : 'Trevino', | ||||
|             'avatar': 'assets/images/avatars/Trevino.jpg', | ||||
|             'status': 'away', | ||||
|             'mood'  : 'Apparently, a rat and a plastic tube does not count as a DIY abortion kit.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a68018c663044be49cbf', | ||||
|             'name'  : 'Tyson', | ||||
|             'avatar': 'assets/images/avatars/Tyson.jpg', | ||||
|             'status': 'do-not-disturb', | ||||
|             'mood'  : 'I\'m wondering why life keeps teaching me lessons I have no desire to learn...' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         }, | ||||
|         { | ||||
|             'id'    : '5725a6809413bf8a0a5272b1', | ||||
|             'name'  : 'Velazquez', | ||||
|             'avatar': 'assets/images/avatars/Velazquez.jpg', | ||||
|             'status': 'online', | ||||
|             'mood'  : 'Modulation in all things.' | ||||
|             'mood'  : 'Lorem ipsum dolor sit amet, consectetur adipiscing elit...' | ||||
|         } | ||||
|     ]; | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user