Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2eae360
Updates for 2bhackathon 2016
zhouer Aug 1, 2016
b11aa4b
Updates for 2bhachathon 2016
raychangtaiwan Aug 2, 2016
c412779
index.html update
raychangtaiwan Aug 2, 2016
828e4f1
Merge pull request #1 from raychangtaiwan/2bhackathon_index
zhouer Aug 2, 2016
0f15b59
New 2B_Hackathon Website
raychangtaiwan Aug 4, 2016
e9be775
new 2B_Hackathon website
raychangtaiwan Aug 8, 2016
2470b34
modified index/workshop/award/judges/
raychangtaiwan Aug 10, 2016
c542024
modified index.html /.css
raychangtaiwan Aug 10, 2016
a226e72
modified
raychangtaiwan Aug 11, 2016
3caa9f7
modified
raychangtaiwan Aug 11, 2016
4c4844e
modified
raychangtaiwan Aug 12, 2016
0c9a4cd
modified
raychangtaiwan Aug 12, 2016
7a11e58
Modified
raychangtaiwan Aug 13, 2016
fdef0d3
modified
raychangtaiwan Aug 13, 2016
b09c133
modified
raychangtaiwan Aug 13, 2016
80cdddc
modified
raychangtaiwan Aug 14, 2016
d07136e
modified
raychangtaiwan Aug 14, 2016
c8d1703
modified
raychangtaiwan Aug 14, 2016
f519b9d
modified
raychangtaiwan Aug 14, 2016
5fa209c
modified
raychangtaiwan Aug 15, 2016
e7c8587
modified
raychangtaiwan Aug 15, 2016
beb2dbd
modified
raychangtaiwan Aug 15, 2016
b369a5f
modified
raychangtaiwan Aug 15, 2016
88bd3f9
modified
raychangtaiwan Aug 15, 2016
ecbeec5
modified
raychangtaiwan Aug 15, 2016
1965146
modified
raychangtaiwan Aug 16, 2016
d8a4677
modified
raychangtaiwan Aug 17, 2016
60aeea7
modified
raychangtaiwan Aug 17, 2016
7bb0ac1
modified
raychangtaiwan Aug 17, 2016
b07242a
modified
raychangtaiwan Aug 17, 2016
aa74a82
modified
raychangtaiwan Aug 17, 2016
77d940d
modified
raychangtaiwan Aug 17, 2016
5c42bf6
modified
raychangtaiwan Aug 17, 2016
9ce5013
modified
raychangtaiwan Aug 18, 2016
1d6e327
modified
raychangtaiwan Aug 18, 2016
9d8cc72
modified
raychangtaiwan Aug 18, 2016
42a6132
modified
raychangtaiwan Aug 18, 2016
ade2d6d
modified
raychangtaiwan Aug 18, 2016
89f83ee
modified
raychangtaiwan Aug 18, 2016
7a93936
modified
raychangtaiwan Aug 18, 2016
fe98ece
modified
raychangtaiwan Aug 18, 2016
07f352a
modified
raychangtaiwan Aug 19, 2016
be1256e
modified
raychangtaiwan Aug 19, 2016
72646a9
modified
raychangtaiwan Aug 19, 2016
d8b26ae
modified
raychangtaiwan Aug 19, 2016
e3223e4
modified
raychangtaiwan Aug 19, 2016
9c37808
modified
raychangtaiwan Aug 19, 2016
d80a493
modified
raychangtaiwan Aug 19, 2016
fd00f0e
modified
raychangtaiwan Aug 19, 2016
5b897d7
modified
raychangtaiwan Aug 19, 2016
3d5ccf9
modified
raychangtaiwan Aug 19, 2016
b90cf1d
modified
raychangtaiwan Aug 19, 2016
fd35ad9
modified
raychangtaiwan Aug 20, 2016
feaa992
Final version
raychangtaiwan Aug 22, 2016
65b9f25
Final version
raychangtaiwan Aug 24, 2016
0876b9c
modifieid
raychangtaiwan Sep 1, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion org2bhackathon/war/.gitignore

This file was deleted.

22 changes: 22 additions & 0 deletions org2bhackathon/war/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

The MIT License (MIT)

Copyright (c) 2013-2016 Blackrock Digital LLC.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
92 changes: 0 additions & 92 deletions org2bhackathon/war/Makefile

This file was deleted.

27 changes: 27 additions & 0 deletions org2bhackathon/war/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# [Start Bootstrap](http://startbootstrap.com/) - [Stylish Portfolio](http://startbootstrap.com/template-overviews/stylish-portfolio/)

