opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-19 02:21:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix shared item views and other minor ui styles

Browse Source
This commit is contained in:
guerler
2018-09-19 14:43:15 -04:00
parent 5e6e26f8fb
commit 12497d51cd
9 changed files with 30 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/style/scss/base.scss
+2 -10
View File
@@ -205,26 +205,17 @@ body {
.unified-panel-header {
@extend .unselectable;
@extend .m-2;
height: $panel_header_height;
z-index: 1000;
text-shadow: rgba(255, 255, 255, 0.8) 0 1px 0;
background: $panel-header-bg-color;
border-bottom: $layout-border;
margin: 0;
padding: 0 $margin-v;
font-size: 1rem;
font-weight: bold;
display: flex;
align-items: center;
color: $panel-header-text-color;
a {
color: $panel-header-text-color;
}
.fa {
// font-size: 1.2em;
}
.unified-panel-header-inner {
width: 100%;
display: flex;
@@ -351,6 +342,7 @@ body {
div.unified-panel-body {
width: 100%;
height: 100%;
padding: 0px;
flex: 1;
}
client/galaxy/style/scss/charts.scss
+3 -1
View File
@@ -4,7 +4,8 @@
position: absolute;
right: 0px;
z-index: 1000;
width: 150px;
width: 170px;
top: 4px;
.btn {
background: white;
color: #666;
@@ -29,6 +30,7 @@
position: absolute;
margin: 40px 20px 50px 10px;
width: 50%;
word-break: break-word;
}
.text {
position: relative;
client/galaxy/style/scss/upload.scss
+1 -2
View File
@@ -112,7 +112,6 @@
width: 1.2em;
float: left;
position: relative;
top: 2px;
}
.upload-text-column {
position: relative;
@@ -145,7 +144,7 @@
width: 100%;
padding: 0px;
margin: 0px;
line-height: 1.55em;
line-height: 1.6em;
.progress-bar {
border-radius: inherit;
-moz-border-radius: inherit;
static/style/blue/base.css
+8 -11
View File
@@ -5617,7 +5617,7 @@ button.bg-dark:focus {
.errormessagesmall, .charts-client .charts-right
.warningmessagesmall, .charts-client .charts-right
.donemessagesmall, .charts-client .charts-right
.infomessagesmall {
.infomessagesmall, .unified-panel-header {
margin: 0.5rem !important; }
.mt-2,
@@ -10196,8 +10196,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
font-size: 1.2em;
width: 1.2em;
float: left;
position: relative;
top: 2px; }
position: relative; }
.upload-view-default .upload-box .upload-row .upload-text-column, .upload-view-composite .upload-box .upload-row .upload-text-column {
position: relative; }
.upload-view-default .upload-box .upload-row .upload-text-column .upload-text, .upload-view-composite .upload-box .upload-row .upload-text-column .upload-text {
@@ -10224,7 +10223,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
width: 100%;
padding: 0px;
margin: 0px;
line-height: 1.55em; }
line-height: 1.6em; }
.upload-view-default .upload-box .upload-row .upload-info .progress .progress-bar, .upload-view-composite .upload-box .upload-row .upload-info .progress .progress-bar {
border-radius: inherit;
-moz-border-radius: inherit; }
@@ -11962,7 +11961,8 @@ button.toast-close-button {
position: absolute;
right: 0px;
z-index: 1000;
width: 150px; }
width: 170px;
top: 4px; }
.charts-client .charts-buttons .btn, .charts-client .charts-buttons input[type="submit"], .charts-client .charts-buttons
button, .charts-client .charts-buttons .action-button, .charts-client .charts-buttons .menubutton {
background: white;
@@ -11986,7 +11986,8 @@ button.toast-close-button {
.charts-client .charts-center .charts-viewer .info {
position: absolute;
margin: 40px 20px 50px 10px;
width: 50%; }
width: 50%;
word-break: break-word; }
.charts-client .charts-center .charts-viewer .text {
position: relative;
margin-left: 5px;
@@ -12172,11 +12173,6 @@ body {
.unified-panel-header {
height: 2.5rem;
z-index: 1000;
text-shadow: rgba(255, 255, 255, 0.8) 0 1px 0;
background: #f8f9fa;
border-bottom: none;
margin: 0;
padding: 0 1.5rem;
font-size: 1rem;
font-weight: bold;
display: flex;
@@ -12279,6 +12275,7 @@ body {
div.unified-panel-body {
width: 100%;
height: 100%;
padding: 0px;
flex: 1; }
templates/display_base.mako
+7 -34
View File
@@ -48,8 +48,8 @@
<style type="text/css">
.page-body {
padding: 10px;
## float: left;
## width: 65%;
height: 100%;
overflow: auto;
}
.page-meta {
float: right;
@@ -116,38 +116,11 @@
href_to_user_items = h.url_for( controller='/' + modern_route, action='list_published', xxx=item.user.username)
href_to_user_items = href_to_user_items.replace( 'xxx', 'f-username')
%>
<div class="unified-panel-header" unselectable="on" style="overflow: hidden">
<div class="unified-panel-header-inner">
<div style="float: right">
${self.render_item_links( item )}
</div>
%if item.published:
<a href="${href_to_all_items}">Published ${item_plural}</a> |
<a href="${href_to_user_items}">${item.user.username}</a>
%elif item.importable:
Accessible ${get_class_display_name( item.__class__ )}
%elif item.users_shared_with:
Shared ${get_class_display_name( item.__class__ )}
%else:
Private ${get_class_display_name( item.__class__ )}
%endif
| ${get_item_name( item ) | h}
</div>
</div>
<div class="unified-panel-body">
<div style="overflow: auto; height: 100%;">
<div class="page-body">
<div>
${self.render_item_header( item )}
</div>
${self.render_item( item, item_data )}
</div>
<div class="page-body">
<div>
${self.render_item_header( item )}
</div>
${self.render_item( item, item_data )}
</div>
</%def>
@@ -165,13 +138,13 @@
<div class="unified-panel-header" unselectable="on">
<div class="unified-panel-header-inner">
About this ${get_class_display_name( item.__class__ )}
${self.render_item_links( item )}
</div>
</div>
<div class="unified-panel-body">
<div style="overflow: auto; height: 100%;">
<div style="padding: 10px;">
<div style="float: right;"><img src="https://secure.gravatar.com/avatar/${h.md5(item.user.email)}?d=identicon"></div>
<h4>Author</h4>
templates/webapps/galaxy/history/display.mako
+2 -8
View File
@@ -22,16 +22,10 @@
encoded_history_id = history_dict[ 'id' ]
switch_url = h.url_for( controller='history', action='switch_to_history', hist_id=encoded_history_id )
%>
## Needed to overwide initial width so that link is floated left appropriately.
%if not user_is_owner:
<a class="history-copy-link" title="${_('Make a copy of this history and switch to it')}"
href="javascript:void(0)" style="width: 100%" >
${_('Import history')}
</a>
<a href="javascript:void(0)" class="history-copy-link btn btn-secondary fa fa-plus" title="Import history"></a>
%else:
<a href="${switch_url}" style="width: 100%" title="${_('Make this history your current history')}">
${_('Switch to this history')}
</a>
<a href="${switch_url}" class="btn btn-secondary fa fa-plus" title="${_('Switch to this history')}"></a>
%endif
</%def>
templates/webapps/galaxy/visualization/display.mako
+2 -4
View File
@@ -41,10 +41,8 @@
<%def name="render_item_links( visualization )">
<a
href="${h.url_for( controller='/visualization', action='imp', id=trans.security.encode_id( visualization.id ) )}"
class="icon-button import"
## Needed to overwide initial width so that link is floated left appropriately.
style="width: 100%"
title="Import visualization">Import visualization</a>
class="btn btn-secondary fa fa-plus"
title="Import visualization"></a>
</%def>
<%def name="render_item( visualization, config )">
templates/webapps/galaxy/visualization/display_in_frame.mako
+3 -6
View File
@@ -41,12 +41,9 @@
</%def>
<%def name="render_item_links( visualization )">
<a
href="${h.url_for( controller='/visualization', action='imp', id=trans.security.encode_id( visualization.id ) )}"
class="icon-button import"
## Needed to overwide initial width so that link is floated left appropriately.
style="width: 100%"
title="Import visualization">Import visualization</a>
<a href="${h.url_for( controller='/visualization', action='imp', id=trans.security.encode_id( visualization.id ) )}"
class="btn btn-secondary fa fa-plus"
title="Import visualization"></a>
</%def>
<%def name="render_item( visualization, config )">
templates/webapps/galaxy/workflow/display.mako
+2 -2
View File
@@ -77,11 +77,11 @@
%if workflow.importable:
<a
href="${h.url_for( controller='/workflow', action='imp', id=trans.security.encode_id(workflow.id) )}"
class="icon-button import"
class="btn btn-secondary fa fa-plus"
title="Import workflow"></a>
<a
href="${h.url_for( controller='/workflow', action='export_to_file', id=trans.security.encode_id(workflow.id) )}"
class="icon-button disk"
class="btn btn-secondary fa fa-download"
title="Save workflow"></a>
%endif
</%def>