1
0
Fork 0

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2014-03-19 17:32:21 +01:00
commit 0905ca2833
6 changed files with 140 additions and 82 deletions

View File

@ -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;
}

View File

@ -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;

View File

@ -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;
}
}

View File

@ -3100,6 +3100,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; }

View File

@ -43,6 +43,8 @@
@import 'accordion';
// shell view
@import 'shellView';
// api docs
@import 'api';
// Data Tables, TODO: might all be superflous

View File

@ -137,7 +137,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"