diff --git a/dashboard-ui/css/images/searchbutton.png b/dashboard-ui/css/images/searchbutton.png new file mode 100644 index 0000000000..3d89d597ee Binary files /dev/null and b/dashboard-ui/css/images/searchbutton.png differ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index c9624e4ebf..0d47ef655a 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -28,10 +28,6 @@ color: #fff; } -.type-home { - background: #494949 url(images/bgflip.png) repeat-x!important; -} - .listHeader { margin-top: .5em; margin-bottom: 5px; @@ -82,10 +78,6 @@ } @media all and (min-width: 1000px) { - /*.libraryPage:not(.folderListPage) > .ui-content, .libraryPage:not(.folderListPage) > .ui-panel-content-wrap { - margin-top: -35px!important; - }*/ - .detailPageContent { width: 90%; margin: 0 auto; @@ -94,10 +86,6 @@ @media all and (min-width: 1200px) { - .libraryPage .ui-content { - padding-top: 0; - } - .ehsContent { max-width: 850px; } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 8c9e724303..b387a91fae 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -130,10 +130,47 @@ pre, textarea.pre { margin-right: 2em; } - .headerSearch input { - width: 200px; - vertical-align: middle; - } +.txtSearch { + width: 150px; + vertical-align: middle; + font: 16px arial,sans-serif; + height: 23px; + line-height: 23px; + margin: 0 .15em 0 0; +} + +.btnSearch { + vertical-align: middle; + background-color: #4d90fe; + background-image: -webkit-gradient(linear,left top,left bottom,from(#4d90fe),to(#4787ed)); + background-image: -webkit-linear-gradient(top,#4d90fe,#4787ed); + background-image: -moz-linear-gradient(top,#4d90fe,#4787ed); + background-image: -ms-linear-gradient(top,#4d90fe,#4787ed); + background-image: -o-linear-gradient(top,#4d90fe,#4787ed); + background-image: linear-gradient(top,#4d90fe,#4787ed); + border: 1px solid #3079ed; + color: #fff!important; + margin: 0 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; + font-weight: bold; + height: 29px; + line-height: 29px; + min-width: 54px; + padding: 0 8px; + text-align: center; + text-decoration: none !important; + -moz-user-select: none; + -webkit-user-select: none; + text-align: center; +} + +.btnSearch img { + height: 29px; + margin: 0 auto; + border: 0; +} .header .imageLink { display: inline-block; @@ -283,11 +320,6 @@ form, .readOnlyContent { height: 50px; } - .imgLogoText { - height: 50px; - display: inline; - } - .imageLink.supporter { display: inline-block; } @@ -334,6 +366,15 @@ form, .readOnlyContent { @media all and (min-width: 750px) { + .txtSearch { + width: 200px; + } + + .imgLogoText { + height: 50px; + display: inline; + } + .content-secondary { width: 34%; } @@ -343,6 +384,13 @@ form, .readOnlyContent { } } +@media all and (min-width: 850px) { + .txtSearch { + width: 250px; + } + +} + @media all and (min-width: 1200px) { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 99f88e83cf..79bc75bf5a 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -744,7 +744,11 @@ var Dashboard = { var html = '
'; - html += ''; + html += ''; + + html += ''; html += '
';