Repository: incubator-juneau Updated Branches: refs/heads/master 633619e80 -> ef1c48b84
Clean up and standardize javadocs Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/ef1c48b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/ef1c48b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/ef1c48b8 Branch: refs/heads/master Commit: ef1c48b84327368a7a1ad2bb864953630eb9e67e Parents: 633619e Author: JamesBognar <[email protected]> Authored: Thu Jul 6 20:16:44 2017 -0400 Committer: JamesBognar <[email protected]> Committed: Thu Jul 6 20:16:44 2017 -0400 ---------------------------------------------------------------------- .../org/apache/juneau/rest/styles/devops.css | 254 ++++++++++--------- .../org/apache/juneau/rest/styles/light.css | 244 +++++++++--------- .../org/apache/juneau/rest/styles/original.css | 236 ++++++++--------- 3 files changed, 350 insertions(+), 384 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1c48b8/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/devops.css ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/devops.css b/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/devops.css index 39b98f2..f96bdde 100644 --- a/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/devops.css +++ b/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/devops.css @@ -12,128 +12,98 @@ ***************************************************************************************************************************/ /**********************************************************************************************************************/ -/** Sections **/ +/** Body **/ /**********************************************************************************************************************/ -html { -} + body { background-color: #3B4B54; margin: 0px; - font-size: 11pt; font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; color: #B3B3B3; height: 100%; } -header * { - font-size:11pt; - color: #B3B3B3; - background-color: #26343F; -} -nav { - margin: 10px 20px 10px 20px; - color: #94A3AB; -} -section { - display: table; - width: 100%; -} -article { - display: table-cell; -} -aside { - display: table-cell; - vertical-align: top; - padding: 20px 20px; + +body { + font-size: 14px; } -footer { - padding: 10px; - width: 100%; - bottom: 0; - position: fixed; - background-color: #26343F; + +body textarea, body pre { + -moz-tab-size: 3; + -o-tab-size: 3; + -webkit-tab-size: 3; + tab-size: 3; } /**********************************************************************************************************************/ -/** Page elements **/ +/** Header **/ /**********************************************************************************************************************/ -/* Hyperlinks */ -.link { - font-size:10pt; - color: #94A3AB; - text-decoration: none; - margin: 0px 15px; - text-transform: uppercase; - cursor: pointer; -} -.link:active, .link:hover { - color: white; - text-decoration: underline; +header { + background-color: #26343F; } -/* Title */ -h3.title { +header * { + font-size: 14px; + color: #B3B3B3; margin: 0px; - padding: 10px 20px; - border-bottom: 2px solid #34534B; -} -h3.title, h3.title * { - color: white; text-decoration: none; font-weight: normal; } -/* Description */ -h5.description { - margin: 0; +header h3 { padding: 10px 20px; border-bottom: 2px solid #34534B; + color: white; } -h5.description, h5.description * { - color: #B3B3B3; - text-decoration: none; - font-weight: normal; + +header h5 { + padding: 10px 20px; + border-bottom: 2px solid #34534B; } -/************************************************************************************/ -/** Pop-ups **/ -/************************************************************************************/ +/**********************************************************************************************************************/ +/** Nav **/ +/**********************************************************************************************************************/ -.popup-content { - display: none; - position: absolute; - background-color: #f4f6f9; - 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; +nav { + margin: 10px 20px 10px 20px; + color: #94A3AB; } -.popup-content * { - color: black; +nav a { font-size: 10pt; + color: #94A3AB; + text-decoration: none; + margin: 0px 15px; + text-transform: uppercase; + cursor: pointer; } -.popup-content a:hover { - color: #94A3AB; +nav a:active, nav a:hover { + color: white; + text-decoration: underline; } +/**********************************************************************************************************************/ +/** Content **/ +/**********************************************************************************************************************/ -.popup-show {display:block;} +section { + display: table; + width: 100%; +} +article { + display: table-cell; +} -/************************************************************************************/ -/** Data section **/ -/************************************************************************************/ -div.outerdata { - width: 100%; - height: 100%; +article * { + font-size: 9pt; + color: #26343F; } -div.data { - padding:10px; +article div.data { + padding: 10px; background-color: white; border-radius: 4px; margin: 20px; @@ -141,69 +111,103 @@ div.data { overflow-x: auto; box-shadow: 2px 3px 3px 0px rgba(0, 0, 0, 0.5); font-family: sans-serif; - color:#26343F; -} -div.data * { - font-size: 9pt; color: #26343F; } -div.data td { - vertical-align: top; - border-bottom:1px solid #d9dcde; - border-right:1px solid #d9dcde; - padding:0.2em 0.5em; + +article table { + border: none; } +article th { + border-top: 1px solid #D9DCDE; + padding: 4px 8px; + font-weight: bold; + text-align: center; + background-color: #F4F6F9; +} -/************************************************************************************/ -/** Other **/ -/************************************************************************************/ +article td { + vertical-align: top; + border-bottom: 1px solid #d9dcde; + border-right: 1px solid #d9dcde; + padding: 2px 5px; +} -table { - border: none; +article ul { + margin: 0px; + padding-left: 20px; } -div.data a { +article a { color: #116998; text-decoration: none; } -div.data a:hover { +article a:hover { text-decoration: underline; } -div.data th, .header { - border-top:1px solid #D9DCDE; - padding: 4px 8px; - font-weight: bold; - text-align:center; - background-color: #F4F6F9; +article iframe { + background-color: #F6F7F9; + border: 1px solid gray; + padding: 0px; + overflow: hidden; + width: 100%; + min-height: 400px; +} + +aside { + display: table-cell; + vertical-align: top; + padding: 20px 20px; } -div.data ul { - margin:0px; - padding-left:20px; +/**********************************************************************************************************************/ +/** Footer **/ +/**********************************************************************************************************************/ + +footer { + padding: 10px; + width: 100%; + bottom: 0; + position: fixed; + background-color: #26343F; } -div.data textarea, pre { - -moz-tab-size:3; - -o-tab-size:3; - -webkit-tab-size:3; - tab-size:3; +/**********************************************************************************************************************/ +/** Popup windows **/ +/**********************************************************************************************************************/ + +.popup-content { + display: none; + position: absolute; + background-color: #f4f6f9; + 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: 11px; +} + +.popup-content a:hover { + color: #94A3AB; } -.table { - display:table; +.popup-show { + display:block; } + +/**********************************************************************************************************************/ +/** Other classes **/ +/**********************************************************************************************************************/ + +.table {display:table;} .row {display:table-row;} .cell {display:table-cell;} -.monospace {font-family:monospace;} - -iframe.output { - background-color: #F6F7F9; - border: 1px solid gray; - padding: 0px; - overflow: hidden; - width:100%; - min-height:400px; -} \ No newline at end of file +.monospace {font-family:monospace;} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1c48b8/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/light.css ---------------------------------------------------------------------- diff --git a/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/light.css b/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/light.css index d7787e2..ded2669 100644 --- a/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/light.css +++ b/juneau-rest/src/main/resources/org/apache/juneau/rest/styles/light.css @@ -12,52 +12,154 @@ ***************************************************************************************************************************/ /**********************************************************************************************************************/ -/** Sections **/ +/** Body **/ /**********************************************************************************************************************/ -html { -} + body { - background-color: white; margin: 0px; - font-size: 11pt; + font-size: 10px; font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; color: #2c4557; height: 100%; } + +body * { + font-size: 14px; +} + +body textarea, body pre { + -moz-tab-size: 3; + -o-tab-size: 3; + -webkit-tab-size: 3; + tab-size: 3; +} + +/**********************************************************************************************************************/ +/** Header **/ +/**********************************************************************************************************************/ + header { background-color: #e8ebef; - font-size: 14pt; - height: 50px; padding: 10px 20px; box-shadow: 5px 5px 2px #999999; text-shadow: rgba(1,1,1,.2) 2px 4px 5px, rgba(125,32,191,.05) 0 -10px 30px; white-space: nowrap; } + header * { color: #af2222;; font-weight: lighter; } + +header h3 { + font-size: 18px; + margin: 0px; + padding: 2px; +} + +header h5 { + font-size: 14px; + margin: 0px; + padding: 2px; +} + +/**********************************************************************************************************************/ +/** Nav **/ +/**********************************************************************************************************************/ + nav { margin: 10px; padding: 5px; box-shadow: 5px 5px 2px #999999; - color: #2c4557; background-color: #eef3f7; - font-size: 1.0em; +} + +nav * { + font-size: 12px; font-weight: lighter; } + +nav a { + font-size: 10pt; + color: #2c4557; + text-decoration: none; + margin: 0px 10px; + text-transform: uppercase; + cursor: pointer; +} + +nav a:active, nav a:hover { + text-decoration: none; + color: #94a3ab; +} + +/**********************************************************************************************************************/ +/** Content **/ +/**********************************************************************************************************************/ + section { display: table; width: 100%; + margin: 15px 30px; } + article { display: table-cell; + padding: 10px; + overflow-x: auto; +} + +article * { + font-size: 9pt; +} + +article table { + border: none; +} + +article td { + vertical-align: top; + border-bottom: 1px solid #d9dcde; + border-right: 1px solid #d9dcde; + padding: 2px 5px; +} + +article th { + padding: 4px 8px; + text-align: center; + background-color: #eef3f7; + box-shadow: 1px 1px 2px #999999; +} + +article ul { + margin: 0px; + padding-left: 20px; +} + +article a { + color: #416e8e; + text-decoration: none; +} + +article iframe { + background-color: #F6F7F9; + border: 1px solid gray; + padding: 0px; + overflow: hidden; + width: 100%; + min-height: 400px; } + aside { display: table-cell; vertical-align: top; padding: 20px 20px; } + +/**********************************************************************************************************************/ +/** Footer **/ +/**********************************************************************************************************************/ + footer { padding: 10px; width: 100%; @@ -67,43 +169,9 @@ footer { } /**********************************************************************************************************************/ -/** Page elements **/ +/** Popup windows **/ /**********************************************************************************************************************/ -/* Hyperlinks */ -.link { - font-size: 10pt; - color: #2c4557; - text-decoration: none; - margin: 0px 10px; - text-transform: uppercase; - cursor: pointer; -} -.link:active, .link:hover { - text-decoration: none; - color: #94a3ab; -} - -/* Title */ -h3.title { -} -h3.title, h3.title * { - margin: 0px; - padding: 0px; -} - -/* Description */ -h5.description { -} -h5.description, h5.description * { - margin: 0px; - padding: 0px; -} - -/************************************************************************************/ -/** Pop-ups **/ -/************************************************************************************/ - .popup-content { display: none; position: absolute; @@ -117,7 +185,7 @@ h5.description, h5.description * { } .popup-content * { - color: black; + color: #2c4557; font-size: 10pt; } @@ -125,87 +193,15 @@ h5.description, h5.description * { color: #94A3AB; } - -.popup-show {display:block;} - - -/************************************************************************************/ -/** Data section **/ -/************************************************************************************/ -div.outerdata { - width: 100%; - height: 100%; -} - -div.data { - padding:10px; - border-radius: 4px; - margin: 15px 30px; - display: inline-block; - overflow-x: auto; - color:#26343F; -} -div.data * { - font-size: 9pt; - color: #26343F; -} -div.data td { - vertical-align: top; - border-bottom:1px solid #d9dcde; - border-right:1px solid #d9dcde; - padding:0.2em 0.5em; -} - - -/************************************************************************************/ -/** Other **/ -/************************************************************************************/ - -table { - border: none; -} - -div.data a { - color: #416e8e; - text-decoration: none; -} - -div.data a:hover { - text-decoration: underline; +.popup-show { + display: block; } -div.data th, .header { - padding: 4px 8px; - font-weight: bold; - text-align:center; - background-color: #eef3f7; - box-shadow: 1px 1px 2px #999999; -} - -div.data ul { - margin:0px; - padding-left:20px; -} - -div.data textarea, pre { - -moz-tab-size:3; - -o-tab-size:3; - -webkit-tab-size:3; - tab-size:3; -} +/**********************************************************************************************************************/ +/** Other classes **/ +/**********************************************************************************************************************/ -.table { - display:table; -} +.table {display:table;} .row {display:table-row;} .cell {display:table-cell;} -.monospace {font-family:monospace;} - -iframe.output { - background-color: #F6F7F9; - border: 1px solid gray; - padding: 0px; - overflow: hidden; - width:100%; - min-height:400px; -} \ No newline at end of file +.monospace {font-family:monospace;} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/ef1c48b8/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 index aa7b61f..e2d3f9c 100644 --- 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 @@ -11,146 +11,133 @@ * 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 **/ +/**********************************************************************************************************************/ 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); + font-family: Sans-Serif; + color: #2c4557; height: 100%; margin: 0px; padding: 0px; } -p { - font-family: sans-serif; +body * { font-size: 12px; } -p.links { - margin-left: 10px; +body textarea, body pre { + -moz-tab-size: 3; + -o-tab-size: 3; + -webkit-tab-size: 3; + tab-size: 3; } -.link { - text-decoration: underline; - cursor: pointer; - color: -webkit-link; +/**********************************************************************************************************************/ +/** Header **/ +/**********************************************************************************************************************/ + +header { + margin: 20px; } -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; +header h3 { + font-size: 16px; + 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)); - } -button:hover { - background-image: none; - background-color: #FBF9E4; +header h5 { + font-weight: normal; + margin-left: 20px; } +/**********************************************************************************************************************/ +/** Nav **/ +/**********************************************************************************************************************/ -td, .entry { - border:1px solid #E9EACB; - padding:0.2em 0.5em; - color:#005C87; - font-size:12px; - vertical-align:top; +nav { + margin: 10px 25px; } -ul { - margin:0px; - padding-left:20px; +nav a { + text-decoration: underline; + cursor: pointer; + color: -webkit-link; } -a { - font-size:12px; +/**********************************************************************************************************************/ +/** Content **/ +/**********************************************************************************************************************/ + +section { + display: table; + width: 100%; + margin: 20px; } -textarea, pre { - -moz-tab-size:3; - -o-tab-size:3; - -webkit-tab-size:3; - tab-size:3; +article { + display: table-cell; } -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)); +aside { + display: table-cell; + vertical-align: top; + padding: 20px 20px; } -h5.description { - font-size:12px; - font-weight: normal; - color: rgb(44,69,87); - margin-left: 20px; +article table { + border:1px solid #CCCC99; + border-collapse: collapse; + margin: 5px 0px; } -.table {display:table;} -.row {display:table-row;} -.cell {display:table-cell;} -.monospace {font-family:monospace;} +article th { + border-top: 1px solid #CCCC99; + padding: 3px 5px; + color: #666666; + text-align: center; + background-image: linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); + background-image: -webkit-linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%); +} + +article td { + border: 1px solid #E9EACB; + padding: 2px 5px; + color: #005C87; + vertical-align: top; +} + +article ul { + margin: 0px; + padding-left: 20px; +} -/************************************************************************************/ -/** Pop-ups **/ -/************************************************************************************/ +/**********************************************************************************************************************/ +/** Footer **/ +/**********************************************************************************************************************/ + +footer { + padding: 10px 20px; + width: 100%; + bottom: 0; + position: fixed; + background-color: #e8ebef; +} + +/**********************************************************************************************************************/ +/** Popup windows **/ +/**********************************************************************************************************************/ .popup-content { display: none; @@ -165,44 +152,23 @@ h5.description { } .popup-content * { - color: black; - font-size: 10pt; + font-size: 9pt; } .popup-content a:hover { color: #94A3AB; } +.popup-show { + display: block; +} -.popup-show {display:block;} +/**********************************************************************************************************************/ +/** Other classes **/ +/**********************************************************************************************************************/ -/************************************************************************************/ -/** Sections **/ -/************************************************************************************/ +.table {display:table;} +.row {display:table-row;} +.cell {display:table-cell;} +.monospace {font-family:monospace;} -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; -}
