Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 0c00e1c21 -> 82f99e1b9


More word-smithing for hbasecon 2018


Project: http://git-wip-us.apache.org/repos/asf/hbase-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase-site/commit/82f99e1b
Tree: http://git-wip-us.apache.org/repos/asf/hbase-site/tree/82f99e1b
Diff: http://git-wip-us.apache.org/repos/asf/hbase-site/diff/82f99e1b

Branch: refs/heads/asf-site
Commit: 82f99e1b9af2713e38e995db90af05470346f1b9
Parents: 0c00e1c
Author: Josh Elser <els...@apache.org>
Authored: Fri Mar 23 11:32:39 2018 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Fri Mar 23 11:32:39 2018 -0400

----------------------------------------------------------------------
 hbasecon-2018/css/hbasecon.css                  |   3 ++
 hbasecon-2018/feed.xml                          |   4 +-
 hbasecon-2018/img/hbasecon2018.png              | Bin 0 -> 12145 bytes
 .../img/jumping-orca_rotated_12percent.png      | Bin 0 -> 2401 bytes
 hbasecon-2018/index.html                        |  42 ++++++++++++-------
 5 files changed, 33 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/82f99e1b/hbasecon-2018/css/hbasecon.css
----------------------------------------------------------------------
diff --git a/hbasecon-2018/css/hbasecon.css b/hbasecon-2018/css/hbasecon.css
new file mode 100644
index 0000000..1cfff6f
--- /dev/null
+++ b/hbasecon-2018/css/hbasecon.css
@@ -0,0 +1,3 @@
+.navbar-default {
+  background-color: #ba160c;
+}

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/82f99e1b/hbasecon-2018/feed.xml
----------------------------------------------------------------------
diff --git a/hbasecon-2018/feed.xml b/hbasecon-2018/feed.xml
index de189f8..4db31e4 100644
--- a/hbasecon-2018/feed.xml
+++ b/hbasecon-2018/feed.xml
@@ -4,7 +4,7 @@
   <generator uri="https://jekyllrb.com/"; version="3.7.3">Jekyll</generator>
   <link href="https://hbase.apache.org/hbasecon-2018//hbasecon-2018/feed.xml"; 
rel="self" type="application/atom+xml" />
   <link href="https://hbase.apache.org/hbasecon-2018//hbasecon-2018/"; 
rel="alternate" type="text/html" />
-  <updated>2018-03-22T14:26:15-04:00</updated>
+  <updated>2018-03-23T11:32:05-04:00</updated>
   <id>https://hbase.apache.org/hbasecon-2018//hbasecon-2018/</id>
 
   
@@ -12,7 +12,7 @@
   
 
   
-    <subtitle>HBaseCon 2018</subtitle>
+    <subtitle>The Community Event for Apache HBase&amp;trade;</subtitle>
   
 
   

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/82f99e1b/hbasecon-2018/img/hbasecon2018.png
----------------------------------------------------------------------
diff --git a/hbasecon-2018/img/hbasecon2018.png 
b/hbasecon-2018/img/hbasecon2018.png
new file mode 100644
index 0000000..c41fa8f
Binary files /dev/null and b/hbasecon-2018/img/hbasecon2018.png differ

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/82f99e1b/hbasecon-2018/img/jumping-orca_rotated_12percent.png
----------------------------------------------------------------------
diff --git a/hbasecon-2018/img/jumping-orca_rotated_12percent.png 
b/hbasecon-2018/img/jumping-orca_rotated_12percent.png
new file mode 100644
index 0000000..1942f9a
Binary files /dev/null and 
b/hbasecon-2018/img/jumping-orca_rotated_12percent.png differ

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/82f99e1b/hbasecon-2018/index.html
----------------------------------------------------------------------
diff --git a/hbasecon-2018/index.html b/hbasecon-2018/index.html
index 9e41cf2..a286d38 100644
--- a/hbasecon-2018/index.html
+++ b/hbasecon-2018/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>HBaseCon</title>
     <meta name="viewport" content="width=device-width">
-    <meta name="description" content="HBaseCon 2018">
+    <meta name="description" content="The Community Event for Apache 
HBase&trade;">
     <meta name="keywords" content="hbasecon apache hbase" />
     
     <link rel="canonical" href="https://hbase.apache.org/hbasecon-2018//";>
@@ -13,6 +13,8 @@
 
     <!-- Custom CSS & Bootstrap Core CSS - Uses Bootswatch Flatly Theme: 
http://bootswatch.com/flatly/ -->
     <link rel="stylesheet" href="/hbasecon-2018/style.css">
+    <!--HBaseCon css additions-->
+    <link rel="stylesheet" href="/hbasecon-2018/css/hbasecon.css">
 
     <!-- Custom Fonts -->
     <link rel="stylesheet" 
href="/hbasecon-2018/css/font-awesome/css/font-awesome.min.css">
@@ -80,13 +82,13 @@
         <div class="container">
             <div class="row">
                 <div class="col-lg-12">
-                    <img class="img-responsive" src="img/hbase.png" alt="">
+                    <img class="img-responsive" src="img/hbasecon2018.png" 
alt="">
                 </div>
             </div>
             <div class="row">
                 <div class="col-lg-12">
                     <div class="intro-text">
