Skip to content
Browse files

update with logo and pimp button

  • Loading branch information...
1 parent 6053e36 commit a5b875616cee1e47bbeff2e1240d4af869544154 @jsullivan committed Apr 14, 2012
View
BIN app/assets/.DS_Store
Binary file not shown.
View
BIN app/assets/images/splash.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
29 app/assets/stylesheets/application.css.scss
@@ -13,3 +13,32 @@
*/
@import "bootstrap";
+body {
+ color: #fff;
+ background: #46c7f4;
+ margin-top: 40px;
+}
+img {
+ max-width: 100%;
+}
+
+.btn-large{
+ font-size: 20px;
+ font-weight: normal;
+ padding: 14px 24px;
+ margin-right: 10px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+
+.splash {
+ margin: 0 auto;
+ margin-top: 128px;
+ text-align: center;
+}
+.splash img {
+ margin-bottom: 48px;
+}
+
+@import "bootstrap-responsive";
View
44 app/views/layouts/application.html.erb
@@ -7,8 +7,50 @@
<%= csrf_meta_tags %>
</head>
<body>
+
+ <div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="#">Hiphype</a>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#about">About</a></li>
+ <li><a href="#contact">Contact</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
+ </div>
-<%= yield %>
+ <div class="container">
+ <%= yield %>
+
+ </div>
+
+ <!-- Le javascript
+ ================================================== -->
+ <!-- Placed at the end of the document so the pages load faster -->
+ <script src="../assets/js/jquery.js"></script>
+ <script src="../assets/js/bootstrap-transition.js"></script>
+ <script src="../assets/js/bootstrap-alert.js"></script>
+ <script src="../assets/js/bootstrap-modal.js"></script>
+ <script src="../assets/js/bootstrap-dropdown.js"></script>
+ <script src="../assets/js/bootstrap-scrollspy.js"></script>
+ <script src="../assets/js/bootstrap-tab.js"></script>
+ <script src="../assets/js/bootstrap-tooltip.js"></script>
+ <script src="../assets/js/bootstrap-popover.js"></script>
+ <script src="../assets/js/bootstrap-button.js"></script>
+ <script src="../assets/js/bootstrap-collapse.js"></script>
+ <script src="../assets/js/bootstrap-carousel.js"></script>
+ <script src="../assets/js/bootstrap-typeahead.js"></script>
+
+ </body>
</body>
</html>
View
9 app/views/welcome/index.html.erb
@@ -0,0 +1,9 @@
+<div class="row">
+ <div class="span12">
+ <div class="splash">
+ <%= image_tag 'splash.png' %>
+ <br />
+ <a class="btn btn-large" href="">Pimp your hackathon app</a>
+ </div>
+ </div>
+</div>

0 comments on commit a5b8756

Please sign in to comment.
Something went wrong with that request. Please try again.