Skip to content

Commit

Permalink
Update showcase from master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dogfalo committed Sep 28, 2015
1 parent 37c9d79 commit 6768d52
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ bin/jquery-2.1.1.min.js
/.idea/
**/*.log
bower_components
.projectile
9 changes: 4 additions & 5 deletions bin/materialize.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -127,23 +127,23 @@ <h2 class="col s12 header">Download</h2>
<div class="col s12 m6">
<p class="promo-caption">Materialize</p>
<p>This is the standard version that comes with both the minified and unminified CSS and JavaScript files. This option requires little to no setup. Use this if you are unfamiliar with Sass.</p>
<a id="download-source" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-v0.97.0.zip">Materialize<i class="material-icons right">file_download</i></a>
<a id="download-source" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-v0.97.1.zip">Materialize<i class="material-icons right">file_download</i></a>
</div>
<div class="col s12 m6">
<p class="promo-caption">Sass</p>
<p>This version contains the source SCSS files. By choosing this version you have more control over which components to include. You will need a Sass compiler if you choose this option.</p>
<a id="download-sass" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-src-v0.97.0.zip">Source<i class="material-icons right">file_download</i></a>
<a id="download-sass" class="btn waves-effect waves-light" href="http://materializecss.com/bin/materialize-src-v0.97.1.zip">Source<i class="material-icons right">file_download</i></a>
</div>
<div class="col s12">
<br>
<p class="promo-caption">CDN</p>
<p>You can find all the versions of the CDN at <a href="https://cdnjs.com/libraries/materialize">cdnjs</a>.</p>
<pre><code class="language-markup">
&lt;!-- Compiled and minified CSS -->
&lt;link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/css/materialize.min.css">
&lt;link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.1/css/materialize.min.css">

&lt;!-- Compiled and minified JavaScript -->
&lt;script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/js/materialize.min.js">&lt;/script>
&lt;script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.1/js/materialize.min.js">&lt;/script>
</code></pre>
</div>
<div class="col s12">
Expand Down
Binary file added images/showcase/eadbox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/showcase/visitsarasota.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h4 class ="header col s12 light center">A modern responsive front-end framework
<div class="row center">
<a href="http://materializecss.com/getting-started.html" id="download-button" class="btn-large waves-effect waves-light">Get Started</a>
</div>
<div class="row center"><a class="red-text text-lighten-4" href="https://github.com/Dogfalo/materialize">alpha release v0.97.0</a></div>
<div class="row center"><a class="red-text text-lighten-4" href="https://github.com/Dogfalo/materialize">alpha release v0.97.1</a></div>

<div class="buysellads-header row center">
<!-- CarbonAds Zone Code -->
Expand Down

0 comments on commit 6768d52

Please sign in to comment.