diff --git a/media/css/style.css b/media/css/style.css index e3afe61..320e98b 100644 --- a/media/css/style.css +++ b/media/css/style.css @@ -69,20 +69,7 @@ header.main div.inner form.search { position: relative; z-index: 50; } -header.main div.inner form.search div.infield { - position: relative; -} -header.main div.inner form.search div.infield label { - color: #72979C; - cursor: text; - float: none; - font: normal 12px "Helvetica Neue", Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif; - left: 30px; - position: absolute; - top: 8px; - width: auto; -} -header.main div.inner form.search div.infield input { +header.main div.inner form.search input { background: #17484f url("/static/images/search-icon.png") top left no-repeat; background: rgba(43, 82, 93, 0.5) url("/static/images/search-icon.png") 8px center no-repeat; border: 1px solid #3A5E67; @@ -102,9 +89,15 @@ header.main div.inner form.search div.infield input { -moz-box-shadow: inset 0 1px 0px #1d4249; box-shadow: inset 0 1px 0px #1d4249; } -header.main div.inner form.search div.infield input:focus { +header.main div.inner form.search input:focus { border-color: #62D5E1; } +header.main div.inner form.search input::-webkit-input-placeholder { + color: #72979C; +} +header.main div.inner form.search input:-moz-placeholder { + color: #72979C; +} header.main div.inner nav.public { float: left; } @@ -1129,9 +1122,26 @@ body.error div.rochester-made { body.search div.empty-snipts { margin-top: 20px; } +body.search div.static-box { + border-left: 0; + margin-left: 0; + margin-right: 30px; + -webkit-border-top-left-radius: 0px; + -webkit-border-top-right-radius: 4px; + -webkit-border-bottom-right-radius: 4px; + -webkit-border-bottom-left-radius: 0px; + -moz-border-radius-topleft: 0px; + -moz-border-radius-topright: 4px; + -moz-border-radius-bottomright: 4px; + -moz-border-radius-bottomleft: 0px; + border-top-left-radius: 0px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 0px; +} body.search div.static-box form { margin-bottom: 0; } body.search div.static-box form input.search-query { - width: 571px; + width: 570px; } diff --git a/media/css/style.scss b/media/css/style.scss index 84755e7..de415ec 100644 --- a/media/css/style.scss +++ b/media/css/style.scss @@ -128,35 +128,27 @@ header.main { position: relative; z-index: 50; - div.infield { - position: relative; + input { + background: #17484F url('/static/images/search-icon.png') top left no-repeat; + background: rgba(43, 82, 93, .5) url('/static/images/search-icon.png') 8px center no-repeat; + border: 1px solid #3A5E67; + color: #FFF; + font: normal 12px $Helvetica; + height: auto; + margin: 0; + padding: 7px 7px 7px 28px; + width: 154px; + @include border-radius(3px); + @include inset-box-shadow(0, 1px, 0px, #1D4249); - label { - color: #72979C; - cursor: text; - float: none; - font: normal 12px $Helvetica; - left: 30px; - position: absolute; - top: 8px; - width: auto; + &:focus { + border-color: #62D5E1; } - input { - background: #17484F url('/static/images/search-icon.png') top left no-repeat; - background: rgba(43, 82, 93, .5) url('/static/images/search-icon.png') 8px center no-repeat; - border: 1px solid #3A5E67; - color: #FFF; - font: normal 12px $Helvetica; - height: auto; - margin: 0; - padding: 7px 7px 7px 28px; - width: 154px; - @include border-radius(3px); - @include inset-box-shadow(0, 1px, 0px, #1D4249); - - &:focus { - border-color: #62D5E1; - } + &::-webkit-input-placeholder { + color: #72979C; + } + &:-moz-placeholder { + color: #72979C; } } } @@ -1276,11 +1268,16 @@ body.search { margin-top: 20px; } div.static-box { + border-left: 0; + margin-left: 0; + margin-right: 30px; + @include multi-border-radius(0px, 4px, 4px, 0px); + form { margin-bottom: 0; input.search-query { - width: 571px; + width: 570px; } } } diff --git a/snipts/templates/snipts/snipt-edit-js-template.html b/snipts/templates/snipts/snipt-edit-js-template.html index d9790f4..595bd86 100644 --- a/snipts/templates/snipts/snipt-edit-js-template.html +++ b/snipts/templates/snipts/snipt-edit-js-template.html @@ -1,4 +1,6 @@ -{% load verbatim %} +{% load verbatim snipt_tags %} + +{% get_lexers as 'lexers' %} {% verbatim %} {% endblock %} @@ -67,9 +71,8 @@