openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsandt...@apache.org
Subject svn commit: r1698159 - in /openwebbeans/cms-site/trunk: content/index.html content/resources/css/main.css templates/footer.html templates/header.html
Date Thu, 27 Aug 2015 14:08:34 GMT
Author: rsandtner
Date: Thu Aug 27 14:08:34 2015
New Revision: 1698159

URL: http://svn.apache.org/r1698159
Log:
OWB-1091 fixed layout with new bootstrap version

Modified:
    openwebbeans/cms-site/trunk/content/index.html
    openwebbeans/cms-site/trunk/content/resources/css/main.css
    openwebbeans/cms-site/trunk/templates/footer.html
    openwebbeans/cms-site/trunk/templates/header.html

Modified: openwebbeans/cms-site/trunk/content/index.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/index.html?rev=1698159&r1=1698158&r2=1698159&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/content/index.html (original)
+++ openwebbeans/cms-site/trunk/content/index.html Thu Aug 27 14:08:34 2015
@@ -4,12 +4,12 @@
 {% block title %}Apache Openwebbeans{% endblock %}
 {% block content %}
 <!-- Main hero unit for a primary marketing message or call to action -->
-<div class="hero-unit">
+<div class="jumbotron">
     <div class="row">
-        <div class="span2">
+        <div class="col-md-2 col-lg-2 col-sm-2 col-xs-2">
             <img src="resources/images/logo.png" alt="owb_logo"/>
         </div>
-        <div class="span8">
+        <div class="col-md-10 col-lg-10 col-sm-10 col-xs-10">
             <p>
                 Apache OpenWebBeans delivers an implementation of the
                 <a href="http://jcp.org/en/jsr/detail?id=346">Contexts and Dependency
injection for Java EE</a> (CDI) 1.2 Specification (JSR346).<br/>
@@ -31,27 +31,27 @@
 
 <!-- Example row of columns -->
 <div class="row">
-    <div class="span6">
+    <div class="col-md-6">
         <h2>Getting Started</h2>
         <p>OpenWebBeans is packaged as modules which get activated by simply dropping
them into the classpath. The below link will take you to a step-by-step guide and get you
started in no time!<p>
-        <p><a class="btn" href="documentation.html#module-overview">View details
»</a></p>
+        <p><a class="btn btn-default" href="documentation.html#module-overview">View
details »</a></p>
     </div>
-    <div class="span6">
+    <div class="col-md-6">
         <h2>Examples</h2>
         <p>See the following examples which are part of the project to discover how
to use OpenwebBeans.</p>
-        <p><a class="btn" href="examples.html#">View details »</a></p>
+        <p><a class="btn btn-default" href="examples.html#">View details »</a></p>
     </div>
 </div>
 
 <div class="row">
-    <div class="span12">
+    <div class="col-md-12">
         <hr>
         <h2>Latest News</h2>
     </div>
 </div>
 <div class="row">
         {% for e in blog.list %}
-        <div class="span4">
+        <div class="col-md-4">
         <h4><a href="{{ e.url }}">{{ e.title }}</a></h4>
             {{ e.content|safe|truncatewords_html:40 }}
         </div>

