Compare View

switch
from
...
to
 
Commits (2)

Diff

Showing 3 changed files Side-by-side Diff

1   -*~
2 1 \ No newline at end of file
  2 +*~
  3 +.idea*
css/style.css View file @ 0f8019a
... ... @@ -254,6 +254,10 @@ nav a.button-collapse {
254 254 margin: 15px 0px;
255 255 }
256 256  
  257 +.card-avatar a {
  258 + margin-right:0;
  259 +}
  260 +
257 261 .card-avatar .card-content i {
258 262 font-size: 1.5rem;
259 263 }
... ... @@ -9,34 +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   - </div>
37   - </div>
38   - </nav>
39   -</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>-->
40 48  
41 49 <!--Hero-->
42 50 <div class="section no-pad-bot" id="index-banner">
... ... @@ -46,11 +54,13 @@
46 54 <span>.cards</span>
47 55 </h1>
48 56 <br>
  57 +
49 58 <div class="center">
50 59 <a href="/app/" class="waves-effect waves-light btn red lighten-2">Check out the app</a>
51 60 </div>
52 61 <br><br>
53 62 <br><br><br>
  63 +
54 64 <div class="center">
55 65 <a href="#intro" class="btn btn-large btn-floating page-scroll">
56 66 <i class="fa fa-angle-double-down"></i>
... ... @@ -63,29 +73,40 @@
63 73 <div id="intro" class="section scrollspy">
64 74 <div class="container">
65 75 <div class="row">
66   - <div class="col s12">
67   - <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>
68 79 </div>
69 80  
70   - <div class="col s12 m4 l4">
  81 + <div class="col s12 m4 l4">
71 82 <div class="center promo promo-example">
72 83 <i class="mdi-image-flash-on"></i>
73 84 <h5 class="promo-caption">Make flashcards in no time!</h5>
74   - <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>
75 88 </div>
76 89 </div>
77 90 <div class="col s12 m4 l4">
78 91 <div class="center promo promo-example">
79 92 <i class="mdi-hardware-desktop-windows"></i>
80 93 <h5 class="promo-caption">Fully Responsive</h5>
81   - <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>
82 100 </div>
83 101 </div>
84 102 <div class="col s12 m4 l4">
85 103 <div class="center promo promo-example">
86 104 <i class="mdi-social-group"></i>
87 105 <h5 class="promo-caption">Crowdsource the hardwork</h5>
88   - <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>
89 110 </div>
90 111 </div>
91 112 </div>
... ... @@ -98,14 +119,15 @@
98 119 </div>
99 120  
100 121 <!--Parallax-->
101   -<div class="parallax-container">
102   - <div class="parallax"><img src="img/parallax.jpg"></div>
103   -</div>
  122 +<!--<div class="parallax-container">-->
  123 + <!--<div class="parallax"><img src="img/parallax1.png"></div>-->
  124 +<!--</div>-->
104 125  
105 126 <!--Team-->
106 127 <div class="section scrollspy" id="team">
107 128 <div class="container">
108 129 <h2 class="header text_b"> Our Team </h2>
  130 +
109 131 <div class="row">
110 132 <div class="col s12 m3">
111 133 <div class="card card-avatar">
... ... @@ -125,7 +147,7 @@
125 147 </div>
126 148 <div class="card-content">
127 149 <span class="card-title activator grey-text text-darken-4">Andrew<br/>
128   - <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>
129 151 </span>
130 152 </div>
131 153 </div>
... ... @@ -138,7 +160,8 @@
138 160 <div class="card-content">
139 161 <span class="card-title activator grey-text text-darken-4">
140 162 Laura<br/>
141   - <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>
142 165 </div>
143 166 </div>
144 167 </div>
... ... @@ -150,7 +173,8 @@
150 173 <div class="card-content">
151 174 <span class="card-title activator grey-text text-darken-4">
152 175 Rachel<br/>
153   - <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>
154 178 </div>
155 179 </div>
156 180 </div>
... ... @@ -187,7 +211,8 @@
187 211 <div class="card-content">
188 212 <span class="card-title activator grey-text text-darken-4">
189 213 Kent<br/>
190   - <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>
191 216 </div>
192 217 </div>
193 218 </div>
... ... @@ -267,7 +292,8 @@
267 292 <div class="col l6 s12">
268 293 <div class="footer-copyright default_color">
269 294 <div class="container">
270   - 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>
271 297 </div>
272 298 </div>
273 299 </div>
... ... @@ -276,13 +302,12 @@
276 302 </footer>
277 303  
278 304  
279   - <!-- Scripts-->
280   - <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
281   - <script src="https://iamsaravieira.com/jquery.textillate.js"></script>
282   - <!-- Plugin JavaScript -->
283   - <script src="js/jquery.easing.min.js"></script>
284   - <script src="js/materialize.js"></script>
285   - <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>
286 311  
287   - </body>
288   -</html>
289 312 \ No newline at end of file
  313 +</body>
  314 +</html>