Commit 3a7048d6362b3f4b1b42a745aef1214d2358af1c

Authored by Melody
1 parent 6bd138fc71

official colors

Showing 2 changed files with 16 additions and 13 deletions Inline Diff

.angucomplete-dropdown { 1 1 .angucomplete-dropdown {
border-color: #ececec; 2 2 border-color: #ececec;
border-width: 1px; 3 3 border-width: 1px;
border-style: solid; 4 4 border-style: solid;
border-radius: 2px; 5 5 border-radius: 2px;
/*width: 250px;*/ 6 6 /*width: 250px;*/
padding: 6px; 7 7 padding: 6px;
cursor: pointer; 8 8 cursor: pointer;
z-index: 9999; 9 9 z-index: 9999;
position: absolute; 10 10 position: absolute;
/*top: 32px; 11 11 /*top: 32px;
left: 0px; 12 12 left: 0px;
*/ 13 13 */
margin-top: -6px; 14 14 margin-top: -6px;
background-color: #ffffff; 15 15 background-color: #ffffff;
} 16 16 }
17 17
.angucomplete-description { 18 18 .angucomplete-description {
font-size: 14px; 19 19 font-size: 14px;
} 20 20 }
21 21
.angucomplete-row { 22 22 .angucomplete-row {
padding: 5px; 23 23 padding: 5px;
color: #000000; 24 24 color: #000000;
margin-bottom: 4px; 25 25 margin-bottom: 4px;
clear: both; 26 26 clear: both;
} 27 27 }
28 28
.angucomplete-selected-row { 29 29 .angucomplete-selected-row {
background-color:#aaaaff; 30 30 background-color:#aaaaff;
} 31 31 }
32 32
.container { 33 33 .container {
position: relative; 34 34 position: relative;
width: 600px; 35 35 width: 600px;
height: 80px; 36 36 height: 80px;
} 37 37 }
38 38
.modal.bottom-sheet { 39 39 .modal.bottom-sheet {
width: 40%; 40 40 width: 40%;
margin-left: auto; 41 41 margin-left: auto;
margin-right: auto; 42 42 margin-right: auto;
} 43 43 }
44 44
<<<<<<< HEAD 45 45 <<<<<<< HEAD
/* label color */ 46 46 /* label color */
.input-field label { 47 47 .input-field label {
color: #673ab7; 48 48 color: #673ab7;
} 49 49 }
50 50
/* label focus color */ 51 51 /* label focus color */
.input-field input[type]:focus + label { 52 52 .input-field input[type]:focus + label {
color: #b388ff; 53 53 color: #b388ff;
} 54 54 }
55 55
/* label underline focus color */ 56 56 /* label underline focus color */
.input-field input[type]:focus { 57 57 .input-field input[type]:focus {
border-bottom: 1px solid #b388ff; 58 58 border-bottom: 1px solid #b388ff;
box-shadow: 0 1px 0 0 #b388ff; 59 59 box-shadow: 0 1px 0 0 #b388ff;
} 60 60 }
61 61
/* valid color */ 62 62 /* valid color */
.input-field input[type].valid { 63 63 .input-field input[type].valid {
border-bottom: 1px solid #673ab7; 64 64 border-bottom: 1px solid #673ab7;
box-shadow: 0 1px 0 0 #673ab7; 65 65 box-shadow: 0 1px 0 0 #673ab7;
} 66 66 }
67 67
/* invalid color */ 68 68 /* invalid color */
.input-field input[type].invalid { 69 69 .input-field input[type].invalid {
border-bottom: 1px solid #673ab7; 70 70 border-bottom: 1px solid #673ab7;
box-shadow: 0 1px 0 0 #673ab7; 71 71 box-shadow: 0 1px 0 0 #673ab7;
} 72 72 }
73 73
/* icon prefix focus color */ 74 74 /* icon prefix focus color */
.input-field .prefix.active { 75 75 .input-field .prefix.active {
color: #b388ff; 76 76 color: #b388ff;
} 77 77 }
78 78
/* label focus color */ 79 79 /* label focus color */
.input-field textarea[type]:focus + label { 80 80 .input-field textarea[type]:focus + label {
color: #b388ff; 81 81 color: #b388ff;
} 82 82 }
83 83
/* label underline focus color */ 84 84 /* label underline focus color */
.input-field textarea[type]:focus { 85 85 .input-field textarea[type]:focus {
border-bottom: 1px solid #b388ff; 86 86 border-bottom: 1px solid #b388ff;
box-shadow: 0 1px 0 0 #b388ff; 87 87 box-shadow: 0 1px 0 0 #b388ff;
templates/feed.html View file @ 3a7048d
<body> 1 1 <body>
<div class="col s12"> 2 2 <div class="col s12">
<div class="row"> 3 3 <div class="row">
<a class="waves-effect waves-light btn purple" ng-click="viewDeck()" style="top: 15px">View Deck</a> 4 4 <a class="waves-effect waves-light btn" ng-click="viewDeck()" style="top: 15px">View Deck</a>
</div> 5 5 </div>
6 6
<!--cards--> 7 7 <!--cards-->
<div class="row"> 8 8 <div class="row">
<div ng-repeat="card in cards"> 9 9 <div ng-repeat="card in cards">
<div class="col s6"> 10 10 <div class="col s6">
<div class="card" ng-click="pullCard(card)"> 11 11 <div class="card" ng-click="pullCard(card)">
<div class="card-content"> 12 12 <div class="card-content">
<span class="card-title">{{card.title}}</span> 13 13 <span> {{card.content}} </span>
<p> {{card.content}} </p> 14
</div> 15 14 </div>
16 15 </div>
16 </div>
</div> 17 17 </div>
18
</div> 19 18 </div>
20 19
21 20
</div> 22
</div> 23
24
25
<!--Lil plus button in corner--> 26 21 <!--Lil plus button in corner-->
<div class="fixed-action-btn" style="bottom: 45px; right: 24px;"> 27 22 <div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
<a data-target="modal1" class="btn-floating btn-large purple modal-trigger" href="#newCard"> 28 23 <a data-target="newCard" class="btn-floating btn-large modal-trigger" href="#newCard">
<i class="large mdi-content-add"></i> 29 24 <i class="large mdi-content-add"></i>
</a> 30 25 </a>
<!--Maybe this will come in handy later? Floating bubbles on mouseover--> 31 26 <!--Maybe this will come in handy later? Floating bubbles on mouseover-->
<ul> 32 27 <ul>
<li><a class="btn-floating red"><i class="large mdi-editor-insert-chart"></i></a></li> 33 28 <li><a class="btn-floating red"><i class="large mdi-editor-insert-chart"></i></a></li>
<li><a class="btn-floating yellow darken-1"><i class="large mdi-editor-format-quote"></i></a></li> 34 29 <li><a class="btn-floating yellow darken-1"><i class="large mdi-editor-format-quote"></i></a></li>
<li><a class="btn-floating green"><i class="large mdi-editor-publish"></i></a></li> 35 30 <li><a class="btn-floating green"><i class="large mdi-editor-publish"></i></a></li>
<li><a class="btn-floating blue"><i class="large mdi-editor-attach-file"></i></a></li> 36 31 <li><a class="btn-floating blue"><i class="large mdi-editor-attach-file"></i></a></li>
</ul> 37 32 </ul>
</div> 38 33 </div>
</div> 39 34 </div>
40 35
<div id="newCard" class="modal bottom-sheet"> 41 36 <div id="newCard" class="modal bottom-sheet">
<div class="modal-content"> 42 37 <div class="modal-content">
<form> 43 38 <form>
<div class="row"> 44 39 <div class="row">
<div class="input-field"> 45 40 <div class="input-field">
<i class="mdi-editor-mode-edit prefix"></i> 46 41 <i class="mdi-editor-mode-edit prefix"></i>
<textarea class="materialize-textarea" ng-model="text" type="text"></textarea> 47 42 <textarea class="materialize-textarea" ng-model="text" type="text"></textarea>
<label id="newCardSign" for="newCard">New Flashcard</label> 48 43 <label id="newCardSign" for="newCard">New Flashcard</label>
</div> 49 44 </div>
</div> 50 45 </div>
</form> 51 46 </form>
</div> 52 47 </div>
<div class="modal-footer"> 53 48 <div class="modal-footer">
<button class="btn waves-effect waves-light purple modal-close" type="submit" ng-click="pushCard()">Submit 54 49 <button class="btn waves-effect waves-light purple modal-close" type="submit" ng-click="pushCard()">Submit
<i class="mdi-content-send right"></i> 55 50 <i class="mdi-content-send right"></i>
</button> 56 51 </button>
</div> 57 52 </div>
</div> 58 53 </div>