From dd5b7659e837539d2741d85ba2803a1b80307009 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 19 Feb 2015 14:45:44 -0500 Subject: [PATCH 1/2] Cherry-pick e01310e3f82e67ea9048e547205fdbe5748d60ac over to release_15.03 --- lib/galaxy/webapps/tool_shed/model/migrate/check.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/tool_shed/model/migrate/check.py b/lib/galaxy/webapps/tool_shed/model/migrate/check.py index ad4a95f0640..4e87b2235e2 100644 --- a/lib/galaxy/webapps/tool_shed/model/migrate/check.py +++ b/lib/galaxy/webapps/tool_shed/model/migrate/check.py @@ -1,4 +1,6 @@ -import sys, os.path, logging +import logging +import os.path +import sys from galaxy import eggs @@ -38,7 +40,7 @@ def create_or_verify_database( url, engine_options={} ): try: egg = dialect_to_egg[dialect] try: - pkg_resources.require( egg ) + eggs.require( egg ) log.debug( "%s egg successfully loaded for %s dialect" % ( egg, dialect ) ) except: # If the module is in the path elsewhere (i.e. non-egg), it'll still load. From 4d347dcfe1efebda631845d48deff697c3de64ad Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 9 Mar 2015 13:55:18 -0400 Subject: [PATCH 2/2] Fix select2 field arrow style --- static/style/blue/base.css | 2 +- static/style/src/less/ui.less | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/static/style/blue/base.css b/static/style/blue/base.css index e63c0a5346a..0e000746007 100644 --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1471,7 +1471,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close{left:auto; .ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .line .ui-color-picker-box{cursor:pointer;float:left;margin-right:5px;border:solid 1px #c0c0c0;width:15px;height:15px;border-radius:2px}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .line .ui-color-picker-box .ui-color-picker-check{color:black;font-size:1.2em;position:relative;left:1px} .ui-select{position:relative}.ui-select .button{position:absolute;top:5px;right:5px} .ui-select select{position:relative;top:0px;height:27px;width:100%;padding-right:20px;cursor:pointer;padding-left:5px} -.ui-select .select2-container{width:100%}.ui-select .select2-container .select2-choice{height:27px;padding-left:5px}.ui-select .select2-container .select2-choice .select2-arrow{background-image:none;background:transparent;border:none}.ui-select .select2-container .select2-choice .select2-arrow b{background:none} +.ui-select .select2-container{width:100%}.ui-select .select2-container .select2-choice{height:27px;padding-left:5px}.ui-select .select2-container .select2-choice .select2-arrow{display:none} .ui-select .select2-container-multi .select2-choices{padding:0px} .ui-select-multiple select{height:80px !important;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} .ui-select-content .ui-options{float:left;padding-top:2px} diff --git a/static/style/src/less/ui.less b/static/style/src/less/ui.less index 1df45567ebe..72bb0ed85e8 100644 --- a/static/style/src/less/ui.less +++ b/static/style/src/less/ui.less @@ -506,12 +506,7 @@ &:extend(.ui-input-basic); padding-left: 5px; .select2-arrow { - background-image: none; - background: transparent; - border: none; - b { - background: none; - } + display: none; } } }