diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 6 | ||||
| -rw-r--r-- | view/css/widgets.css | 32 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 19 | ||||
| -rw-r--r-- | view/tpl/saved_searches.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/searchbox.tpl | 12 |
5 files changed, 25 insertions, 48 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 21d6781f5..849ea3906 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,5 +1,11 @@ /* override some bootstrap settings */ +/* this might be a bug in bootstrap */ +.input-group-addon, +.input-group-btn { + width: unset; +} + /* nav overrides */ nav .badge { diff --git a/view/css/widgets.css b/view/css/widgets.css index cba246f06..4af93a4a9 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -33,38 +33,10 @@ /* saved searches */ -#netsearch-box #search-submit { - margin: 10px 0 7px 0; +#saved-search-list { + margin-top: 2px; } -#netsearch-box #search-save { - margin: 9px 0 7px 6px; -} -.search-save { - margin: 7px 0 7px 7px; -} - -.saved-search-li { - margin-top: 3px; -} - -.saved-search-li i { - opacity: 0; -} - -.saved-search-li:hover i { - opacity: 1; -} - -.saved-search-icon { - float: right; -} - -.savedsearchterm { - display: block; - width: 150px; - overflow: hidden; -} /* peoplefind */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 40cb57fbf..a61c64eec 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -858,14 +858,6 @@ footer { margin-bottom: 25px; } -#search-submit { - margin-left: 15px; -} - -#search-box { - margin-bottom: 25px; -} - #nav-searchbar { float: right; margin-top: 2px; @@ -905,14 +897,9 @@ footer { #search-text { border: 1px solid #ccc; font-size: 1em; -} - -#search-text::-webkit-input-placeholder { - font-family: FontAwesome; -} - -#search-text::-moz-placeholder { - font-family: FontAwesome; + height: 22px; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; } .profile-clear { diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index 92ab62bc7..ee797ea9d 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -1,8 +1,8 @@ -<div class="widget" id="saved-search-list"> +<div class="widget"> <h3 id="search">{{$title}}</h3> {{$searchbox}} - <ul class="nav nav-pills nav-stacked"> + <ul id="saved-search-list" class="nav nav-pills nav-stacked"> {{foreach $saved as $search}} <li id="search-term-{{$search.id}}"> <a class="pull-right group-edit-icon" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove" ></i></a> diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl new file mode 100644 index 000000000..5911c72a9 --- /dev/null +++ b/view/tpl/searchbox.tpl @@ -0,0 +1,12 @@ +<form action="{{$action_url}}" method="get" > + <input type="hidden" name="f" value="" /> + <div id="{{$id}}" class="input-group"> + <input type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" /> + <div class="input-group-btn"> + <button type="submit" name="submit" class="btn btn-default btn-xs" id="search-submit" value="{{$search_label}}"><i class="icon-search"></i></button> + {{if $savedsearch}} + <button type="submit" name="searchsave" class="btn btn-default btn-xs" id="search-save" value="{{$save_label}}"><i class="icon-save"></i></button> + {{/if}} + </div> + </div> +</form> |