Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Frank Celler 2013-08-13 15:20:37 +02:00
parent 32db1494f9 f080e3d0f9
commit 07bf9b8aaf
4 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
html/admin/css/collectionsView.css
View File

@ -110,8 +110,8 @@
#transparentHeader i { #transparentHeader i {
margin-top: 2px; margin-top: 0px;
margin-right: 2px; margin-right: 0px;
left: 10px; left: 10px;
position: absolute; position: absolute;
} }
@ -141,7 +141,6 @@
} }
#transparentHeader .pagination-small ul > li:last-child > a { #transparentHeader .pagination-small ul > li:last-child > a {
margin-left:0px
} }
#transparentHeader .btn-group { #transparentHeader .btn-group {

2
html/admin/css/dashboardView.css
View File

@ -20,7 +20,7 @@
margin-top: 6px; margin-top: 6px;
} }
.pagination-right ul a, #dashboardHeader ul a { #dashboardHeader ul a {
margin-top: -2px !important; margin-top: -2px !important;
padding-top: 5px !important; padding-top: 5px !important;
padding-bottom: 3px !important; padding-bottom: 3px !important;

8
html/admin/css/documentView.css
View File

@ -53,7 +53,7 @@
#addDocumentLine { #addDocumentLine {
padding-top: 7px; padding-top: 7px;
padding-right: 0; padding-right: 0;
margin-right: 0; margin-right: -1px;
float: right; float: right;
color: black; color: black;
} }
@ -64,7 +64,7 @@
} }
#deleteRow { #deleteRow {
margin-right: -2px !important; margin-right: -1px !important;
margin-top: -8px; margin-top: -8px;
} }
@ -221,8 +221,8 @@ table.dataTable thead th {
padding: 7px 18px 5px 15px; padding: 7px 18px 5px 15px;
} }
table.dataTable td { #documentsDiv table.dataTable td {
padding: 12px 20px; padding: 12px 15px !important;
} }
.tdRoundButton { .tdRoundButton {

39
html/admin/css/documentsView.css
View File

@ -7,7 +7,11 @@ table.dataTable thead th {
} }
table.dataTable td { table.dataTable td {
padding:12px 10px; padding:12px 18px !important;
}
#documentsDiv table.dataTable td {
padding:12px 15px !important;
} }
#documentAddBtn { #documentAddBtn {
@ -23,6 +27,10 @@ table.dataTable td {
background-color: transparent; background-color: transparent;
} }
#deleteDoc {
padding-right: 5px;
}
#documentsFooterBox { #documentsFooterBox {
background-color: rgba(0,0,0,0.05); background-color: rgba(0,0,0,0.05);
height: 56px; height: 56px;
@ -96,10 +104,13 @@ table.dataTable td {
} }
#documentsDiv { #documentsDiv {
background-color: rgba(0, 0, 0, 0.025); margin-top: 10px !important;
padding-top: 38px;
background-color: rgba(0, 0, 0, 0.1);
} }
#documentsTableID thead { #documentsTableID thead {
font-weight: 400 !important;
background-color: #F7F6F6 !important; background-color: #F7F6F6 !important;
} }
@ -108,7 +119,6 @@ table.dataTable td {
} }
#documentsTableID_wrapper { #documentsTableID_wrapper {
padding-top: 28px !important;
padding-bottom: 0px !important; padding-bottom: 0px !important;
} }
@ -117,8 +127,8 @@ table.dataTable td {
} }
#documentsTableID { #documentsTableID {
padding-left: 20px !important; padding-left: 5px !important;
padding-right: 20px !important; padding-right: 5px !important;
width: 100% !important; width: 100% !important;
position: relative; position: relative;
table-layout:fixed !important; table-layout:fixed !important;
@ -184,8 +194,7 @@ table.dataTable thead th {
.snippet-no-num { .snippet-no-num {
font-size: 1em; font-size: 1em;
font-weight: normal; font-weight: 300;
/*font-family: Verdana, Arial, sans-serif;*/
font-family: 'Lato', sans-serif; font-family: 'Lato', sans-serif;
margin-bottom:0px; margin-bottom:0px;
} }
@ -203,8 +212,8 @@ table.dataTable thead th {
font-size: 1em !important; font-size: 1em !important;
} }
#documentsToolbar button { #collectionPrev {
float:right; margin-right: 5px;
} }
.pagination ul > li > a, .pagination ul > li > span { .pagination ul > li > a, .pagination ul > li > span {
@ -212,6 +221,7 @@ table.dataTable thead th {
border-width:0 0 0 1px; border-width:0 0 0 1px;
} }
/*
.pagination-mini ul > li:first-child > a, .pagination-small ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span { .pagination-mini ul > li:first-child > a, .pagination-small ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span {
margin-right:10px; margin-right:10px;
} }
@ -219,6 +229,7 @@ table.dataTable thead th {
.pagination-mini ul > li:last-child > a, .pagination-small ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span { .pagination-mini ul > li:last-child > a, .pagination-small ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span {
margin-left:10px; margin-left:10px;
} }
*/
.pagination-mini ul > li:last-child > a, .pagination-small ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span, .pagination-mini ul > li:last-child > a, .pagination-small ul > li:last-child > a, .pagination-mini ul > li:last-child > span, .pagination-small ul > li:last-child > span,
.pagination-mini ul > li:first-child > a, .pagination-small ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span { .pagination-mini ul > li:first-child > a, .pagination-small ul > li:first-child > a, .pagination-mini ul > li:first-child > span, .pagination-small ul > li:first-child > span {
@ -226,7 +237,6 @@ table.dataTable thead th {
background: #8f8d8c; background: #8f8d8c;
border: none; border: none;
color:#FFFFFF; color:#FFFFFF;
/*font-size:1.8em;*/
position:relative; position:relative;
width:14px; width:14px;
height:20px; height:20px;
@ -391,7 +401,8 @@ table.dataTable thead th {
} }
.docsThirdCol { .docsThirdCol {
width: 20px !important; padding-right: 15px !important;
float:right;
} }
/*RADIUS*/ /*RADIUS*/
@ -407,6 +418,11 @@ table.dataTable thead th {
border-radius: 0 !important; border-radius: 0 !important;
} }
#documentsToolbar ul {
margin-left: 0 !important;
padding-left: 0!important;
}
.queryline { .queryline {
color: black; color: black;
padding-top: 10px; padding-top: 10px;
@ -422,6 +438,7 @@ table.dataTable thead th {
} }
#documentsToolbar li a { #documentsToolbar li a {
margin-top: 0px !important;
padding-top: 5px; padding-top: 5px;
padding-bottom: -3px; padding-bottom: -3px;
} }