You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/09/07 14:08:52 UTC

[1/2] nifi-site git commit: - Tweaking layout of main content.

Repository: nifi-site
Updated Branches:
  refs/heads/master d49988f20 -> 38becf59a


- Tweaking layout of main content.


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/38becf59
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/38becf59
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/38becf59

Branch: refs/heads/master
Commit: 38becf59a10fb1bb3da8b81ea6676ddfb938dbc5
Parents: 53ba718
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Sep 7 10:07:56 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Sep 7 10:08:24 2016 -0400

----------------------------------------------------------------------
 src/pages/html/minifi/index.hbs | 20 ++++++++++++--------
 src/scss/app.scss               |  4 ----
 2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/38becf59/src/pages/html/minifi/index.hbs
----------------------------------------------------------------------
diff --git a/src/pages/html/minifi/index.hbs b/src/pages/html/minifi/index.hbs
index b01734e..354399b 100644
--- a/src/pages/html/minifi/index.hbs
+++ b/src/pages/html/minifi/index.hbs
@@ -4,16 +4,20 @@ title: Apache NiFi - MiNiFi
 
 <!--<div class="large-space"></div>-->
 <div class="row">
-    <img id="minifi-logo" src="{{assets}}/images/minifi/minifi-logo.png" alt="MiNiFi logo">
-    <div class="row">
-        <div class="large-12 columns">
-            <p class="description">
-                A subproject of Apache NiFi to collect data where it originates.
-            </p>
+    <div class="large-12 columns">
+        <div class="row">
+            <div class="large-6 columns">
+                <img id="minifi-logo" src="{{assets}}/images/minifi/minifi-logo.png" alt="MiNiFi logo">
+            </div>
+        </div>
+        <div class="row">
+            <div class="large-12 columns">
+                <p class="description">
+                    A subproject of Apache NiFi to collect data where it originates.
+                </p>
+            </div>
         </div>
     </div>
-    <div class="clear"></div>
-
 </div>
 <div class="large-space"></div>
 <div class="row">

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/38becf59/src/scss/app.scss
----------------------------------------------------------------------
diff --git a/src/scss/app.scss b/src/scss/app.scss
index 07aa047..8a0254e 100644
--- a/src/scss/app.scss
+++ b/src/scss/app.scss
@@ -127,10 +127,6 @@ p.description {
   margin-bottom: 2em;
 }
 
