1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/ddc870bbff15/ Changeset: ddc870bbff15 User: james_taylor Date: 2013-09-27 19:29:57 Summary: style: cleaning up display logic and styles for message and inactivity box Affected #: 3 files
diff -r 5337e71047572cd6b7dd812d74ff1513527b6897 -r ddc870bbff1505bb226cf310f068798063aa7acb static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -755,7 +755,7 @@ pre{overflow:auto;word-wrap:normal;white-space:pre} .dropdown-menu{max-width:auto} input[type="checkbox"],input[type="radio"]{margin-left:0.5ex;margin-right:0.5ex} -.modal-dialog{width:680px} +.modal-dialog{width:690px} .modal-body{overflow:auto} .nav-tabs{margin-bottom:15px} a{text-decoration:underline} @@ -1146,6 +1146,9 @@ #center{left:250px;right:250px;overflow:hidden;z-index:1} #right-border{right:250px} #right{width:250px;right:0px;z-index:200;border-left:solid #999 1px} +body.has-message-box #left,body.has-inactivity-box #left,body.has-message-box #left-border,body.has-inactivity-box #left-border,body.has-message-box #center,body.has-inactivity-box #center,body.has-message-box #right-border,body.has-inactivity-box #right-border,body.has-message-box #right,body.has-inactivity-box #right{top:64px} +body.has-message-box.has-inactivity-box #left,body.has-message-box.has-inactivity-box #left-border,body.has-message-box.has-inactivity-box #center,body.has-message-box.has-inactivity-box #right-border,body.has-message-box.has-inactivity-box #right{top:94px} +body.has-message-box.has-inactivity-box #inactivebox{top:64px} .subnavbar{background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), color-stop(25%, #fff), to(#e6e6e6));background-image:-webkit-linear-gradient(#fff, #fff 25%, #e6e6e6);background-image:-moz-linear-gradient(top, #fff, #fff 25%, #e6e6e6);background-image:linear-gradient(#fff, #fff 25%, #e6e6e6);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-bottom:solid #bfbfbf 1px;border-top:solid #bfbfbf 1px;padding:5px;color:#555} .unified-panel-header{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;height:30px;z-index:1000;text-shadow:rgba(255,255,255,0.8) 0 1px 0;background:#eee;border-bottom:solid #999 1px;margin:0;padding:0;padding-right:10px;padding-left:10px;font-weight:bold;color:#555}.unified-panel-header a{color:#555} .unified-panel-header-inner{padding-top:8px} @@ -1165,7 +1168,7 @@ .panel-header-button .caret{margin-top:7px} .panel-header-button.popup{padding-right:1.75em;background:url(../images/dropdownarrow.png) no-repeat right 7px} #DD-helper{background:white;opacity:0;z-index:900;position:absolute;top:0;left:0;width:100%;height:100%} -.panel-error-message,.panel-warning-message,.panel-done-message,.panel-info-message{height:24px;line-height:24px;padding:0px;padding-left:26px;background-color:#f9c7c5;background-image:url(error_small.png);background-repeat:no-repeat;background-position:6px 50%} +.panel-error-message,.panel-warning-message,.panel-done-message,.panel-info-message{height:30px;line-height:30px;padding:0px;padding-left:26px;background-color:#f9c7c5;background-image:url(error_small.png);background-repeat:no-repeat;background-position:6px 50%} .panel-warning-message{background-image:url(warn_small.png);background-color:#fce1ba} .panel-done-message{background-image:url(ok_small.png);background-color:#aff1af} .panel-info-message{background-image:url(info_small.png);background-color:#a6e4f7} @@ -1233,7 +1236,7 @@ .search-query:focus{border-color:rgba(24,132,218,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);outline:0;outline:thin dotted \9;} .search-spinner{position:absolute;display:none;right:6px;top:9px} #search-clear-btn{position:absolute;right:6px;top:8px;display:block;font-size:1.4em;text-decoration:none;color:#888;font-family:FontAwesome;font-size:1.1666666666666667em;background-image:none !important;background-position:0% 0%;background-repeat:repeat}#search-clear-btn:before{content:"\f057"} -.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:15px;margin-bottom:17px;border:1px solid transparent;border-radius:3px;min-height:36px;padding-left:52px;background-image:url(error_large.png);background-repeat:no-repeat;background-position:10px 10px}.errormessagelarge h4,.warningmessagelarge h4,.donemessagelarge h4,.infomessagelarge h4{margin-top:0;color:inherit} +.errormessagelarge,.warningmessagelarge,.donemessagelarge,.infomessagelarge{padding:15px;margin-bottom:17px;border:1px solid transparent;border-radius:3px;min-height:36px;padding-left:52px;background-image:url(error_large.png);background-repeat:no-repeat;background-position:10px 8px}.errormessagelarge h4,.warningmessagelarge h4,.donemessagelarge h4,.infomessagelarge h4{margin-top:0;color:inherit} .errormessagelarge .alert-link,.warningmessagelarge .alert-link,.donemessagelarge .alert-link,.infomessagelarge .alert-link{font-weight:bold} .errormessagelarge>p,.warningmessagelarge>p,.donemessagelarge>p,.infomessagelarge>p,.errormessagelarge>ul,.warningmessagelarge>ul,.donemessagelarge>ul,.infomessagelarge>ul{margin-bottom:0} .errormessagelarge>p+p,.warningmessagelarge>p+p,.donemessagelarge>p+p,.infomessagelarge>p+p{margin-top:5px}
diff -r 5337e71047572cd6b7dd812d74ff1513527b6897 -r ddc870bbff1505bb226cf310f068798063aa7acb static/style/src/less/base.less --- a/static/style/src/less/base.less +++ b/static/style/src/less/base.less @@ -57,6 +57,14 @@
// ==== Panel layout styles ====
+@panel-message-height: 30px; + +@layout_top_padding: 0px; +@border-default-color_padding: 0px; + +@panel_header_height: 30px; +@panel_footer_height: 25px; + #background { position: absolute; background: #fff; @@ -74,7 +82,7 @@ top: @navbar-height + @layout_top_padding + 1; left:0; width:100%; - height: @panel_header_height !important; + height: @panel-message-height !important; overflow: hidden; border-bottom: solid #999 1px; font-size: 90%; @@ -85,18 +93,12 @@ top: @navbar-height + @layout_top_padding + 1; left:0; width:100%; - height: @panel_header_height !important; + height: @panel-message-height !important; overflow: hidden; border-bottom: solid #999 1px; font-size: 90%; }
-@layout_top_padding: 0px; -@border-default-color_padding: 0px; - -@panel_header_height: 30px; -@panel_footer_height: 25px; - // Panels
#left, #left-border, #center, #right-border, #right { @@ -134,6 +136,23 @@ border-left: solid @layout-border-color 1px; }
+// If the message box or inactivity box is visible +body.has-message-box, body.has-inactivity-box { + #left, #left-border, #center, #right-border, #right { + top: @panel-message-height + @navbar-height + @layout_top_padding + 1; + } +} + +// If both are visible +body.has-message-box.has-inactivity-box { + #left, #left-border, #center, #right-border, #right { + top: 2 * @panel-message-height + @navbar-height + @layout_top_padding + 1; + } + #inactivebox { + top: @panel-message-height + @navbar-height + @layout_top_padding + 1; + } +} + .subnavbar { #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); border-bottom: solid @border-default-color 1px; @@ -299,8 +318,8 @@
.panel-error-message, .panel-warning-message, .panel-done-message, .panel-info-message { - height: 24px; - line-height: 24px; + height: @panel-message-height; + line-height: @panel-message-height; padding: 0px; padding-left: 26px; background-color: @state-danger-bg; @@ -731,7 +750,7 @@ padding-left: 52px; background-image: url(error_large.png); background-repeat: no-repeat; - background-position: 10px 10px; + background-position: 10px 8px; }
.errormessagelarge {
diff -r 5337e71047572cd6b7dd812d74ff1513527b6897 -r ddc870bbff1505bb226cf310f068798063aa7acb templates/base/base_panels.mako --- a/templates/base/base_panels.mako +++ b/templates/base/base_panels.mako @@ -7,6 +7,7 @@ self.show_inactivity_warning = False if trans.webapp.name == 'galaxy' and trans.user: self.show_inactivity_warning = ( ( trans.user.active is False ) and ( app.config.user_activation_on ) and ( app.config.inactivity_box_content is not None ) ) + self.show_inactivity_warning = True self.overlay_visible=False self.active_view=None self.body_class="" @@ -294,7 +295,15 @@ ${self.javascripts()} </head>
- <body scroll="no" class="full-content ${self.body_class}"> + <% + body_class = self.body_class + if self.message_box_visible: + body_class += " has-message-box" + if self.show_inactivity_warning: + body_class += " has-inactivity-box" + %> + + <body scroll="no" class="full-content ${body_class}"> %if self.require_javascript: <noscript><div class="overlay overlay-background"> @@ -312,16 +321,14 @@ <div id="masthead" class="navbar navbar-fixed-top navbar-inverse"> ${self.masthead()} </div> - %if self.message_box_visible and app.config.message_box_content: <div id="messagebox" class="panel-${app.config.message_box_class}-message"> - ${app.config.message_box_content} + ${app.config.message_box_content} </div> - %endif - %if self.show_inactivity_warning: - <div id="inactivebox" class="panel-warning-message"> + %if self.show_inactivity_warning: + <div id="inactivebox" class="panel-warning-message"> ${app.config.inactivity_box_content} - </div> - %endif + </div> + %endif ${self.overlay(visible=self.overlay_visible)} %if self.has_left_panel: <div id="left">
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.