From c5c0c79088abf73fa0eb18eeb7cb13eeb29b5bd7 Mon Sep 17 00:00:00 2001
From: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
Date: Fri, 26 Feb 2016 11:03:27 -0300
Subject: [PATCH] Search input and select are now in the same line
Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
---
app/assets/stylesheets/application.scss | 1 +
app/views/shared/application/_header.html.erb | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index fa2e1abfe..48ad22b38 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -153,6 +153,7 @@ header {
padding-left: 20px;
font-size: 18px;
font-weight: 300 !important;
+ width: 50%;
}
// button input
.input-group-btn {
diff --git a/app/views/shared/application/_header.html.erb b/app/views/shared/application/_header.html.erb
index 7445798f8..6d8983273 100644
--- a/app/views/shared/application/_header.html.erb
+++ b/app/views/shared/application/_header.html.erb
@@ -38,15 +38,15 @@
<div class="search-input">
<form action="/search" method="get">
<div class="input-group" id="search">
- <input type="text" placeholder="buscar em <%= number_with_delimiter(LearningObject.count, delimiter: ".") %> conteúdos" class="form-control" name="query" id="main_search">
- <select name="search_class" id="search_class" class="form-control">
- <option value="LearningObject" selected>Conteúdos Educacionais</option>
- <option value="Collection">Coleções</option>
- <option value="User">Usuários</option>
- </select>
- <div class="input-group-btn">
- <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button>
- </div>
+ <input type="text" placeholder="buscar em <%= number_with_delimiter(LearningObject.count, delimiter: ".") %> conteúdos" class="form-control" name="query" id="main_search">
+ <select name="search_class" id="search_class" class="form-control">
+ <option value="LearningObject" selected>Conteúdos Educacionais</option>
+ <option value="Collection">Coleções</option>
+ <option value="User">Usuários</option>
+ </select>
+ <div class="input-group-btn">
+ <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button>
+ </div>
</div>
</form>
<input type="hidden" id="search_class" value=""/>
--
GitLab