110swag / flashy-frontend

Commit 3a7048d6362b3f4b1b42a745aef1214d2358af1c

Authored by Melody 2015-05-17 01:27:18 -0700

official colors

Showing 2 changed files with 16 additions and 13 deletions Side-by-side Diff

flashy.css
templates/feed.html

...	...	@@ -88,6 +88,14 @@
88	88	}
89	89
90	90	body {
91		- background-color: #3A263D;
	91	+ background-color: #3e1944;
	92	+}
	93	+
	94	+.btn {
	95	+ background-color: #673ab7;
	96	+}
	97	+
	98	+.btn-floating {
	99	+ background-color: #673ab7;
92	100	}

1	1	<body>
2	2	<div class="col s12">
3	3	<div class="row">
4		- <a class="waves-effect waves-light btn purple" ng-click="viewDeck()" style="top: 15px">View Deck</a>
	4	+ <a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 15px">View Deck</a>
5	5	</div>
6	6
7	7	<!--cards-->
8	8
9	9
10	10
11	11
...	...	@@ -10,22 +10,17 @@
10	10	<div class="col s6">
11	11	<div class="card" ng-click="pullCard(card)">
12	12	<div class="card-content">
13		- <span class="card-title">{{card.title}}</span>
14		- <p> {{card.content}} </p>
	13	+ <span> {{card.content}} </span>
15	14	</div>
16		-
	15	+ </div>
	16	+ </div>
17	17	</div>
18		-
19	18	</div>
20	19
21	20
22		- </div>
23		- </div>
24		-
25		-
26	21	<!--Lil plus button in corner-->
27	22	<div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
28		- <a data-target="modal1" class="btn-floating btn-large purple modal-trigger" href="#newCard">
	23	+ <a data-target="newCard" class="btn-floating btn-large modal-trigger" href="#newCard">
29	24	<i class="large mdi-content-add"></i>
30	25	</a>
31	26	<!--Maybe this will come in handy later? Floating bubbles on mouseover-->
...	...	@@ -38,7 +33,7 @@
38	33	</div>
39	34	</div>
40	35
41		- <div id="newCard" class="modal bottom-sheet">
	36	+ <div id="newCard" class="modal bottom-sheet">
42	37	<div class="modal-content">
43	38	<form>
44	39	<div class="row">
...	...	@@ -50,7 +45,7 @@
50	45	</div>
51	46	</form>
52	47	</div>
53		- <div class="modal-footer">
	48	+ <div class="modal-footer">
54	49	<button class="btn waves-effect waves-light purple modal-close" type="submit" ng-click="pushCard()">Submit
55	50	<i class="mdi-content-send right"></i>
56	51	</button>