From be6ea64b617ffc89013d202ea78e1522b1c39571 Mon Sep 17 00:00:00 2001 From: Palak Jadwani Date: Wed, 7 Mar 2018 20:26:43 +0530 Subject: [PATCH] Changes regarding Search button, Pop-tags, help-modal and Footer. --- code/css/popup.css | 31 ++++++++++++++++++++++++++++--- code/js/popup.js | 15 +++++++++++++++ code/popup.html | 9 ++++++--- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/code/css/popup.css b/code/css/popup.css index ef09712..b5d9cd0 100644 --- a/code/css/popup.css +++ b/code/css/popup.css @@ -29,6 +29,7 @@ html { line-height: 60px; background-color: #E5E8E8; margin-top: 2%; + margin-bottom: 0; } .favListItem { @@ -52,9 +53,10 @@ html { margin-top: 7px; height: 24px; font-size: 12px; + cursor: pointer; } -.fa { + .fa { font-size: 15px; cursor: pointer; @@ -66,7 +68,7 @@ html { } .checked { color: orange; - } + } .card-title{ font-size: 20px; @@ -156,4 +158,27 @@ hr { overflow: hidden; outline:none; color: #077bff; -} \ No newline at end of file +} +#pop-tags{ + padding-left: 20%; +} +.input-group{ + border:1px solid #ced4da; + border-radius:5px; + border-width: 2px; + margin-top: 20px; + margin-bottom: 10px; +} +#search{ + float: left; + width: 90%; + border: none; +} +#search_button{ + width: 8%; + margin-right: 5px; +} +#search_button i{ + font-size: 17px; + margin-top: 10px; +} diff --git a/code/js/popup.js b/code/js/popup.js index 2b9583b..775ef87 100644 --- a/code/js/popup.js +++ b/code/js/popup.js @@ -60,6 +60,15 @@ $(function() { }); }); +$(function() { + $('#search_button').on("click", function(){ + $('.bricklayer').empty(); + $('#bookmarks').empty(); + $('#no_of_results').empty(); + dumpBookmarks($('#search').val()); + }); +}); + $(function() { $(document).on("click", ".button-pop", function(){ $('#front').show(); @@ -333,6 +342,12 @@ document.addEventListener('DOMContentLoaded', function () help_hide(); }); + window.onclick = function(event) { + if (event.target == document.getElementById('help_popup')) { + document.getElementById('search').style.display = "block"; + document.getElementById('help_popup').style.display = "none"; + } +} document.getElementById('favButton').addEventListener('click', function(event){ $('#favorites').show(); diff --git a/code/popup.html b/code/popup.html index 7e52767..fd6f1d0 100644 --- a/code/popup.html +++ b/code/popup.html @@ -39,9 +39,9 @@
- -
-
+ +
+
@@ -80,6 +80,9 @@
+ +
+