Commit b1c2e10f01abe079a92d1c246f69d7bcf4da725e
1 parent
a92cd18505
Exists in
master
removed navbar thing; changed some wording
Showing 3 changed files with 70 additions and 47 deletions Side-by-side Diff
.gitignore
View file @
b1c2e10
css/style.css
View file @
b1c2e10
index.html
View file @
b1c2e10
... | ... | @@ -9,41 +9,42 @@ |
9 | 9 | |
10 | 10 | <!-- CSS --> |
11 | 11 | <link href="css/materialize.css" type="text/css" rel="stylesheet"> |
12 | - <link href="css/style.css" type="text/css" rel="stylesheet" > | |
13 | - <link href="css/font-awesome.min.css" type="text/css" rel="stylesheet" > | |
12 | + <link href="css/style.css" type="text/css" rel="stylesheet"> | |
13 | + <link href="css/font-awesome.min.css" type="text/css" rel="stylesheet"> | |
14 | 14 | <link |
15 | - href='https://fonts.googleapis.com/css?family=Satisfy|Titillium+Web:400,200,200italic,300,600,700,900,700italic,600italic,400italic,300italic' | |
16 | - rel='stylesheet' type='text/css'> | |
17 | - <script src="js/modernizr.js"></script> <!-- Modernizr --> | |
15 | + href='https://fonts.googleapis.com/css?family=Satisfy|Titillium+Web:400,200,200italic,300,600,700,900,700italic,600italic,400italic,300italic' | |
16 | + rel='stylesheet' type='text/css'> | |
17 | + <script src="js/modernizr.js"></script> | |
18 | + <!-- Modernizr --> | |
18 | 19 | </head> |
19 | 20 | <body id="top" class="scrollspy"> |
20 | 21 | |
21 | 22 | <!-- Pre Loader --> |
22 | 23 | <div id="loader-wrapper"> |
23 | 24 | <div id="loader"></div> |
24 | - | |
25 | + | |
25 | 26 | <div class="loader-section section-left"></div> |
26 | 27 | <div class="loader-section section-right"></div> |
27 | - | |
28 | + | |
28 | 29 | </div> |
29 | 30 | |
30 | 31 | <!--Navigation--> |
31 | - <div class="navbar-fixed navbar-fade"> | |
32 | - <nav id="nav_f" class="default_color" role="navigation"> | |
33 | - <div class="container"> | |
34 | - <div class="nav-wrapper"> | |
35 | - <a id="navbar-logo" href="#top" class="center center-block logo page-scroll">Flashy</a> | |
36 | - <ul id="nav-mobile" class="right side-nav"> | |
37 | - <li><a href="#intro">Service</a></li> | |
38 | - <li><a href="#work">Work</a></li> | |
39 | - <li><a href="#team">Team</a></li> | |
40 | - <li><a href="#contact">Contact</a></li> | |
41 | - <li><a href="" target="_blank">Download</a></li> | |
42 | - </ul><a href="#" data-activates="nav-mobile" class="button-collapse"><i class="mdi-navigation-menu"></i></a> | |
43 | - </div> | |
44 | - </div> | |
45 | - </nav> | |
46 | -</div> | |
32 | +<!--<div class="navbar-fixed navbar-fade">--> | |
33 | +<!--<nav id="nav_f" class="default_color" role="navigation">--> | |
34 | +<!--<div class="container">--> | |
35 | +<!--<div class="nav-wrapper">--> | |
36 | +<!--<a id="navbar-logo" href="#top" class="center center-block logo page-scroll">Flashy</a>--> | |
37 | +<!--<ul id="nav-mobile" class="right side-nav">--> | |
38 | +<!--<li><a href="#intro">Service</a></li>--> | |
39 | +<!--<li><a href="#work">Work</a></li>--> | |
40 | +<!--<li><a href="#team">Team</a></li>--> | |
41 | +<!--<li><a href="#contact">Contact</a></li>--> | |
42 | +<!--<li><a href="" target="_blank">Download</a></li>--> | |
43 | +<!--</ul><a href="#" data-activates="nav-mobile" class="button-collapse"><i class="mdi-navigation-menu"></i></a>--> | |
44 | +<!--</div>--> | |
45 | +<!--</div>--> | |
46 | +<!--</nav>--> | |
47 | +<!--</div>--> | |
47 | 48 | |
48 | 49 | <!--Hero--> |
49 | 50 | <div class="section no-pad-bot" id="index-banner"> |
50 | 51 | |
... | ... | @@ -53,11 +54,13 @@ |
53 | 54 | <span>.cards</span> |
54 | 55 | </h1> |
55 | 56 | <br> |
57 | + | |
56 | 58 | <div class="center"> |
57 | 59 | <a href="/app/" class="waves-effect waves-light btn red lighten-2">Check out the app</a> |
58 | 60 | </div> |
59 | 61 | <br><br> |
60 | 62 | <br><br><br> |
63 | + | |
61 | 64 | <div class="center"> |
62 | 65 | <a href="#intro" class="btn btn-large btn-floating page-scroll"> |
63 | 66 | <i class="fa fa-angle-double-down"></i> |
64 | 67 | |
65 | 68 | |
66 | 69 | |
67 | 70 | |
... | ... | @@ -70,29 +73,40 @@ |
70 | 73 | <div id="intro" class="section scrollspy"> |
71 | 74 | <div class="container"> |
72 | 75 | <div class="row"> |
73 | - <div class="col s12"> | |
74 | - <h2 class="center header text_h2"><span class="span_h2"> Collaborate </span> with your classmates in <span class="span_h2"> realtime </span> and never forget a thing again!</h2> | |
76 | + <div class="col s12"> | |
77 | + <h2 class="center header text_h2"><span class="span_h2"> Collaborate </span> with your classmates in | |
78 | + <span class="span_h2"> real time </span> and never forget a thing again!</h2> | |
75 | 79 | </div> |
76 | 80 | |
77 | - <div class="col s12 m4 l4"> | |
81 | + <div class="col s12 m4 l4"> | |
78 | 82 | <div class="center promo promo-example"> |
79 | 83 | <i class="mdi-image-flash-on"></i> |
80 | 84 | <h5 class="promo-caption">Make flashcards in no time!</h5> |
81 | - <p class="light center">Our slick UI makes sure to not get in your way and let you focus on the actual content.</p> | |
85 | + | |
86 | + <p class="light center">Our slick UI makes sure to not get in your way and let you focus on the | |
87 | + actual content.</p> | |
82 | 88 | </div> |
83 | 89 | </div> |
84 | 90 | <div class="col s12 m4 l4"> |
85 | 91 | <div class="center promo promo-example"> |
86 | 92 | <i class="mdi-hardware-desktop-windows"></i> |
87 | 93 | <h5 class="promo-caption">Fully Responsive</h5> |
88 | - <p class="light center">Use Flashy on both your phone and your desktop computer! Flashy uses cutting-edge notification technology. It takes just one click to enable notifications and always be reminded when you need to review your cards. Works best with the latest version of Chrome.</p> | |
94 | + | |
95 | + <p class="light center"> | |
96 | + Use Flashy on both your phone and your desktop computer! | |
97 | + Plus, if you use Chrome on Android, you can opt in to be reminded when a batch of cards is up | |
98 | + for review! | |
99 | + </p> | |
89 | 100 | </div> |
90 | 101 | </div> |
91 | 102 | <div class="col s12 m4 l4"> |
92 | 103 | <div class="center promo promo-example"> |
93 | 104 | <i class="mdi-social-group"></i> |
94 | 105 | <h5 class="promo-caption">Crowdsource the hardwork</h5> |
95 | - <p class="light center">Distribute the arduous task of note-taking among the entire class. Publish cards for your classmates to review and view cards posted by your classmates. Working together has never been easier!</p> | |
106 | + | |
107 | + <p class="light center">Distribute the arduous task of note-taking among the entire class. Publish | |
108 | + cards for your classmates to review, or pull cards posted by your classmates into your deck. | |
109 | + Working together has never been easier!</p> | |
96 | 110 | </div> |
97 | 111 | </div> |
98 | 112 | </div> |
99 | 113 | |
... | ... | @@ -105,14 +119,15 @@ |
105 | 119 | </div> |
106 | 120 | |
107 | 121 | <!--Parallax--> |
108 | -<div class="parallax-container"> | |
109 | - <div class="parallax"><img src="img/parallax1.png"></div> | |
110 | -</div> | |
122 | +<!--<div class="parallax-container">--> | |
123 | + <!--<div class="parallax"><img src="img/parallax1.png"></div>--> | |
124 | +<!--</div>--> | |
111 | 125 | |
112 | 126 | <!--Team--> |
113 | 127 | <div class="section scrollspy" id="team"> |
114 | 128 | <div class="container"> |
115 | 129 | <h2 class="header text_b"> Our Team </h2> |
130 | + | |
116 | 131 | <div class="row"> |
117 | 132 | <div class="col s12 m3"> |
118 | 133 | <div class="card card-avatar"> |
... | ... | @@ -132,7 +147,7 @@ |
132 | 147 | </div> |
133 | 148 | <div class="card-content"> |
134 | 149 | <span class="card-title activator grey-text text-darken-4">Andrew<br/> |
135 | - <small><em><a class="red-text text-darken-1" href="#">Database Specialist</a></em></small> | |
150 | + <small><em><a class="red-text text-darken-1" href="#">DB Specialist</a></em></small> | |
136 | 151 | </span> |
137 | 152 | </div> |
138 | 153 | </div> |
... | ... | @@ -145,7 +160,8 @@ |
145 | 160 | <div class="card-content"> |
146 | 161 | <span class="card-title activator grey-text text-darken-4"> |
147 | 162 | Laura<br/> |
148 | - <small><em><a class="red-text text-darken-1" href="#">Project Manager</a></em></small></span> | |
163 | + <small><em><a class="red-text text-darken-1" href="#">Project Manager</a></em> | |
164 | + </small></span> | |
149 | 165 | </div> |
150 | 166 | </div> |
151 | 167 | </div> |
... | ... | @@ -157,7 +173,8 @@ |
157 | 173 | <div class="card-content"> |
158 | 174 | <span class="card-title activator grey-text text-darken-4"> |
159 | 175 | Rachel<br/> |
160 | - <small><em><a class="red-text text-darken-1" href="#">Software Dev Lead</a></em></small></span> | |
176 | + <small><em><a class="red-text text-darken-1" href="#">Software Dev Lead</a></em> | |
177 | + </small></span> | |
161 | 178 | </div> |
162 | 179 | </div> |
163 | 180 | </div> |
... | ... | @@ -194,7 +211,8 @@ |
194 | 211 | <div class="card-content"> |
195 | 212 | <span class="card-title activator grey-text text-darken-4"> |
196 | 213 | Kent<br/> |
197 | - <small><em><a class="red-text text-darken-1" href="#">Business Analyst</a></em></small></span> | |
214 | + <small><em><a class="red-text text-darken-1" href="#">Business Analyst</a></em> | |
215 | + </small></span> | |
198 | 216 | </div> |
199 | 217 | </div> |
200 | 218 | </div> |
... | ... | @@ -274,7 +292,8 @@ |
274 | 292 | <div class="col l6 s12"> |
275 | 293 | <div class="footer-copyright default_color"> |
276 | 294 | <div class="container"> |
277 | - Flashy was made possible by <a class="white-text gary" href="https://media.licdn.com/mpr/mpr/shrink_200_200/p/2/000/0db/205/1492be8.jpg">gary</a> | |
295 | + Flashy was made possible by <a class="white-text gary" | |
296 | + href="https://media.licdn.com/mpr/mpr/shrink_200_200/p/2/000/0db/205/1492be8.jpg">gary</a> | |
278 | 297 | </div> |
279 | 298 | </div> |
280 | 299 | </div> |
281 | 300 | |
... | ... | @@ -283,14 +302,13 @@ |
283 | 302 | </footer> |
284 | 303 | |
285 | 304 | |
286 | - <!-- Scripts--> | |
287 | - <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script> | |
288 | - <script src="https://iamsaravieira.com/jquery.textillate.js"></script> | |
289 | - <!-- Plugin JavaScript --> | |
290 | - <script src="js/jquery.easing.min.js"></script> | |
291 | - <script src="js/materialize.js"></script> | |
292 | - <script src="js/smooth.js"></script> | |
305 | +<!-- Scripts--> | |
306 | +<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script> | |
307 | +<!-- Plugin JavaScript --> | |
308 | +<script src="js/jquery.easing.min.js"></script> | |
309 | +<script src="js/materialize.js"></script> | |
310 | +<script src="js/smooth.js"></script> | |
293 | 311 | |
294 | - </body> | |
312 | +</body> | |
295 | 313 | </html> |