From 00f00ffb8e2b0cbffa8b5cd98a847960a826eeca Mon Sep 17 00:00:00 2001 From: beckmann73 Date: Tue, 26 Feb 2013 08:44:32 +0100 Subject: [PATCH] design update 5 --- frontend/css/collectionsItemView.css | 4 +- frontend/css/collectionsView.css | 22 ++++--- frontend/css/documentSourceView.css | 6 +- frontend/css/documentsView.css | 88 +++++++++++++++++++--------- frontend/css/navigationView.css | 3 +- 5 files changed, 80 insertions(+), 43 deletions(-) diff --git a/frontend/css/collectionsItemView.css b/frontend/css/collectionsItemView.css index 75ff3e8d75..b46ae30a3c 100644 --- a/frontend/css/collectionsItemView.css +++ b/frontend/css/collectionsItemView.css @@ -29,13 +29,15 @@ white-space: nowrap !important; overflow: hidden !important; text-overflow: ellipsis !important; - + width: 264px; color: #fff; border: 0; background:#676665; padding: 4px 8px; margin:0; text-align:left; + position:absolute; + bottom:0px; } .thumbnail { diff --git a/frontend/css/collectionsView.css b/frontend/css/collectionsView.css index 1698469cf4..723f3cc050 100644 --- a/frontend/css/collectionsView.css +++ b/frontend/css/collectionsView.css @@ -42,21 +42,25 @@ text-align:left; } +.thumbnails .icon { + padding-right:5px; + padding-left: 5px; + padding-top: 5px; +} + .searchInput { background-color: #FFFFFF; border: 1px solid #c0c0c0; box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; - /* border-radius: 4px; */ color: #555555; display: inline-block; font-size: 12px; height: 18px; line-height: 18px; margin-top: 3px; -/* margin-left: 18px;*/ padding: 2px; vertical-align: middle; -/* width: 435px;*/ + } #searchSubmit { @@ -80,18 +84,13 @@ margin-left: 0px; margin-bottom: -10px !important; background-color:#686766; -/* background-color: rgba(0, 0, 0, 0.15);*/ border-top: 1px solid #a0a0a0; border-bottom: 1px solid #a0a0a0; color:#FFF; padding:0 20px; + position:relative; } -#transparentHeader a { - padding:10px 0; - display:inline-block; - color:#b9d375; -} #transparentHeader i { margin-top: 2px; @@ -102,3 +101,8 @@ color:#fff; } +#transparentHeader .pagination { + position:absolute; + right:20px; + margin:5px 0; +} diff --git a/frontend/css/documentSourceView.css b/frontend/css/documentSourceView.css index 3b7e509b48..0fa814fcd8 100644 --- a/frontend/css/documentSourceView.css +++ b/frontend/css/documentSourceView.css @@ -1,8 +1,8 @@ #sourceEditor { height: 400px; width: 900px; - margin-left: 20px; - margin-top: 30px; +/* margin-left: 20px; + margin-top: 30px;*/ overflow:hidden; padding-bottom: 20px; border: 1px solid #A0A0A0; @@ -25,7 +25,7 @@ margin-top: 10px; padding: 20px 20px 20px 20px; min-height: 400px; - background-color: rgba(0, 0, 0, 0.05); +/* background-color: rgba(0, 0, 0, 0.05);*/ } diff --git a/frontend/css/documentsView.css b/frontend/css/documentsView.css index b466d830f5..e29d3f072b 100644 --- a/frontend/css/documentsView.css +++ b/frontend/css/documentsView.css @@ -1,11 +1,11 @@ -#documentsTableID .sorting_asc, #documentsTableID .sorting, #documentsTableID .sorting_desc { - background: none; -} - table.dataTable thead th { cursor: default !important; } +table.dataTable td { + padding:12px 10px; +} + .docleftico { width: 30px !important; } @@ -110,35 +110,35 @@ table.dataTable tr td:last-child { #documentsTableID .even:hover { border: 1px solid #fbdb7e; cursor: pointer; - background-image: -moz-linear-gradient(top, #fdfaec, #fdf6df); - background-image: -ms-linear-gradient(top, #fdfaec, #fdf6df); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdfaec), to(#fdf6df)); - background-image: -webkit-linear-gradient(top, #fdfaec, #fdf6df); - background-image: -o-linear-gradient(top, #fdfaec, #fdf6df); - background-image: linear-gradient(top, #fdfaec, #fdf6df); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdfaec', endColorstr='#fdf6df', GradientType=0); + 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)); + background-image: -webkit-linear-gradient(top, #f4f4f4, #e4e4e4); + background-image: -o-linear-gradient(top, #f4f4f4, #e4e4e4); + background-image: linear-gradient(top, #f4f4f4, #e4e4e4); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#e4e4e4', GradientType=0); } #documentsTableID.dataTable tr.even td.sorting_1, #documentsTableID.dataTable tr.odd td.sorting_1 { - background-image: -moz-linear-gradient(top, #fdfaec, #fdf6df); - background-image: -ms-linear-gradient(top, #fdfaec, #fdf6df); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdfaec), to(#fdf6df)); - background-image: -webkit-linear-gradient(top, #fdfaec, #fdf6df); - background-image: -o-linear-gradient(top, #fdfaec, #fdf6df); - background-image: linear-gradient(top, #fdfaec, #fdf6df); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdfaec', endColorstr='#fdf6df', GradientType=0); + 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)); + background-image: -webkit-linear-gradient(top, #f4f4f4, #e4e4e4); + background-image: -o-linear-gradient(top, #f4f4f4, #e4e4e4); + background-image: linear-gradient(top, #f4f4f4, #e4e4e4); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#e4e4e4', GradientType=0); } #documentsTableID tr.even:hover td.sorting_1, #documentsTableID tr.odd:hover td.sorting_1 { - background-image: -moz-linear-gradient(top, #fff1ca, #fcedbf); - background-image: -ms-linear-gradient(top, #fff1ca, #fcedbf); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fff1ca), to(#fcedbf)); - background-image: -webkit-linear-gradient(top, #fff1ca, #fcedbf); - background-image: -o-linear-gradient(top, #fff1ca, #fcedbf); - background-image: linear-gradient(top, #fff1ca, #fcedbf); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff1ca', endColorstr='#fcedbf', GradientType=0); + 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)); + background-image: -webkit-linear-gradient(top, #e7e7e7, #d5d5d5); + background-image: -o-linear-gradient(top, #e7e7e7, #d5d5d5); + background-image: linear-gradient(top, #e7e7e7, #d5d5d5); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e7e7e7', endColorstr='#d5d5d5', GradientType=0); } @@ -148,17 +148,18 @@ table.dataTable tr td:last-child { .sorting_asc, .sorting_desc { - background:#ffe392; + background:#e4e0dd; } .snippet-container { - margin-top: 5px; +/* margin-top: 5px;*/ } .snippet-no-num { font-size: 1em; font-weight: normal; font-family: Verdana, Arial, sans-serif; + margin-bottom:0px; } .cuttedContent, .prettify ul li, .writeable a { @@ -221,9 +222,38 @@ table.dataTable tr td:last-child { border-radius:0; } -.label-success, .badge-success { - background:#8AA051; +.badge-success, .badge-success, .badge-important, .badge-inverse { + background: none; + padding-left: 0px; + padding-right: 0px; + position:absolute; + bottom:27px; + right:0px; } + +.cornered { + padding-left: 4px; + padding-right: 9px; +} + +.badge-success .cornered { + height: 0px; + border-bottom: 16px solid #8AA051; + border-left: 16px solid transparent; +} + +.badge-important .cornered { + height: 0px; + border-bottom: 16px solid #B94A48; + border-left: 16px solid transparent; +} + +.badge-inverse .cornered { + height: 0px; + border-bottom: 16px solid #333333; + border-left: 16px solid transparent; +} + .badge .arrow:after { border-left-width: 0; border-right-color: #8AA051; diff --git a/frontend/css/navigationView.css b/frontend/css/navigationView.css index 758bc6b819..f9db259624 100644 --- a/frontend/css/navigationView.css +++ b/frontend/css/navigationView.css @@ -39,9 +39,10 @@ body, input, textarea, .page-title span, .pingback a.url { padding: 0 !important; } -.dropdown-toggle:hover, .dropdown-toggle:focus { +/*.dropdown-toggle:hover, .dropdown-toggle:focus { color: white !important; height:16px !important; border: 0; background-color: #333232 !important; } +*/ \ No newline at end of file