[Stylish Portfolio](http://startbootstrap.com/template-overviews/stylish-portfolio/) is a responsive, one page portfolio theme for [Bootstrap](http://getbootstrap.com/) created by [Start Bootstrap](http://startbootstrap.com/). The theme features multiple content sections with an off canvas navigation menu.

## Getting Started

To begin using this template, choose one of the following options to get started:
* [Download the latest release on Start Bootstrap](http://startbootstrap.com/template-overviews/stylish-portfolio/)
* Clone the repo: `git clone https://github.com/BlackrockDigital/startbootstrap-stylish-portfolio.git`
* Fork the repo

## Bugs and Issues

Have a bug or an issue with this template? [Open a new issue](https://github.com/BlackrockDigital/startbootstrap-stylish-portfolio/issues) here on GitHub or leave a comment on the [template overview page at Start Bootstrap](http://startbootstrap.com/template-overviews/stylish-portfolio/).

## Creator

Start Bootstrap was created by and is maintained by **[David Miller](http://davidmiller.io/)**, Owner of [Blackrock Digital](http://blackrockdigital.io/).

* https://twitter.com/davidmillerskt
* https://github.com/davidtmiller

Start Bootstrap is based on the [Bootstrap](http://getbootstrap.com/) framework created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thorton](https://twitter.com/fat).

## Copyright and License

Copyright 2013-2016 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-stylish-portfolio/blob/gh-pages/LICENSE) license.
1 change: 0 additions & 1 deletion org2bhackathon/war/WEB-INF/.gitignore

This file was deleted.

31 changes: 0 additions & 31 deletions org2bhackathon/war/WEB-INF/appengine-web.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed org2bhackathon/war/WEB-INF/lib/asm-4.0.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed org2bhackathon/war/WEB-INF/lib/jdo-api-3.0.1.jar
Binary file not shown.
Binary file removed org2bhackathon/war/WEB-INF/lib/jsr107cache-1.1.jar
Binary file not shown.
Binary file removed org2bhackathon/war/WEB-INF/lib/jta-1.1.jar
Binary file not shown.
13 changes: 0 additions & 13 deletions org2bhackathon/war/WEB-INF/logging.properties

This file was deleted.

18 changes: 0 additions & 18 deletions org2bhackathon/war/WEB-INF/web.xml

This file was deleted.

58 changes: 58 additions & 0 deletions org2bhackathon/war/css/about.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/* About */

.about1 {
background-color:white;
padding-top: 1.6em;
padding-bottom: 0.5em;
}

.about_1 {
background-size:100%;
}

h2.about_1{
background-image: url(../img/whiteh2_back.png);
float: left;
line-height: 0;
padding-top: 5.86em;
padding-bottom: 5.56em;
margin: 0 auto ;
margin-right: 2em;
width: 11.4em;
text-align: center;
font-size: 1.5em;
color: #d88caa;
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
}

.about2 {
background-color: #d9d9d9;
padding-top: 1.6em;
padding-bottom: 0.5em;
}

.about_2 {
background-size:100%;
}

h2.about_2 {
background-image: url(../img/whiteh2_back.png);
background-size:100%;
float: right;
line-height: 0;
padding-top: 5.86em;
padding-bottom: 5.56em;
margin: 0 auto ;
width: 11.4em;
font-size: 1.5em;
text-align: center;
color: #d88caa;
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
}

h3{
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
display: inline-block;
text-align: left;
}

41 changes: 41 additions & 0 deletions org2bhackathon/war/css/api.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
.api {
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
height: 100vh;
width: 100%;
background-color: white;
color: black;
display: table;
}

.api h2 {
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
width: 100%;
color: black;
margin: 0 auto 0 auto;
padding-top: 5mm;
text-align: center;
border-bottom: 0.05em solid black;
}

.api h1 {
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
text-align: center;
font-size: 2em;
}

.api h3 {
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
text-align: left;
font-size: 1.5em;
}

.api h4 {
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
text-align: center;
float: center;
font-size: 1.3em;
}




47 changes: 47 additions & 0 deletions org2bhackathon/war/css/award.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@

.award{
font-family: Tahoma, Arial, Helvetica, "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", 宋体, SimSun, STXihei, "华文细黑", sans-serif;
height: 100vh;
width: 100%;
background: url(../img/bgimg1.jpg) no-repeat center center;
background-size: cover;
display: table;
}

.award h2 {
color: white;
width: 100%;
margin: 0 auto 0 auto;
padding-top: 5mm;
text-align: center;
border-bottom: 0.05em solid white;
}

.hex {
display: table;
float: center;
padding:0;
margin: 0 auto 0 auto;
}

.hex div {
display: table;
font-size: 3em;
width: 4.166667em;
height: 5em;
margin: 5mm;
background: url(../img/hex.png) no-repeat;
background-size: 100%;
padding-top:18mm;
}

.hex div p {
text-align: center;
font-size: 0.5em;
color: white;
}





Loading