From 03e104451578ecdca29ade0704d61d13318d5b54 Mon Sep 17 00:00:00 2001
From: Mateus Rambo Strey <mars11@inf.ufpr.br>
Date: Thu, 15 Oct 2015 11:29:13 -0300
Subject: [PATCH] fix style in search
---
app/assets/javascripts/application/search.js | 8 +++----
.../stylesheets/application/search.scss | 22 +++++++++++--------
app/views/search/index.html.erb | 2 +-
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/app/assets/javascripts/application/search.js b/app/assets/javascripts/application/search.js
index c6c99f43e..a6425bb88 100644
--- a/app/assets/javascripts/application/search.js
+++ b/app/assets/javascripts/application/search.js
@@ -12,7 +12,7 @@ var search = function() {
}
// change url with new parameters
- if (!fetch_init) { fetch_init = true}
+ if (!fetch_init) { fetch_init = true; }
else if (!append) { searchState(params); }
$.ajax({
@@ -24,7 +24,7 @@ var search = function() {
$('.search-more').remove();
}
else {
- $('.result-info').hide();
+ $('.result-bar').hide();
$("#search-fetch").empty();
}
$('#search-fetch').append('<div class="search-loading" style="text-align:center;"><br><div class="pong-loader">Carregando...</div></div>');
@@ -37,7 +37,7 @@ var search = function() {
else {
$("#search-fetch").empty();
$('.result-info-count').html($(data).filter('input:hidden[name="learning-objects-count"]').val());
- $('.result-info').show();
+ $('.result-bar').show();
}
$("#search-fetch").append(data);
@@ -176,7 +176,7 @@ var search = function() {
$('.search-more').on('click', function (event) {
event.preventDefault();
params.add('page', params.get('page') + 1);
- searchFetch();
+ searchFetch(true);
});
}
}
diff --git a/app/assets/stylesheets/application/search.scss b/app/assets/stylesheets/application/search.scss
index 440e34380..0c741c551 100644
--- a/app/assets/stylesheets/application/search.scss
+++ b/app/assets/stylesheets/application/search.scss
@@ -20,14 +20,18 @@
width: 100% !important;
}
-.result-info{
- font-weight: 500;
- color: #88888D;
-}
+.result-bar {
+ display: none;
-.sort-dropdown{
- border: 0;
- border-radius: 3px;
- color: #59585A;
- padding-right: 20px;
+ .result-info {
+ font-weight: 500;
+ color: #88888D;
+ }
+
+ .sort-dropdown {
+ border: 0;
+ border-radius: 3px;
+ color: #59585A;
+ padding-right: 20px;
+ }
}
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 885dd0458..dc085d56c 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -256,7 +256,7 @@
<!-- search results -->
<div class="col-sm-8">
- <div>
+ <div class="result-bar">
<form method="get">
<input type="hidden" name="qry" value="<%= params["qry"] %>">
<div class="col-sm-6">
--
GitLab