From: Radek Czajka Date: Tue, 8 Jan 2013 15:50:23 +0000 (+0100) Subject: search field X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/c3955dfd70abab4db001b0d0ad3298747e168be8?hp=e76fdcf2a2488b1787c74fe8dccfa38d7ac04c84 search field --- diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index e29f770..24cc530 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -92,10 +92,9 @@ header.main { color: #363a3e; } header.main #search { float: right; - padding: 0 0.625em; background-color: white; /* Extend padded background .*/ - padding: 0 0.625em; + padding: 2px 0.625em 0; margin-right: -0.625em; } #content { @@ -123,3 +122,33 @@ footer.main { width: 6.25em; } footer.main .footer-item-half p { font-size: .75em; } + +#search { + font-size: .8em; } + #search input, #search button { + font-family: Dosis; + font-size: .9em; + vertical-align: bottom; + border: 1px solid #c9ccce; + padding: 0; + margin: 0; + line-height: .9em; } + #search input { + border-right-width: 0; + height: 16px; + width: 16em; + padding-left: 1.3em; } + #search button { + height: 18px; + width: 1.8em; } + #search button span { + position: relative; + top: -1px; } + #search input::-webkit-input-placeholder { + text-transform: uppercase; } + #search input:-moz-placeholder { + text-transform: uppercase; } + #search input::-moz-placeholder { + text-transform: uppercase; } + #search input::-ms-placeholder { + text-transform: uppercase; } diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index b059890..4b3a53d 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -109,10 +109,9 @@ header.main { } #search { float: right; - padding: 0 10*$px; background-color: white; /* Extend padded background .*/ - padding: 0 10*$px; + padding: 2px 10*$px 0; margin-right: -10*$px; } } @@ -151,3 +150,46 @@ footer.main { } } } + + +#search { + font-size: .8em; + + input, button { + font-family: Dosis; + font-size: .9em; + vertical-align:bottom; + border: 1px solid #c9ccce; + padding: 0; + margin: 0; + line-height: .9em; + } + input { + border-right-width: 0; + height: 16px; + width: 16em; + padding-left: 1.3em; + } + button { + height: 18px; + width: 1.8em; + span { + position:relative; + top: -1px; + } + } + + input::-webkit-input-placeholder { + text-transform: uppercase; + } + input:-moz-placeholder { + text-transform: uppercase; + } + input::-moz-placeholder { + text-transform: uppercase; + } + input::-ms-placeholder { + text-transform: uppercase; + } + +} \ No newline at end of file diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css index 27aa707..71a4e6c 100644 --- a/edumed/static/css/main.css +++ b/edumed/static/css/main.css @@ -32,7 +32,7 @@ #main-sections { clear: both; float: left; - margin-top: 1.1em; + margin-top: 1.2em; width: 43.75em; } #main-sections h1 { font-size: .9em; @@ -77,7 +77,7 @@ #main-chosen { float: right; - margin-top: 1.1em; + margin-top: 1.2em; width: 13.75em; } #main-chosen h1 { font-size: .9em; diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss index 56517d9..2905854 100755 --- a/edumed/static/css/main.scss +++ b/edumed/static/css/main.scss @@ -43,7 +43,7 @@ $px: .0625em; #main-sections { clear: both; float: left; - margin-top: 1.1em; + margin-top: 1.2em; width: 700*$px; h1 { @@ -89,7 +89,7 @@ $px: .0625em; #main-chosen { float: right; - margin-top: 1.1em; + margin-top: 1.2em; width: 220*$px; h1 { diff --git a/edumed/templates/base.html b/edumed/templates/base.html index c767430..313f706 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -46,7 +46,11 @@
Scenariusze zajęć, ćwiczenia, materiały
- +