diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index b350e6bcba..e31be6f98b 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -27,7 +27,7 @@
-
+
${param.select}
@@ -105,7 +105,6 @@
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
index b0f2e46383..1728733ede 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/component-usage.css
@@ -14,15 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";
+
+html, html a {
+ -webkit-font-smoothing: antialiased;
+ text-shadow: 1px 1px 1px rgba(0,0,0,0.004);
+}
+
body {
+ width: 62.5em;
+ margin: 0 auto;
display: block;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
}
.title {
font-weight: bold;
- color: #294c58;
+ color: #7a2518;
font-size: 18px;
}
@@ -33,39 +42,85 @@ body {
/* tables */
table {
- border-collapse: collapse;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
+ color: #666;
+ display: block;
+ margin-bottom: 12px;
+ padding: 5px 8px;
}
-table th {
- background-image: url(../images/bgTableHeader.png);
- background-repeat: repeat-x;
- border-bottom: 1px solid #365C6A;
- border-right: 1px solid #172B31;
- height: 26px;
- padding: 0 2px;
- color: #fff;
- white-space: nowrap;
+tr td {
+ font-size: 14px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
}
-table td {
- padding: 2px;
+tr th {
+ font-size: 16px;
+ vertical-align:top;
+ text-align:left;
+ padding: 4px;
+ border-width: 0;
}
/* links */
a, a:link, a:visited {
cursor: pointer;
- color: #1e373f;
+ color: #2156a5;
text-decoration: none;
border: none;
}
a:hover, a:active {
- color: #264c58;
- text-decoration: underline;
+ color: #2156a5;
+ text-decoration: none;
border: none;
}
.clear {
clear: both;
+}
+
+/* p */
+
+p {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
+}
+
+p strong {
+ font-weight: bold;
+}
+
+/* ul li */
+
+ul li {
+ font-family: 'Noto Serif', 'DejaVu Serif', serif;
+ font-size: 16px;
+}
+
+ul li strong {
+ font-weight: bold;
+}
+
+h2 {
+ font-weight: normal;
+ color: #ba3925;
+}
+
+/* pre */
+
+pre {
+ font-size: 14px;
+ background-color: #fefefe;
+ border: 1px solid #ccc;
+ border-left: 6px solid #ccc;
+ color: #666;
+ margin-bottom: 10px;
+ padding: 5px 8px;
}
\ No newline at end of file
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
index b4daa6baf7..918eb7ad71 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/css/main.css
@@ -19,7 +19,8 @@
padding: 0;
}
-body {
+#documentation-body {
+ width: 100%;
position: absolute;
top: 0;
right: 0;
@@ -111,7 +112,7 @@ div.component-listing {
left: 0;
bottom: 40px;
overflow: auto;
- font-size: 12px;
+ font-size: 16px;
padding: 4px;
}
@@ -124,22 +125,32 @@ div.component-listing div.header {
color: #264c58;
}
-div.component-listing div.component-links {
- margin-left: 10px;
- color: #1e373f;
-}
-
div.component-links ul {
list-style: none;
}
li.component-item {
padding: 2px;
+ padding-left: 4px;
+ border-left: 8px solid transparent;
+ font-family: "Open Sans","DejaVu Sans",sans-serif;
+ font-size: 15px;
+}
+
+li.component-item a {
+ color: #1e373f;
+}
+
+li.component-item:hover {
+ border-left: 8px solid #d1dee5;
+}
+
+li.component-item:hover a {
+ color: #264c58;
}
li.component-item.selected {
- background-color: #d1dee5;
- text-decoration: underline;
+ border-left: 8px solid #7098ad;
}
div.component-links span.no-components {
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
index 748fc62da3..ab92aa26a1 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js
@@ -257,15 +257,10 @@ $(document).ready(function () {
});
// listen for on the rest api and user guide
- $('a.rest-api a.user-guide').on('click', function() {
+ $('a.rest-api, a.user-guide').on('click', function() {
selectComponent($(this).text());
});
- // listen for on the rest api and user guide
- $('a.rest-api a.user-guide').on('click', function() {
- selectComponent($(this).text());
- });
-
// get the initial selection
var initialComponentLink = $('a.component-link:first');
var initialSelection = $('#initial-selection').text();