Repository: incubator-juneau Updated Branches: refs/heads/master f0db7c99d -> 3c2f101c2
Add 'original' style. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/3c2f101c Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/3c2f101c Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/3c2f101c Branch: refs/heads/master Commit: 3c2f101c20834513efde575268946a9f588b6e16 Parents: f0db7c9 Author: JamesBognar <[email protected]> Authored: Tue Jul 4 13:31:01 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Tue Jul 4 13:31:01 2017 -0400 ---------------------------------------------------------------------- .../ReleaseNotes_631_OriginalStyle.png | Bin 0 -> 146147 bytes .../ReleaseNotes_631_StyleMenuItem.png | Bin 66839 -> 74135 bytes juneau-core/src/main/javadoc/overview.html | 2 + .../juneau/examples/rest/RootResources.java | 4 +- .../juneau/rest/widget/StyleMenuItem.java | 2 +- .../org/apache/juneau/rest/styles/juneau.css | 141 ------------- .../org/apache/juneau/rest/styles/original.css | 208 +++++++++++++++++++ 7 files changed, 213 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3c2f101c/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_OriginalStyle.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_OriginalStyle.png b/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_OriginalStyle.png new file mode 100644 index 0000000..6edcc5b Binary files /dev/null and b/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_OriginalStyle.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3c2f101c/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_StyleMenuItem.png ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_StyleMenuItem.png b/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_StyleMenuItem.png index 8d216f4..e3d1ff3 100644 Binary files a/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_StyleMenuItem.png and b/juneau-core/src/main/javadoc/doc-files/ReleaseNotes_631_StyleMenuItem.png differ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3c2f101c/juneau-core/src/main/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/overview.html b/juneau-core/src/main/javadoc/overview.html index 1a98047..80e7414 100644 --- a/juneau-core/src/main/javadoc/overview.html +++ b/juneau-core/src/main/javadoc/overview.html @@ -6866,6 +6866,8 @@ <br><img src='doc-files/ReleaseNotes_631_LightStyle.png'> <br>Compared with previous 'devops': <br><img src='doc-files/ReleaseNotes_631_DevopsStyle.png'> + <br>For those nolstalgic for old times, there's also 'original': + <br><img src='doc-files/ReleaseNotes_631_OriginalStyle.png'> <li> Improvements made to the {@link org.apache.juneau.rest.widget.Widget} API. <ul> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3c2f101c/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java ---------------------------------------------------------------------- diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java index 24d3c4b..135232f 100644 --- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java +++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java @@ -41,8 +41,8 @@ import org.apache.juneau.rest.widget.*; + "<div style='max-width:400px' class='text'>" + " <p>This is an example of a 'router' page that serves as a jumping-off point to child resources.</p>" + " <p>Resources can be nested arbitrarily deep through router pages.</p>" - + " <p>Note the <span class='link'>OPTIONS</span> link provided that lets you see the generated swagger doc for this page.</p>" - + " <p>Also note the <span class='link'>SOURCE</span> link on these pages to view the source code for the page.</p>" + + " <p>Note the <span class='link'>options</span> link provided that lets you see the generated swagger doc for this page.</p>" + + " <p>Also note the <span class='link'>sources</span> link on these pages to view the source code for the page.</p>" + " <p>All content on pages in the UI are serialized POJOs. In this case, it's a serialized array of beans with 2 properties, 'name' and 'description'.</p>" + " <p>Other features (such as this aside) are added through annotations.</p>" + "</div>", http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3c2f101c/juneau-rest/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java b/juneau-rest/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java index 92af31f..ac11c6a 100644 --- a/juneau-rest/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java +++ b/juneau-rest/src/main/java/org/apache/juneau/rest/widget/StyleMenuItem.java @@ -40,7 +40,7 @@ import org.apache.juneau.rest.*; */ public class StyleMenuItem extends MenuItemWidget { - private static final String[] BUILT_IN_STYLES = {"devops", "light"}; + private static final String[] BUILT_IN_STYLES = {"devops", "light", "original"}; /** * Returns <js>"styleMenuItem"</js>. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3c2f101c/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/juneau.css ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/juneau.css b/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/juneau.css deleted file mode 100644 index cae9c5b..0000000 --- a/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/juneau.css +++ /dev/null @@ -1,141 +0,0 @@ -/*************************************************************************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * - * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * - * with the License. You may obtain a copy of the License at * - * * - * http://www.apache.org/licenses/LICENSE-2.0 * - * * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * - * specific language governing permissions and limitations under the License. * - ***************************************************************************************************************************/ - -table { - border:1px solid #CCCC99; - background-color: white; - border-collapse: collapse; - margin-bottom: 10px; - margin-top: 10px; - display: inline-table; -} - -body { - background-image: linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); - background-image: -o-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); - background-image: -moz-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); - background-image: -webkit-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); - background-image: -ms-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); - background-image: -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0, #CDDDDF), - color-stop(20px, #EAEDED), - color-stop(70px, #FFFFFF) - ); - background-repeat: no-repeat; - background-attachment: fixed; - margin: 20px; - font-family: sans-serif; - font-size: 12px; - color: rgb(44, 69, 87); - height: 100%; -} - -p { - font-family: sans-serif; - font-size: 12px; -} - -p.links { - margin-left: 10px; -} - -th, .header { - border-top:1px solid #CCCC99; - padding:0.3em 0.5em; - font-weight: bold; - font-size: 12px; - color:#666666; - text-align:center; - background-image: linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); - background-image: -o-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); - background-image: -moz-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); - background-image: -webkit-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); - background-image: -ms-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); - background-image: -webkit-gradient( - linear, - left top, - left bottom, - color-stop(0, #FBF9E4), - color-stop(1, #F3F2C2) - ); -} - -button { - border-left:1px solid #CCCC99; - border-top:1px solid #CCCC99; - border-radius: 5px; - color: rgb(44,69,87); - font-size: 12px; - background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; - background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; - background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DEE3E9)); - -} - -button:hover { - background-image: none; - background-color: #FBF9E4; -} - - -td, .entry { - border:1px solid #E9EACB; - padding:0.2em 0.5em; - color:#005C87; - font-size:12px; - vertical-align:top; -} - -ul { - margin:0px; - padding-left:20px; -} - -a { - font-size:12px; -} - -textarea, pre { - -moz-tab-size:3; - -o-tab-size:3; - -webkit-tab-size:3; - tab-size:3; -} - -h3.title { - font-size:1.5em; - color: rgb(44,69,87); - margin-bottom: 10px; - padding: 5px 30px; - border-radius: 15px; - text-decoration: none; - font-weight: normal; - background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; - background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; - background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DEE3E9)); -} - -h5.description { - font-size:12px; - font-weight: normal; - color: rgb(44,69,87); - margin-left: 20px; -} - -.table {display:table;} -.row {display:table-row;} -.cell {display:table-cell;} -.monospace {font-family:monospace;} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3c2f101c/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/original.css ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/original.css b/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/original.css new file mode 100644 index 0000000..aa7b61f --- /dev/null +++ b/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/original.css @@ -0,0 +1,208 @@ +/*************************************************************************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations under the License. * + ***************************************************************************************************************************/ + +table { + border:1px solid #CCCC99; + background-color: white; + border-collapse: collapse; + margin-bottom: 10px; + margin-top: 10px; + display: inline-table; +} + +body { + background-image: linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); + background-image: -o-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); + background-image: -moz-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); + background-image: -webkit-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); + background-image: -ms-linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF 70px); + background-image: -webkit-gradient( + linear, + left top, + left bottom, + color-stop(0, #CDDDDF), + color-stop(20px, #EAEDED), + color-stop(70px, #FFFFFF) + ); + background-repeat: no-repeat; + background-attachment: fixed; + font-family: sans-serif; + font-size: 12px; + color: rgb(44, 69, 87); + height: 100%; + margin: 0px; + padding: 0px; +} + +p { + font-family: sans-serif; + font-size: 12px; +} + +p.links { + margin-left: 10px; +} + +.link { + text-decoration: underline; + cursor: pointer; + color: -webkit-link; +} + +th, .header { + border-top:1px solid #CCCC99; + padding:0.3em 0.5em; + font-weight: bold; + font-size: 12px; + color:#666666; + text-align:center; + background-image: linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); + background-image: -o-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); + background-image: -moz-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); + background-image: -webkit-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); + background-image: -ms-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); + background-image: -webkit-gradient( + linear, + left top, + left bottom, + color-stop(0, #FBF9E4), + color-stop(1, #F3F2C2) + ); +} + +button { + border-left:1px solid #CCCC99; + border-top:1px solid #CCCC99; + border-radius: 5px; + color: rgb(44,69,87); + font-size: 12px; + background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; + background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; + background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DEE3E9)); + +} + +button:hover { + background-image: none; + background-color: #FBF9E4; +} + + +td, .entry { + border:1px solid #E9EACB; + padding:0.2em 0.5em; + color:#005C87; + font-size:12px; + vertical-align:top; +} + +ul { + margin:0px; + padding-left:20px; +} + +a { + font-size:12px; +} + +textarea, pre { + -moz-tab-size:3; + -o-tab-size:3; + -webkit-tab-size:3; + tab-size:3; +} + +h3.title { + font-size:1.5em; + color: rgb(44,69,87); + margin-bottom: 10px; + margin-right: 40px; + padding: 5px 30px; + border-radius: 15px; + text-decoration: none; + font-weight: normal; + background: linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; + background: -moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll 0% 0% transparent; + background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#DEE3E9)); +} + +h5.description { + font-size:12px; + font-weight: normal; + color: rgb(44,69,87); + margin-left: 20px; +} + +.table {display:table;} +.row {display:table-row;} +.cell {display:table-cell;} +.monospace {font-family:monospace;} + +/************************************************************************************/ +/** Pop-ups **/ +/************************************************************************************/ + +.popup-content { + display: none; + position: absolute; + background-color: #eef3f7; + white-space: nowrap; + padding: 5px; + box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.5); + z-index: 1; + margin-top: 10px; + border-radius: 4px; +} + +.popup-content * { + color: black; + font-size: 10pt; +} + +.popup-content a:hover { + color: #94A3AB; +} + + +.popup-show {display:block;} + +/************************************************************************************/ +/** Sections **/ +/************************************************************************************/ + +header { + margin: 20px +} +nav { + margin: 20px; +} +section { + display: table; + width: 100%; + margin: 20px; +} +article { + display: table-cell; +} +aside { + display: table-cell; + vertical-align: top; + padding: 20px 20px; +} +footer { + padding: 10px 20px; + width: 100%; + bottom: 0; + position: fixed; + background-color: #e8ebef; +}