-#minifi-logo {
-  width: 45%;
-}
-
 #flow {
     /*-moz-box-shadow: 0 0 25px #0F3541;
     -webkit-box-shadow: 0 0 25px #0F3541;


[2/2] nifi-site git commit: NIFI-2706 new updates to MiNiFi section of site - topbar logo, home page layout, and minor text changes

Posted by mc...@apache.org.
NIFI-2706 new updates to MiNiFi section of site - topbar logo, home page layout, and minor text changes


Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/53ba7185
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/53ba7185
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/53ba7185

Branch: refs/heads/master
Commit: 53ba718585d2cbb9505cc4622c66c3c30b4ed002
Parents: d49988f
Author: Rob Moran <rm...@gmail.com>
Authored: Wed Aug 31 11:02:13 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Sep 7 10:08:24 2016 -0400

----------------------------------------------------------------------
 src/images/minifi-drop-white.svg      | 30 ++++++++++++++++++++++++++++
 src/includes/minifi/minifi-topbar.hbs |  2 +-
 src/pages/html/minifi/index.hbs       | 32 ++++++++----------------------
 src/scss/app.scss                     |  4 ++++
 4 files changed, 43 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-site/blob/53ba7185/src/images/minifi-drop-white.svg
----------------------------------------------------------------------
diff --git a/src/images/minifi-drop-white.svg b/src/images/minifi-drop-white.svg
new file mode 100644
index 0000000..513526e
--- /dev/null
+++ b/src/images/minifi-drop-white.svg
@@ -0,0 +1,30 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="804 -842.867 102.5 98.986">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+    </style>
+  </defs>
+  <g id="group-18" transform="translate(803.995 -842.767)">
+    <g id="group" transform="translate(8.206 -0.1)">
+      <path id="path" class="cls-1" d="M4.472,65.63c-.657-9.86,3.287-19.062,8.545-27.278s11.5-15.775,17.09-23.991c2.3-3.615,4.6-7.23,6.9-11.174a140.539,140.539,0,0,0,8.545,13.8c3.944,5.587,8.216,10.845,12.16,16.433a105.4,105.4,0,0,1,6.244,10.188l.986-1.972A122.4,122.4,0,0,0,50.812,21.591,114.224,114.224,0,0,1,38.98,3.515C38.323,2.2,37.666,1.215,37.008-.1,33.722,6.8,29.121,13.375,24.52,19.619,17.947,28.164,11.374,36.709,6.772,46.24A41.227,41.227,0,0,0,2.5,63.658,2.963,2.963,0,0,0,4.472,65.63C4.472,64.973,3.815,65.3,4.472,65.63Z" transform="translate(-2.5 0.1)"/>
+      <path id="path-2" data-name="path" class="cls-1" d="M36.222,44.648A32.763,32.763,0,0,1,5.658,22.957c-.986,0-1.972-.329-2.958-.329A35.1,35.1,0,0,0,26.034,46.291,34.34,34.34,0,0,0,58.9,38.733,33.234,33.234,0,0,0,69.087,22.3c-.986.657-2.3,1.315-3.287,1.972A31.4,31.4,0,0,1,36.222,44.648Z" transform="translate(-2.043 51.318)"/>
+    </g>
+    <path id="path-3" data-name="path" class="cls-1" d="M27.957,14.372A4.671,4.671,0,0,0,27.3,12.4l10.188-2.3a18.345,18.345,0,0,1,1.643,2.629Z" transform="translate(62.411 23.322)"/>
+    <path id="path-4" data-name="path" class="cls-1" d="M24.9,28.69c5.587-5.587,8.545-10.517,8.545-15.447L45.276,11.6c1.315,5.916-1.643,12.489-8.545,19.719Z" transform="translate(56.924 26.752)"/>
+    <path id="path-5" data-name="path" class="cls-1" d="M18.7,29.131a70.241,70.241,0,0,0,9.86-5.587A96.209,96.209,0,0,0,37.1,17.3l11.831,2.629A80.442,80.442,0,0,1,39.4,27.488,114.276,114.276,0,0,1,25.273,35.7Z" transform="translate(42.747 39.785)"/>
+    <path id="path-6" data-name="path" class="cls-1" d="M18.7,29.131A80.854,80.854,0,0,0,37.1,17.3l11.831,2.629C43.02,25.516,35.461,30.775,25.273,35.7Z" transform="translate(42.747 39.785)"/>
+    <path id="path-7" data-name="path" class="cls-1" d="M9.829,23.543A57.241,57.241,0,0,0,17.06,21.9l-.329,5.258A54.756,54.756,0,0,1,7.2,29.13Z" transform="translate(16.452 50.303)"/>
+    <path id="path-8" data-name="path" class="cls-1" d="M11.457,29.7c9.86-2.958,18.733-6.573,26.621-11.5l5.587,2.629c-7.23,4.6-15.775,8.216-25.635,11.831a61.329,61.329,0,0,1-7.23,2.3Z" transform="translate(24.684 41.843)"/>
+    <path id="path-9" data-name="path" class="cls-1" d="M23.4,16.329c.657-.657.986-1.643,1.643-2.3l8.545-.329c-.657.986-1.315,2.3-1.972,3.287Z" transform="translate(53.494 31.554)"/>
+    <path id="path-10" data-name="path" class="cls-1" d="M19.8,23.745A45.157,45.157,0,0,0,29.988,15.2l8.216.329A60.369,60.369,0,0,1,25.716,26.374Z" transform="translate(45.262 34.984)"/>
+    <path id="path-11" data-name="path" class="cls-1" d="M15.9,22.673A64.035,64.035,0,0,0,26.417,16.1l4.272.986a77.615,77.615,0,0,1-12.817,7.559Z" transform="translate(36.345 37.041)"/>
+    <path id="path-12" data-name="path" class="cls-1" d="M13.5,20.8c1.972-.657,3.944-1.643,5.587-2.3l1.972,1.972c-2.3.986-4.272,1.972-6.9,2.958Z" transform="translate(30.857 42.529)"/>
+    <path id="path-13" data-name="path" class="cls-1" d="M8.3,24.1c6.244-.329,12.817-1.972,20.376-4.6l.986,2.629A93.411,93.411,0,0,1,6,27.716Z" transform="translate(13.709 44.816)"/>
+    <path id="path-14" data-name="path" class="cls-1" d="M45.521,15.916c-1.643-2.629-4.93-4.6-8.874-5.916A41.091,41.091,0,0,0,24.816,8.357a35.72,35.72,0,0,0-5.916.329h0c2.958-.329,5.587-.657,8.545-.986H32.7a48.714,48.714,0,0,1,10.188.986c5.587.986,9.531,2.629,12.489,5.258Z" transform="translate(43.205 17.835)"/>
+    <path id="path-15" data-name="path" class="cls-1" d="M35.4,23.161c.657-1.972.986-4.272.329-5.916a9.712,9.712,0,0,0-3.615-4.93C28.5,9.686,23.572,9.357,19.629,9.029L19.3,8.7h4.6a64.627,64.627,0,0,1,8.545.657c5.258.986,8.874,2.958,10.517,5.916V15.6a8.533,8.533,0,0,1,.329,6.9Z" transform="translate(44.119 20.121)"/>
+    <path id="path-16" data-name="path" class="cls-1" d="M19.8,29.776a24.165,24.165,0,0,0,6.573-8.216,8.53,8.53,0,0,0,.657-5.587,7.068,7.068,0,0,0-2.958-3.944,6.606,6.606,0,0,0-2.629-1.315c-.329-.329-.329-.657-.657-1.315a28.85,28.85,0,0,1,6.573,1.315c2.3.986,3.944,1.972,4.93,3.615s.986,3.615.329,5.916c-1.315,4.272-4.93,7.888-8.216,10.517Z" transform="translate(45.262 21.722)"/>
+    <path id="path-17" data-name="path" class="cls-1" d="M15.436,36.634A31.953,31.953,0,0,1,9.52,36.3c-3.615-.657-7.888-1.972-9.2-5.916-.986-2.958.329-6.9,4.272-11.174A37.492,37.492,0,0,1,8.206,15.6c0,.329-.329.657-.329.986C6.563,18.229,1.633,24.8,6.563,29.4c2.629,2.3,6.573,3.615,12.16,3.615h.329l-2.629,3.615Z" transform="translate(0 35.898)"/>
+  </g>
+</svg>

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/53ba7185/src/includes/minifi/minifi-topbar.hbs
----------------------------------------------------------------------
diff --git a/src/includes/minifi/minifi-topbar.hbs b/src/includes/minifi/minifi-topbar.hbs
index e5873aa..0eb9f44 100644
--- a/src/includes/minifi/minifi-topbar.hbs
+++ b/src/includes/minifi/minifi-topbar.hbs
@@ -4,7 +4,7 @@
             <li class="name">
                 <h1>
                     <a href="index.html">
-                        <img id="logo-top-bar" src="{{assets}}/images/nifiDrop.svg" alt="Apache NiFi"/>
+                        <img id="logo-top-bar" src="{{assets}}/images/minifi-drop-white.svg" alt="MiNiFi"/>
                     </a>
                 </h1>
             </li>

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/53ba7185/src/pages/html/minifi/index.hbs
----------------------------------------------------------------------
diff --git a/src/pages/html/minifi/index.hbs b/src/pages/html/minifi/index.hbs
index 3be6ea8..b01734e 100644
--- a/src/pages/html/minifi/index.hbs
+++ b/src/pages/html/minifi/index.hbs
@@ -2,30 +2,16 @@
 title: Apache NiFi - MiNiFi
 ---
 
-<div class="large-space"></div>
+<!--<div class="large-space"></div>-->
 <div class="row">
-    <div class="medium-6 large-5 columns">
-        <div class="row">
-            <div class="large-12 columns">
-                <h1 id="nifi-landing" class="right-text nifi-txt">
-                    <span>
-                        Apache <span class="ni">ni</span><span class="fi">fi</span>
-                        <span class="minifi">minifi</span>
-                    </span>
-                </h1>
-            </div>
-        </div>
-        <div class="row">
-            <div class="large-12 columns">
-                <p class="right-text description">
-                    is a subproject of Apache <span class="ni">ni</span><span class="fi">fi</span> to collect data where it originates.
-                </p>
-            </div>
+    <img id="minifi-logo" src="{{assets}}/images/minifi/minifi-logo.png" alt="MiNiFi logo">
+    <div class="row">
+        <div class="large-12 columns">
+            <p class="description">
+                A subproject of Apache NiFi to collect data where it originates.
+            </p>
         </div>
     </div>
-    <div class="medium-6 large-7 columns">
-      <img id="minifi-logo" src="{{assets}}/images/minifi/minifi-logo.png" alt="MiNiFi logo">
-    </div>
     <div class="clear"></div>
 
 </div>
@@ -39,9 +25,7 @@ title: Apache NiFi - MiNiFi
 <div class="row">
     <div class="large-12 columns">
         <p class="description">
-            <span class="nifi-txt">Apache <span class="ni">ni</span><span class="fi">fi</span> <span class="minifi">minifi</span></span></span> is a complementary data collection
-            approach that supplements the core tenets of NiFi in dataflow management, focusing on the collection of data
-            at the source of its creation.
+            MiNiFi&mdash;a subproject of Apache NiFi&mdash;is a complementary data collection approach that supplements the core tenets of NiFi in dataflow management, focusing on the collection of data at the source of its creation.
         </p>
         <p class="description">
             Specific goals for the initial thrust of the MiNiFi effort comprise:

http://git-wip-us.apache.org/repos/asf/nifi-site/blob/53ba7185/src/scss/app.scss
----------------------------------------------------------------------
diff --git a/src/scss/app.scss b/src/scss/app.scss
index 8a0254e..07aa047 100644
--- a/src/scss/app.scss
+++ b/src/scss/app.scss
@@ -127,6 +127,10 @@ p.description {
   margin-bottom: 2em;
 }
 
+#minifi-logo {
+  width: 45%;
+}
+
 #flow {
     /*-moz-box-shadow: 0 0 25px #0F3541;
     -webkit-box-shadow: 0 0 25px #0F3541;