From c49c3d746ee8d33243ec311041084452351e94dd Mon Sep 17 00:00:00 2001 From: beckmann73 Date: Thu, 28 Feb 2013 10:29:08 +0100 Subject: [PATCH 1/2] buttons ohne schatten logs tabelle --- frontend/css/collectionsView.css | 4 +-- frontend/css/documentView.css | 17 ++++++++-- frontend/css/documentsView.css | 45 ++++++++++++++++++--------- frontend/css/layout.css | 53 +++++++++++++++++++++++++++++++- 4 files changed, 99 insertions(+), 20 deletions(-) diff --git a/frontend/css/collectionsView.css b/frontend/css/collectionsView.css index 39f2d4896f..7599ada643 100644 --- a/frontend/css/collectionsView.css +++ b/frontend/css/collectionsView.css @@ -106,8 +106,8 @@ margin:5px 0; } -#transparentHeader .pagination ul > li > a { - font-size:1.8em; +#transparentHeader .pagination-small ul > li:last-child > a { + margin-left:0px } #transparentHeader .btn-group { diff --git a/frontend/css/documentView.css b/frontend/css/documentView.css index f24e2cabcf..635aac54f9 100644 --- a/frontend/css/documentView.css +++ b/frontend/css/documentView.css @@ -111,15 +111,24 @@ } #tableDiv .nav-tabs, -#sourceDiv .nav-tabs { +#sourceDiv .nav-tabs, +#logContent .nav-tabs { margin-bottom:-1px; border-bottom:#FFFFFF solid 1px; } #tableDiv .nav-tabs > li > a, #tableDiv .nav-tabs > li:hover > a, #sourceDiv .nav-tabs > li > a, -#sourceDiv .nav-tabs > li:hover > a { +#sourceDiv .nav-tabs > li:hover > a , +#logContent .nav-tabs > li > a, +#logContent .nav-tabs > li:hover > a { background-image: -moz-linear-gradient(center top , #F3EFEC, #EBE7E3); + background-image: -ms-linear-gradient(top, #F3EFEC, #EBE7E3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#F3EFEC), to(#EBE7E3)); + background-image: -webkit-linear-gradient(top, #F3EFEC, #EBE7E3); + background-image: -o-linear-gradient(top, #F3EFEC, #EBE7E3); + background-image: linear-gradient(top, #bedc6a, #80a127#F3EFEC, #EBE7E3); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F3EFEC', endColorstr='#EBE7E3', GradientType=0); border-top: 1px solid #F3EFEC; border-left: 1px solid #F3EFEC; border-right: 1px solid #F3EFEC; @@ -129,7 +138,9 @@ #tableDiv .nav-tabs > li.active > a, #tableDiv .nav-tabs > li:hover.active > a, #sourceDiv .nav-tabs > li.active > a, -#sourceDiv .nav-tabs > li:hover.active > a { +#sourceDiv .nav-tabs > li:hover.active > a , +#logContent .nav-tabs > li.active > a, +#logContent .nav-tabs > li:hover.active > a { background: #FFF; border: 1px solid #FFF; } diff --git a/frontend/css/documentsView.css b/frontend/css/documentsView.css index 6a1d833b92..887eec6c83 100644 --- a/frontend/css/documentsView.css +++ b/frontend/css/documentsView.css @@ -49,18 +49,22 @@ table.dataTable td { } #documentsTableID { - margin-left: 20px !important; - width: 900px; !important; - table-layout:fixed !important; - border-collapse:separate; - border-spacing:0 5px; + margin-left: 20px !important; +} +#documentsTableID, +#logContent .dataTable { + width: 900px; !important; + table-layout:fixed !important; + border-collapse:separate; + border-spacing:0 5px; } table.dataTable thead th { border-bottom:none; } -#documentsTableID.dataTable thead tr { +#documentsTableID.dataTable thead tr, +#logContent .dataTable thead tr { background-image: -moz-linear-gradient(top, #f3efec, #ebe7e3); background-image: -ms-linear-gradient(top, #f3efec, #ebe7e3); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3efec), to(#ebe7e3)); @@ -71,7 +75,8 @@ table.dataTable thead th { border:1px solid #c1bdba; } -#documentsTableID.dataTable tr { +#documentsTableID.dataTable tr, +#logContent .dataTable tr { -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); @@ -97,7 +102,9 @@ table.dataTable tr td:last-child { }*/ #documentsTableID .odd, -#documentsTableID .even { +#documentsTableID .even, +#logContent .odd, +#logContent .even { margin-bottom: 5px; background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); @@ -111,7 +118,9 @@ table.dataTable tr td:last-child { #documentsTableID .odd:hover, -#documentsTableID .even:hover { +#documentsTableID .even:hover, +#logContent .odd:hover, +#logContent .even:hover { border: 1px solid #fbdb7e; cursor: pointer; background-image: -moz-linear-gradient(top, #f4f4f4, #e4e4e4); @@ -124,7 +133,9 @@ table.dataTable tr td:last-child { } #documentsTableID.dataTable tr.even td.sorting_1, -#documentsTableID.dataTable tr.odd td.sorting_1 { +#documentsTableID.dataTable tr.odd td.sorting_1, +#logContent tr.even td.sorting_1, +#logContent tr.odd td.sorting_1 { background-image: -moz-linear-gradient(top, #f4f4f4, #e4e4e4); background-image: -ms-linear-gradient(top,#f4f4f4, #e4e4e4); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f4f4f4), to(#e4e4e4)); @@ -135,7 +146,9 @@ table.dataTable tr td:last-child { } #documentsTableID tr.even:hover td.sorting_1, -#documentsTableID tr.odd:hover td.sorting_1 { +#documentsTableID tr.odd:hover td.sorting_1, +#logContent tr.even:hover td.sorting_1, +#logContent tr.odd:hover td.sorting_1 { background-image: -moz-linear-gradient(top, #e7e7e7, #d5d5d5); background-image: -ms-linear-gradient(top, #e7e7e7, #d5d5d5); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#e7e7e7), to(#d5d5d5)); @@ -198,22 +211,26 @@ table.dataTable tr td:last-child { .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; + font-size:1.8em; } .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; + font-size:1.8em; } .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 { - background-image: -moz-linear-gradient(top, #8f8d8c, #6d6c6b); +/* background-image: -moz-linear-gradient(top, #8f8d8c, #6d6c6b); background-image: -ms-linear-gradient(top, #8f8d8c, #6d6c6b); background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#8f8d8c), to(#6d6c6b)); background-image: -webkit-linear-gradient(top, #8f8d8c, #6d6c6b); background-image: -o-linear-gradient(top, #8f8d8c, #6d6c6b); background-image: linear-gradient(top, #8f8d8c, #6d6c6b); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8f8d8c', endColorstr='#6d6c6b', GradientType=0); - border:1px solid #54514f; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#8f8d8c', endColorstr='#6d6c6b', GradientType=0);*/ + box-shadow: 2px 2px 0 rgba(0, 0, 0, 0.2); + background: #8f8d8c; + border: none/*1px solid #54514f*/; color:#FFFFFF; } diff --git a/frontend/css/layout.css b/frontend/css/layout.css index 006b38ffc5..390bbfb88d 100644 --- a/frontend/css/layout.css +++ b/frontend/css/layout.css @@ -6,7 +6,7 @@ } -.arangoBtnSuccess +.arangoBtnSuccess { } @@ -16,6 +16,57 @@ box-shadow: 0; } +.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { + background: #788f3d; +} + + +.btn { + box-shadow:0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05), 2px 2px 0 rgba(0, 0, 0, 0.2); + background: #8f8d8c; + border: none; + color:#FFFFFF; +} + +.btn:hover { + background: #736b68; + color:#FFFFFF; +} + +.btn-primary { + background: #564e4a; +} + +.btn-primary:hover { + background: #3a322e; +} + +.btn-success { + background: #8AA051; +} + +.btn-success:hover { + background: #788f3d; +} + +.btn-danger { + background-color: #DA4F49; +} + +.btn-danger:hover { + background-color: #be342e; +} + +.btn-group > .btn + .dropdown-toggle { + box-shadow: 1px 0 0 rgba(255, 255, 255, 0.125) inset, 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05), 2px 2px 0 rgba(0, 0, 0, 0.2) + +} + +.btn-group.open .btn-inverse.dropdown-toggle { + background-color: #736b68; +} + + .breadcrumb { background-color: #F5F5F5; background: transparent; From 1b018fead51ae7df2f2d08599b8be5df0f21d58c Mon Sep 17 00:00:00 2001 From: Heiko Kernbach Date: Thu, 28 Feb 2013 11:03:05 +0100 Subject: [PATCH 2/2] fixed documents view --- frontend/js/templates/documentsView.ejs | 7 ++++--- frontend/js/views/documentsView.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/js/templates/documentsView.ejs b/frontend/js/templates/documentsView.ejs index 47a5400b24..f5646e9168 100644 --- a/frontend/js/templates/documentsView.ejs +++ b/frontend/js/templates/documentsView.ejs @@ -21,7 +21,7 @@ - - + +