-                        <span class="name">HBaseCon</span>
+                        <span class="name">The Community Event for Apache 
HBase&trade;</span>
                         <span class="skills">June 18th, 2018 - Joseph McEnery 
Convention Center, San Jose, CA</span>
                     </div>
                 </div>
@@ -98,6 +100,9 @@
      <!-- About Section -->
     <section id="about">
         <div class="container">
+           <div class="pull-right">
+               <img class="img-responsive" 
src="img/jumping-orca_rotated_12percent.png" alt="Apache HBase&trade;" 
style="float='right'">
+           </div>
             <div class="row first-row">
                 <div class="col-lg-12 text-center">
                     <h2>About</h2>
@@ -110,18 +115,15 @@
                      managing the largest deployments in the world). If you 
run Apache HBase in production or aspire to do so, HBaseCon
                      has no substitute!</p>
 
-                    <p>PhoenixCon (founded in 2016) is the leading event 
covering <a href="https://phoenix.apache.org";>Apache Phoenix</a>.
-                    PhoenixCon is the best venue in which to learn something 
new or share real-life stories about Phoenix.</p>
-
-                    <p>2018 is the first year in which both HBaseCon and 
PhoenixCon will be held in the same venue and on the same day.
-                    This is specifically designed to maximize the value that 
attendees will receive from speakers about both HBase
-                    and Phoenix. This event is also scheduled for the same 
week as the DataWorks Summit; attendees are encouraged to consider
-                    attendance to all events!</p>
+                    <p>This year, HBaseCon will take place on the Monday of the
+                    <a 
href="https://dataworkssummit.com/san-jose-2018/";>DataWorks Summit San Jose 
2018</a> at the
+                    <a href="https://www.sanjose.org/convention-center";>San 
Jose Convention Center</a>.
+                    Of note, PhoenixCon will be held in the same venue on the 
same day. We will make it so that attendees will be
+                    able to pass freely between the two events. As the 
DataWorks Summit is happening this same week, attendees
+                    are encouraged to consider attending all events!</p>
 
                     <p><a href="https://hbase.apache.org";>Apache HBase</a> is 
a native distributed data store for the Apache Hadoop
-                     ecosystem. <a href="https://phoenix.apache.org";>Apache 
Phoenix</a> enables OLTP and operational analytics in Hadoop for low
-                    latency applications by combining the power of standard 
SQL and JDBC APIs with the flexibility of late-bound, schema-on-read
-                    capabilities from the HBase world. These two communities 
work independently within the ASF to provide their respective software
+                     ecosystem. Its community works independently within the 
ASF to provide their respective software
                     under the permissive Apache license.</p>
                 </div>
             </div>
@@ -138,7 +140,7 @@
        </div>
        <div class="row">
            <div class="col-lg-12 text-center">
-             <p>The event's call for proposals is available on <a 
href="https://easychair.org/conferences/?conf=hbasecon2018";>EasyChair</a>.
+             <p>The event's call for proposals is available at <a 
href="https://easychair.org/conferences/?conf=hbasecon2018";>EasyChair for 
HBaseCon2018</a>.
              The CFP will be open until 2018/04/16. Please submit your talks 
as soon as possible!</p>
              <p>All submissions will be reviewed by a group of individuals 
from the Apache HBase PMC.</p>
            </div>
@@ -149,6 +151,9 @@
     <!-- Sponsors Section -->
 <section id="sponsors">
    <div class="container">
+           <div class="pull-right">
+               <img class="img-responsive" 
src="img/jumping-orca_rotated_12percent.png" alt="Apache HBase&trade;" 
style="float='right'">
+           </div>
        <div class="row first-row">
            <div class="col-lg-12 text-center">
                <h2>Registration</h2>
@@ -199,6 +204,9 @@
     <!-- Archives Section -->
 <section id="archives">
    <div class="container">
+           <div class="pull-right">
+               <img class="img-responsive" 
src="img/jumping-orca_rotated_12percent.png" alt="Apache HBase&trade;" 
style="float='right'">
+           </div>
        <div class="row first-row">
            <div class="col-lg-12 text-center">
                <h2>Archives</h2>
@@ -232,6 +240,9 @@
 <section id="conduct">
    <div class="container">
        <div class="row first-row">
+           <div class="pull-right">
+               <img class="img-responsive" 
src="img/jumping-orca_rotated_12percent.png" alt="Apache HBase&trade;" 
style="float='right'">
+           </div>
            <div class="col-lg-12 text-center">
                <h2>Code of Conduct</h2>
            </div>
@@ -274,6 +285,9 @@
                 <div class="col-lg-12">
                     Copyright &copy; 2018 Apache Software Foundation
                 </div>
+                <div class="col-lg-12">
+                    Apache Hadoop, Apache HBase, Apache Phoenix, Hadoop, 
HBase, Phoenix and Apache are trademarks of the Apache Software Foundation and 
are used with permission. All other trademarks and registered trademarks are 
the property of their respective owners.
+                </div>
             </div>
             <div class="row">
                 <div class="col-lg-12">

Reply via email to