From 9603efa7cb1471d0c29172438be769ef7a150c88 Mon Sep 17 00:00:00 2001 From: scottashton Date: Wed, 19 Mar 2014 17:27:13 +0100 Subject: [PATCH] got rid of api.css --- js/apps/system/aardvark/frontend/css/api.css | 81 ------------------ .../aardvark/frontend/scss/_colors.scss | 3 + .../system/aardvark/frontend/scss/api.scss | 82 +++++++++++++++++++ .../aardvark/frontend/scss/generated.css | 53 ++++++++++++ .../system/aardvark/frontend/scss/style.scss | 2 + js/apps/system/aardvark/manifest.json | 1 - 6 files changed, 140 insertions(+), 82 deletions(-) delete mode 100644 js/apps/system/aardvark/frontend/css/api.css create mode 100644 js/apps/system/aardvark/frontend/scss/api.scss diff --git a/js/apps/system/aardvark/frontend/css/api.css b/js/apps/system/aardvark/frontend/css/api.css deleted file mode 100644 index 46f9f4e5cd..0000000000 --- a/js/apps/system/aardvark/frontend/css/api.css +++ /dev/null @@ -1,81 +0,0 @@ -.swagger-ui-wrap ul#resources li.resource { - background-color: #F4F3F3; -} - -.api-actions { - margin: 0 !important; - padding: 0; -} - -.api-actions .container { - margin-top: 0 !important; - margin-bottom: 0 !important; - margin-left: 5px !important; - margin-right: 5px !important; - padding-top: 13px !important; - padding-bottom: 10px !important; -} - -.api-actions .resource { - padding-left: 5px !important; - border-bottom: 0 !important; -} - -.api-actions .resource .heading h2 a { - color: #000000 !important; - font-weight: 300 !important; -} - -.api-actions .active .heading h2 a { - color: #000000 !important; -} - -.api-actions .endpoints { - margin-right: 5px !important; -} - -.api-actions .endpoints .endpoint:last-child { - padding-bottom: 5px !important; -} - -.api-actions .endpoint .operations .heading, -.api-actions .endpoint .operations .content { - border-radius: 0 !important; - font-weight: 300 !important; -} - -.api-actions .endpoint .operations .content { - margin: 0 !important; -} - -.api-actions .endpoint .operations .content h4 { - font-weight: 700 !important; -} - -.api-actions .toggleOperation, -.api-actions .http_method { - border-radius: 0 !important; -} - -.api-actions .required, -.api-actions em, -.api-actions strong { - font-weight: 400 !important; -} - -.api-actions input[type="button"] { - background: none repeat scroll 0 0 #8F8D8C !important; - border: medium none !important; - box-shadow: none !important; - color: #FFFFFF !important; - font-size: 14px !important; - font-weight: 300 !important; - padding: 8px 16px !important; - float: right !important; - margin-top: 10px !important; -} - -.api-actions .resource > .heading > .options { - margin: 11px 10px 0 0 !important; -} - diff --git a/js/apps/system/aardvark/frontend/scss/_colors.scss b/js/apps/system/aardvark/frontend/scss/_colors.scss index cb7a6ccbb6..cf79a9ac42 100644 --- a/js/apps/system/aardvark/frontend/scss/_colors.scss +++ b/js/apps/system/aardvark/frontend/scss/_colors.scss @@ -104,3 +104,6 @@ $c-pag-disabled-bg: #777; $c-accordion-heading: #ccc; $c-icon-with-opacity: #333; + +$c-api-docs-bg: #f4f3f3; +$c-api-docs-bg-input: #8f8d8c; \ No newline at end of file diff --git a/js/apps/system/aardvark/frontend/scss/api.scss b/js/apps/system/aardvark/frontend/scss/api.scss new file mode 100644 index 0000000000..04a15b4b13 --- /dev/null +++ b/js/apps/system/aardvark/frontend/scss/api.scss @@ -0,0 +1,82 @@ +.swagger-ui-wrap ul#resources li.resource { + background-color: $c-api-docs-bg; +} + +.centralContent { + .api-actions { + margin: 0 !important; + padding: 0; + } + + .api-actions .container { + margin-top: 0 !important; + margin-bottom: 0 !important; + margin-left: 5px !important; + margin-right: 5px !important; + padding-top: 13px !important; + padding-bottom: 10px !important; + } + + .api-actions .resource { + border-bottom: 0 !important; + padding-left: 5px !important; + } + + .api-actions .resource .heading h2 a { + color: $c-black !important; + font-weight: 300 !important; + } + + .api-actions .active .heading h2 a { + color: $c-black !important; + } + + .api-actions .endpoints { + margin-right: 5px !important; + } + + .api-actions .endpoints .endpoint:last-child { + padding-bottom: 5px !important; + } + + .api-actions .endpoint .operations .heading, + .api-actions .endpoint .operations .content { + border-radius: 0 !important; + font-weight: 300 !important; + } + + .api-actions .endpoint .operations .content { + margin: 0 !important; + } + + .api-actions .endpoint .operations .content h4 { + font-weight: 700 !important; + } + + .api-actions .toggleOperation, + .api-actions .http_method { + border-radius: 0 !important; + } + + .api-actions .required, + .api-actions em, + .api-actions strong { + font-weight: 400 !important; + } + + .api-actions input[type="button"] { + background: none repeat scroll 0 0 $c-api-docs-bg-input !important; + border: medium none !important; + box-shadow: none !important; + color: $c-white !important; + float: right !important; + font-size: 14px !important; + font-weight: 300 !important; + margin-top: 10px !important; + padding: 8px 16px !important; + } + + .api-actions .resource > .heading > .options { + margin: 11px 10px 0 0 !important; + } +} diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css index eedf33b67a..f8bf915a94 100644 --- a/js/apps/system/aardvark/frontend/scss/generated.css +++ b/js/apps/system/aardvark/frontend/scss/generated.css @@ -1777,6 +1777,59 @@ div img.searchSubmitIcon { .query-output .ace_gutter-cell { background-color: #f0f0f0; } +.swagger-ui-wrap ul#resources li.resource { + background-color: #f4f3f3; } + +.centralContent .api-actions { + margin: 0 !important; + padding: 0; } +.centralContent .api-actions .container { + margin-top: 0 !important; + margin-bottom: 0 !important; + margin-left: 5px !important; + margin-right: 5px !important; + padding-top: 13px !important; + padding-bottom: 10px !important; } +.centralContent .api-actions .resource { + border-bottom: 0 !important; + padding-left: 5px !important; } +.centralContent .api-actions .resource .heading h2 a { + color: black !important; + font-weight: 300 !important; } +.centralContent .api-actions .active .heading h2 a { + color: black !important; } +.centralContent .api-actions .endpoints { + margin-right: 5px !important; } +.centralContent .api-actions .endpoints .endpoint:last-child { + padding-bottom: 5px !important; } +.centralContent .api-actions .endpoint .operations .heading, +.centralContent .api-actions .endpoint .operations .content { + border-radius: 0 !important; + font-weight: 300 !important; } +.centralContent .api-actions .endpoint .operations .content { + margin: 0 !important; } +.centralContent .api-actions .endpoint .operations .content h4 { + font-weight: 700 !important; } +.centralContent .api-actions .toggleOperation, +.centralContent .api-actions .http_method { + border-radius: 0 !important; } +.centralContent .api-actions .required, +.centralContent .api-actions em, +.centralContent .api-actions strong { + font-weight: 400 !important; } +.centralContent .api-actions input[type="button"] { + background: none repeat scroll 0 0 #8f8d8c !important; + border: medium none !important; + box-shadow: none !important; + color: white !important; + float: right !important; + font-size: 14px !important; + font-weight: 300 !important; + margin-top: 10px !important; + padding: 8px 16px !important; } +.centralContent .api-actions .resource > .heading > .options { + margin: 11px 10px 0 0 !important; } + table.dataTable thead th { font-weight: 400 !important; padding: 10px 14px; } diff --git a/js/apps/system/aardvark/frontend/scss/style.scss b/js/apps/system/aardvark/frontend/scss/style.scss index 212c242e81..7a659b3f04 100644 --- a/js/apps/system/aardvark/frontend/scss/style.scss +++ b/js/apps/system/aardvark/frontend/scss/style.scss @@ -43,6 +43,8 @@ @import 'accordion'; // shell view @import 'shellView'; +// api docs +@import 'api'; // Data Tables, TODO: might all be superflous diff --git a/js/apps/system/aardvark/manifest.json b/js/apps/system/aardvark/manifest.json index dec1edf374..b4cfe2f8af 100644 --- a/js/apps/system/aardvark/manifest.json +++ b/js/apps/system/aardvark/manifest.json @@ -139,7 +139,6 @@ "frontend/css/ansi.css", "frontend/css/graphlayout.css", "frontend/css/datatables.css", - "frontend/css/api.css", "frontend/css/screenSizes.css", "frontend/css/jsoneditor.css", "frontend/ttf/arangofont/style.css"