From 7a47a3a77ed35ee3175b212c921dbdb59d8f066b Mon Sep 17 00:00:00 2001 From: Lisa Wagner Date: Tue, 15 Sep 2015 16:28:43 +0200 Subject: [PATCH] #18 adding css and id changes to minimize css overlaps --- css/searchBar.css | 30 +++++++++++++++++++++++++----- js/searchBar.js | 14 +++++++------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/css/searchBar.css b/css/searchBar.css index 46ef8d6..3159390 100644 --- a/css/searchBar.css +++ b/css/searchBar.css @@ -1,7 +1,14 @@ .ui-tabs-vertical { width: 45em; - font-size: 0.7em; + font-size: 11px !important; + color: grey !important; + +} + + +.ui-tabs-vertical a:link{ + color: grey !important; } .ui-tabs-vertical .ui-tabs-nav { @@ -34,7 +41,20 @@ width: 30em; } -#contentArea { +.ui-widget-header { + border: 1px solid rgb(170, 170, 170) !important; + border-image-source: initial !important; + border-image-slice: initial !important; + border-image-width: initial !important; + border-image-outset: initial !important; + border-image-repeat: initial !important; + background: url(https://en.wikipedia.org/wiki/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x rgb(204, 204, 204) !important; + color: grey !important; + font-weight: bold !important; + +} + +#eexcess-tabBar-contentArea { position: fixed; width: 40%; height: 70%; @@ -45,7 +65,7 @@ background: none; } -#jQueryTabsHeader { +#eexcess-tabBar-jQueryTabsHeader { cursor: move; width: calc(100% - 117px - 8px); height: 99%; @@ -53,13 +73,13 @@ border: none; } -#jQueryTabsContent{ +#eexcess-tabBar-jQueryTabsContent { border: 1px solid rgb(170, 170, 170); background-color: white; } -#iframeCover { +#eexcess-tabBar-iframeCover { position: absolute; opacity: 50; z-index: 999999; diff --git a/js/searchBar.js b/js/searchBar.js index db9556f..684c588 100644 --- a/js/searchBar.js +++ b/js/searchBar.js @@ -5,7 +5,7 @@ */ define(['jquery', 'jqueryui'], function ($) { - var contentArea = $("
    ").hide(); + var contentArea = $("
      ").hide(); $('body').append(contentArea); var bar = $(''); @@ -14,9 +14,9 @@ define(['jquery', 'jqueryui'], function ($) { var resetToggle = $('reset'); var storage = chrome.storage.local; - var $jQueryTabsHeader = $("#jQueryTabsHeader"); - var $iframeCover = $("#iframeCover"); - var $contentArea = $("#contentArea"); + var $jQueryTabsHeader = $("#eexcess-tabBar-jQueryTabsHeader"); + var $iframeCover = $("#eexcess-tabBar-iframeCover"); + var $contentArea = $("#eexcess-tabBar-contentArea"); return { init: function (triggerFunction) { @@ -84,12 +84,12 @@ define(['jquery', 'jqueryui'], function ($) { $.each(tabModel.tabs, function (i, tab) { tab.renderedHead = $("
    • " + tab.name + "
    • "); - $("#jQueryTabsHeader ul").append( + $("#eexcess-tabBar-jQueryTabsHeader ul").append( tab.renderedHead); // add tab content corresponding to tab titles tab.renderedContent = $("
      " + tab.content + "
      " ); - $("#jQueryTabsContent").append( + $("#eexcess-tabBar-jQueryTabsContent").append( tab.renderedContent ); // following 3 functions derived from jQuery-UI Tabs @@ -109,7 +109,7 @@ define(['jquery', 'jqueryui'], function ($) { $jQueryTabsHeader.tabs({ activate: function (event, ui) { if (ui.newPanel.attr('id') == "tabs-3") { - $jQueryTabsHeader.resizable("option", "minWidth", 800); + //$jQueryTabsHeader.resizable("option", "minWidth", 800); $jQueryTabsHeader.width(800); $jQueryTabsHeader.resize(); }