Summary Files Commits Branches @commit @diff @stats
path: root / demo
diff options
context:
space:
mode:
Commitd01d23d1a60807fb5453c4a250a6544652436f60 (patch)
Author
 Yan Zhu <picturepan2@hotmail.com>
2016-04-06 14:20:32 +0800
Committer
 Yan Zhu <picturepan2@hotmail.com>
2016-04-06 14:20:32 +0800
Filesf5d2e6483a993c4636c8b8e17a7ae0e38e317dd3 /demo
Spectre-Dark-Gruvbox-d01d23d1a60807fb5453c4a250a6544652436f60.tar
Spectre-Dark-Gruvbox-d01d23d1a60807fb5453c4a250a6544652436f60.tar.gz
Spectre-Dark-Gruvbox-d01d23d1a60807fb5453c4a250a6544652436f60.zip
Parentcc2c46c583451fef05a262cd63d023399ed3cbb7 (diff)
add cards code and update new demo images
6 files changed, 65 insertions, 4 deletions
-rw-r--r--demo/img/apple-el-capitan.jpgbin347819 -> 0 bytes
-rw-r--r--demo/img/osx-el-capitan-2.jpgbin0 -> 122992 bytes
-rw-r--r--demo/img/osx-el-capitan.jpgbin0 -> 148156 bytes
-rw-r--r--demo/img/osx-yosemite-2.jpgbin0 -> 145142 bytes
-rw-r--r--demo/img/osx-yosemite.jpgbin0 -> 142436 bytes
-rw-r--r--demo/index.html69
diff --git a/demo/img/apple-el-capitan.jpg b/demo/img/apple-el-capitan.jpg
deleted file mode 100644
index f469599..0000000
--- a/demo/img/apple-el-capitan.jpg
+++ /dev/null
Binary files differ
diff --git a/demo/img/osx-el-capitan-2.jpg b/demo/img/osx-el-capitan-2.jpg
new file mode 100644
index 0000000..6e56bff
--- /dev/null
+++ b/demo/img/osx-el-capitan-2.jpg
Binary files differ
diff --git a/demo/img/osx-el-capitan.jpg b/demo/img/osx-el-capitan.jpg
new file mode 100644
index 0000000..7337afb
--- /dev/null
+++ b/demo/img/osx-el-capitan.jpg
Binary files differ
diff --git a/demo/img/osx-yosemite-2.jpg b/demo/img/osx-yosemite-2.jpg
new file mode 100644
index 0000000..0b5befa
--- /dev/null
+++ b/demo/img/osx-yosemite-2.jpg
Binary files differ
diff --git a/demo/img/osx-yosemite.jpg b/demo/img/osx-yosemite.jpg
new file mode 100644
index 0000000..80b1cb1
--- /dev/null
+++ b/demo/img/osx-yosemite.jpg
Binary files differ
diff --git a/demo/index.html b/demo/index.html
index 54801fe..767a41a 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -243,7 +243,7 @@
</div>
</div>
<div class="column">
- <div class="btn-group">
+ <div class="btn-group btn-group-block">
<button class="btn btn-primary">first button</button>
<button class="btn btn-primary">second button</button>
<button class="btn btn-primary">third button</button>
@@ -400,7 +400,10 @@
<header class="text-center"><h4>media</h4></header>
<div class="columns">
<div class="column col-6">
- <img src="img/apple-el-capitan.jpg" class="img-responsive rounded" />
+ <img src="img/osx-el-capitan.jpg" class="img-responsive rounded" />
+ </div>
+ <div class="column col-6">
+ <img src="img/osx-el-capitan-2.jpg" class="img-responsive rounded" />
</div>
</div>
</section>
@@ -800,20 +803,21 @@
<p>
This is the content inside the modal.
</p>
- <h3>Lorem ipsum</h3>
+ <h4>Lorem ipsum</h4>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent risus leo, dictum in vehicula sit amet, feugiat tempus tellus. Duis quis sodales risus. Etiam euismod ornare consequat.
</p>
<p>
Climb leg rub face on everything give attitude nap all day for under the bed. Chase mice attack feet but rub face on everything hopped up on goofballs.
</p>
- <h3>Cupcake ipsum</h3>
+ <h4>Cupcake ipsum</h4>
<p>
Jelly-o sesame snaps halvah croissant oat cake cookie. Cheesecake bear claw topping. Chupa chups apple pie carrot cake chocolate cake caramels.
</p>
<p>
De braaaiiiins apocalypsi gorger omero prefrontal cortex undead survivor fornix dictum mauris. Hi brains mindless mortuis limbic cortex soulless creaturas optic nerve.
</p>
+ <h4>Candy ipsum</h4>
<p>
Efficiently unleash cross-media information without cross-media value. Quickly maximize timely deliverables for real-time schemas. Dramatically maintain clicks-and-mortar.
</p>
@@ -831,6 +835,63 @@
</div>
</div>
</section>
+ <section id="cards">
+ <header class="text-center"><h4>cards</h4></header>
+ <div class="columns">
+ <div class="column col-4">
+ <div class="card">
+ <div class="card-image">
+ <img class="img-responsive" src="img/osx-el-capitan.jpg" />
+ </div>
+ <div class="card-header">
+ <h4 class="card-title">Microsoft</h4>
+ <h6 class="card-meta">Software and hardware</h6>
+ </div>
+ <div class="card-content">
+ Empower every person and every organization on the planet to achieve more.
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-primary">Do</a>
+ </div>
+ </div>
+ </div>
+ <div class="column col-4">
+ <div class="card">
+ <div class="card-header">
+ <h4 class="card-title">Apple</h4>
+ <h6 class="card-meta">Hardware and software</h6>
+ </div>
+ <div class="card-image">
+ <img class="img-responsive" src="img/osx-yosemite.jpg" />
+ </div>
+ <div class="card-content">
+ To make a contribution to the world by making tools for the mind that advance humankind.
+ </div>
+ <div class="card-footer">
+ <div class="btn-group btn-group-block">
+ <button class="btn">Buy</button>
+ <button class="btn">Buy</button>
+ <button class="btn">Buy</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="column col-4">
+ <div class="card">
+ <div class="card-header">
+ <h4 class="card-title">Google</h4>
+ <h6 class="card-meta">Software and hardware</h6>
+ </div>
+ <div class="card-content">
+ Organize the world’s information and make it universally accessible and useful.
+ </div>
+ <div class="card-footer">
+ <a href="#" class="btn btn-primary">Ad</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </section>
</section>
</body>
</html> \ No newline at end of file