opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2444 from martenson/isolate-lib-css

Browse Source 
isolate the data libraries css to affect only the libraries app
This commit is contained in:
John Chilton
2016-06-03 19:43:18 -04:00
parent 789c300936 c78c2796d3
commit 037d88f29b
7 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js
+2 -2
View File
@@ -1156,10 +1156,10 @@ var FolderToolbarView = Backbone.View.extend({
// toolbar end
'<div id="folder_items_element">',
'</div>',
// paginator will append here
'<div class="folder-paginator paginator-bottom"></div>',
// container end
'</div>',
// paginator will append here
'<div class="folder-paginator paginator-bottom"></div>'
].join(''));
},
client/galaxy/style/less/library.less
+22 -17
View File
@@ -1,10 +1,21 @@
@import "galaxy_bootstrap/variables.less";
@import "galaxy_variables.less";
.library_style_container .fa{
.library_style_container{
width: 95%;
margin: auto;
margin-top:2em;
overflow: auto !important;
tr {
height: 32px;
}
.fa{
font-size: 12px;
}
.library_style_container .fa-globe{
.fa-globe{
font-size: initial;
margin-left: 0.6em;
}
@@ -63,15 +74,6 @@ td.right-center {
}
}
}
.library_style_container {
width: 95%;
margin: auto;
margin-top:2em;
overflow: auto !important;
tr {
height: 32px;
}
}
tr.light td
{
@@ -237,12 +239,6 @@ span.expandLink {
.library-paginator {
margin-left: 2em;
}
.paginator-bottom{
width: 27em;
margin-left: auto;
margin-right: auto;
margin-top: 2em;
}
.import-type-switch{
text-decoration: underline;
}
@@ -255,3 +251,12 @@ span.expandLink {
margin-left: 1em;
margin-right: 1em;
}
.paginator-bottom{
width: 27em;
margin-left: auto;
margin-right: auto;
margin-top: 2em;
margin-bottom: 2em;
}
}
static/maps/mvc/library/library-foldertoolbar-view.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/mvc/library/library-foldertoolbar-view.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/style/blue/base.css
+1 -1
View File
File diff suppressed because one or more lines are too long
static/style/blue/library.css
+1 -1
View File
@@ -1 +1 @@
a{text-decoration:underline}label{font-weight:normal}.library_style_container .fa{font-size:12px}.library_style_container .fa-globe{font-size:initial;margin-left:.6em}.libraryRow{background-color:#ebd9b2}.datasetHighlighted{background-color:#f9f9f9}.libraryItemDeleted-True{font-style:italic}div.libraryItemBody{padding:4px 4px 2px 4px}li.folderRow,li.datasetRow{border-top:solid 1px #c6bfa8}li.folderRow:hover,li.datasetRow:hover{background-color:#f9f9f9}td.right-center{vertical-align:middle !important;text-align:right}.library-genome-select{max-width:350px}.library-extension-select{max-width:140px}.library_table td{border-top:1px solid #5f6990 !important}.library_table th{border-bottom:2px solid #5f6990 !important}.library_table a{color:#0A143D}.library_table a:hover{color:maroon}.library_style_container{width:95%;margin:auto;margin-top:2em;overflow:auto !important}.library_style_container tr{height:32px}tr.light td{background-color:white;color:black}tr.light:hover td{background-color:#f5e8cc}tr.dark td{background-color:#d6b161;color:white}tr.dark:hover td{background-color:#ebd4a4;color:white}a.dark{color:white}.dataset_table tr{border-bottom:1px solid #5f6990 !important}.dataset_table th{border:none !important}.dataset_table td{border:none !important}.dataset_table .dataset-first-column{width:30%}th.button_heading{width:2em}.bigdrop.select2-container .select2-results{max-height:300px}.bigdrop .select2-results{max-height:300px}.select2-container-multi{width:100%}.roles-selection{width:66%}#library_toolbar{margin-bottom:.5em}#library_toolbar span{margin-right:.2em}#library_toolbar .toolbar-item{margin-left:1em}#libraries_element button,#folder_items_element button{margin-left:.5em}img.expanderIcon{padding-right:4px}input.datasetCheckbox,li,ul{padding:0;margin:0}.rowTitle{padding:2px}ul{list-style:none}.libraryTitle th{text-align:left}pre.peek{background:white;color:black;overflow:auto}pre.peek th{color:white;background:#ebd9b2}.help-button{float:right}span.expandLink{padding-left:12px;display:inline-block;vertical-align:middle;background:url(../images/silk/resultset_next.png) no-repeat}.folderRow.expanded span.expandLink{background:url(../images/silk/resultset_bottom.png) no-repeat}.folderRow span.rowIcon{float:left;margin-right:5px;width:16px;height:16px;display:inline-block;vertical-align:middle;background:url(../images/silk/folder.png)}.libraryItem-error{margin-right:2px;padding:0 2px 0 2px;border:1px solid #dd1b15;background:#f9c7c5}.libraryItem-queued{margin-right:2px;padding:0 2px 0 2px;border:1px solid #bfbfbf;background:#eee}.libraryItem-running{margin-right:2px;padding:0 2px 0 2px;border:1px solid #AAAA66;background:#FFFFCC}.libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #119ac2;background:#a8e5f7}.pagination-sm{height:15px}.library-paginator{margin-left:2em}.paginator-bottom{width:27em;margin-left:auto;margin-right:auto;margin-top:2em}.import-type-switch{text-decoration:underline}.libimport-select-none,.libimport-select-all{margin-left:.5em}.library-modal-item{width:90%;margin-left:1em;margin-right:1em}
a{text-decoration:underline}label{font-weight:normal}.library_style_container{width:95%;margin:auto;margin-top:2em;overflow:auto !important}.library_style_container tr{height:32px}.library_style_container .fa{font-size:12px}.library_style_container .fa-globe{font-size:initial;margin-left:.6em}.library_style_container .libraryRow{background-color:#ebd9b2}.library_style_container .datasetHighlighted{background-color:#f9f9f9}.library_style_container .libraryItemDeleted-True{font-style:italic}.library_style_container div.libraryItemBody{padding:4px 4px 2px 4px}.library_style_container li.folderRow,.library_style_container li.datasetRow{border-top:solid 1px #c6bfa8}.library_style_container li.folderRow:hover,.library_style_container li.datasetRow:hover{background-color:#f9f9f9}.library_style_container td.right-center{vertical-align:middle !important;text-align:right}.library_style_container .library-genome-select{max-width:350px}.library_style_container .library-extension-select{max-width:140px}.library_style_container .library_table td{border-top:1px solid #5f6990 !important}.library_style_container .library_table th{border-bottom:2px solid #5f6990 !important}.library_style_container .library_table a{color:#0A143D}.library_style_container .library_table a:hover{color:maroon}.library_style_container tr.light td{background-color:white;color:black}.library_style_container tr.light:hover td{background-color:#f5e8cc}.library_style_container tr.dark td{background-color:#d6b161;color:white}.library_style_container tr.dark:hover td{background-color:#ebd4a4;color:white}.library_style_container a.dark{color:white}.library_style_container .dataset_table tr{border-bottom:1px solid #5f6990 !important}.library_style_container .dataset_table th{border:none !important}.library_style_container .dataset_table td{border:none !important}.library_style_container .dataset_table .dataset-first-column{width:30%}.library_style_container th.button_heading{width:2em}.library_style_container .bigdrop.select2-container .select2-results{max-height:300px}.library_style_container .bigdrop .select2-results{max-height:300px}.library_style_container .select2-container-multi{width:100%}.library_style_container .roles-selection{width:66%}.library_style_container #library_toolbar{margin-bottom:.5em}.library_style_container #library_toolbar span{margin-right:.2em}.library_style_container #library_toolbar .toolbar-item{margin-left:1em}.library_style_container #libraries_element button,.library_style_container #folder_items_element button{margin-left:.5em}.library_style_container img.expanderIcon{padding-right:4px}.library_style_container input.datasetCheckbox,.library_style_container li,.library_style_container ul{padding:0;margin:0}.library_style_container .rowTitle{padding:2px}.library_style_container ul{list-style:none}.library_style_container .libraryTitle th{text-align:left}.library_style_container pre.peek{background:white;color:black;overflow:auto}.library_style_container pre.peek th{color:white;background:#ebd9b2}.library_style_container .help-button{float:right}.library_style_container span.expandLink{padding-left:12px;display:inline-block;vertical-align:middle;background:url(../images/silk/resultset_next.png) no-repeat}.library_style_container .folderRow.expanded span.expandLink{background:url(../images/silk/resultset_bottom.png) no-repeat}.library_style_container .folderRow span.rowIcon{float:left;margin-right:5px;width:16px;height:16px;display:inline-block;vertical-align:middle;background:url(../images/silk/folder.png)}.library_style_container .libraryItem-error{margin-right:2px;padding:0 2px 0 2px;border:1px solid #dd1b15;background:#f9c7c5}.library_style_container .libraryItem-queued{margin-right:2px;padding:0 2px 0 2px;border:1px solid #bfbfbf;background:#eee}.library_style_container .libraryItem-running{margin-right:2px;padding:0 2px 0 2px;border:1px solid #AAAA66;background:#FFFFCC}.library_style_container .libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #119ac2;background:#a8e5f7}.library_style_container .pagination-sm{height:15px}.library_style_container .library-paginator{margin-left:2em}.library_style_container .import-type-switch{text-decoration:underline}.library_style_container .libimport-select-none,.library_style_container .libimport-select-all{margin-left:.5em}.library_style_container .library-modal-item{width:90%;margin-left:1em;margin-right:1em}.library_style_container .paginator-bottom{width:27em;margin-left:auto;margin-right:auto;margin-top:2em;margin-bottom:2em}