Modified: openwebbeans/cms-site/trunk/content/resources/css/main.css
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/resources/css/main.css?rev=1698159&r1=1698158&r2=1698159&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/content/resources/css/main.css (original)
+++ openwebbeans/cms-site/trunk/content/resources/css/main.css Thu Aug 27 14:08:34 2015
@@ -37,4 +37,29 @@ blockquote p {
 h3, h4 {
     padding-top: 45px;
     margin-top: -45px;
+}
+
+.navbar-search {
+    padding: 15px 15px;
+}
+
+.navbar-nav > li > .dropdown-menu:after {
+    border-bottom: 6px solid #ffffff;
+    border-left: 6px solid transparent;
+    border-right: 6px solid transparent;
+    content: '';
+    display: inline-block;
+    left: 15px;
+    position: absolute;
+    top: -6px;
+}
+
+img {
+    max-width: 100%;
+}
+
+h1,
+h2,
+h3 {
+    color: #4386BA;
 }
\ No newline at end of file

Modified: openwebbeans/cms-site/trunk/templates/footer.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/templates/footer.html?rev=1698159&r1=1698158&r2=1698159&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/templates/footer.html (original)
+++ openwebbeans/cms-site/trunk/templates/footer.html Thu Aug 27 14:08:34 2015
@@ -1,8 +1,8 @@
         <hr>
 
-        <footer>
+        <footer class="text-center">
             <p>
-                <a class="brand" href="http://www.apache.org"><img src="http://www.apache.org/images/asf_logo_wide.png"
height="55px" alt="asf_feather"/></a>
+                <a href="http://www.apache.org"><img class="img-responsive center-block"
src="http://www.apache.org/images/asf_logo_wide.png" height="55px" alt="asf_feather"/></a>
             </p>
             <p>Copyright &copy; 2008-2013 The Apache Software Foundation, Licensed
under the Apache License, Version 2.0.</p>
             <p>OpenWebBeans, Apache and the Apache feather logo are trademarks of The
Apache Software Foundation.</p>
@@ -13,8 +13,8 @@
     <!-- Javascript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="{{base}}/resources/js/jquery-2.1.4.min.js"></script>
-    <script src="{{base}}/resources/js/bootstrap.js"></script>
+    <script src="{{base}}resources/js/jquery-2.1.4.min.js"></script>
+    <script src="{{base}}resources/js/bootstrap.js"></script>
 
 </body></html>
 

Modified: openwebbeans/cms-site/trunk/templates/header.html
URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/templates/header.html?rev=1698159&r1=1698158&r2=1698159&view=diff
==============================================================================
--- openwebbeans/cms-site/trunk/templates/header.html (original)
+++ openwebbeans/cms-site/trunk/templates/header.html Thu Aug 27 14:08:34 2015
@@ -22,51 +22,46 @@
 
 <body>
 
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container">
+<nav class="navbar navbar-default navbar-inverse navbar-fixed-top" role="navigation">
+    <div class="container">
+        <div class="navbar-header">
             <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="index.html"><img src="{{base}}resources/images/logo_dbg-small.png"
height="25px"
-                                                    alt="owb_logo_small"/></a>
+            <a class="navbar-brand" href="index.html"><img src="{{base}}resources/images/logo_dbg-small.png"
height="25px"
+                                                           alt="owb_logo_small"/></a>
+        </div>
 
-            <div class="nav-collapse">
-                <ul class="nav">
-                    <li class="active"><a href="{{base}}index.html">Home</a></li>
-                    <li><a href="{{base}}documentation.html">Documentation</a></li>
-                    <li><a href="{{base}}source.html">Source</a></li>
-                    <li><a href="{{base}}download.html">Download</a></li>
-                    <li><a href="{{base}}community.html">Community</a></li>
-                    <!-- <li><a href="{{base}}news.html">News</a></li>
-->
-                    <li class="dropdown">
-                        <a class="dropdown-toggle"
-                           data-toggle="dropdown"
-                           href="#">
-                            Misc
-                            <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu">
-                            <li><a href="http://www.apache.org">Apache Home</a></li>
-                            <li><a href="{{base}}misc/contact.html">Contact</a></li>
-                            <li><a href="{{base}}misc/legal.html">Legal</a></li>
-                            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-                            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-                            <!-- <li class="divider"/> -->
-                        </ul>
-                    </li>
-                </ul>
-            </div>
+        <div class="collapse navbar-collapse">
+            <ul class="nav navbar-nav">
+                <li><a href="{{base}}index.html">Home</a></li>
+                <li><a href="{{base}}documentation.html">Documentation</a></li>
+                <li><a href="{{base}}source.html">Source</a></li>
+                <li><a href="{{base}}download.html">Download</a></li>
+                <li><a href="{{base}}community.html">Community</a></li>
+                <!-- <li><a href="{{base}}news.html">News</a></li>
-->
+                <li class="dropdown">
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="#" aria-haspopup="true">Misc<span
class="caret"></span></a>
+                    <ul class="dropdown-menu">
+                        <li><a href="http://www.apache.org">Apache Home</a></li>
+                        <li><a href="{{base}}misc/contact.html">Contact</a></li>
+                        <li><a href="{{base}}misc/legal.html">Legal</a></li>
+                        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                        <!-- <li class="divider"/> -->
+                    </ul>
+                </li>
+            </ul>
             <!--/.nav-collapse -->
             <form id="search-form" action="http://www.google.com/search" method="get"
class="navbar-search pull-right">
                 <input value="openwebbeans.apache.org" name="sitesearch" type="hidden"/>
-                <input class="search-query" name="q" id="query" type="text"/>
+                <input class="search-query" name="q" id="query" type="search"/>
             </form>
             <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=search-form"></script>
         </div>
     </div>
-</div>
+</nav>
 
 <div class="container">



Mime
View raw message