Skip to content

Commit

Permalink
separate styles of new and old libs fixing various ui bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
martenson committed Aug 12, 2016
1 parent 4b86f61 commit fb6f3c9
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 149 deletions.
231 changes: 85 additions & 146 deletions client/galaxy/style/less/library.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,235 +8,117 @@ margin: auto;
margin-top:2em;
overflow: auto !important;

tr {
height: 32px;
}

.fa{
font-size: 12px;
}
.fa-globe{
font-size: initial;
margin-left: 0.6em;
}

.libraryRow {
.libraryRow{
background-color: @table-heading-bg;
}

.datasetHighlighted {
.datasetHighlighted{
background-color: @table-bg-accent;
}

.libraryItemDeleted-True {
.libraryItemDeleted-True{
font-style: italic;
}

div.libraryItemBody {
div.libraryItemBody{
padding: 4px 4px 2px 4px;
}

li.folderRow,
li.datasetRow
{
li.folderRow, li.datasetRow{
border-top: solid 1px @table-border;
}

li.folderRow:hover,
li.datasetRow:hover
{
li.folderRow:hover, li.datasetRow:hover{
background-color: @table-bg-accent;
}

td.right-center {
td.right-center{
vertical-align: middle !important;
text-align: right;
}

.library-genome-select {
.library-genome-select{
max-width: 350px;
}
.library-extension-select {
.library-extension-select{
max-width: 140px;
}

.library_table {
td {
.library_table{
td{
border-top:1px solid #5f6990 !important;
}
th {
th{
border-bottom: 2px solid #5f6990 !important;
}
a {
a{
color: #0A143D;
&:hover{
color: maroon;
}
}
}

tr.light td
{
tr.light td{
background-color: white;
color: black;
}
tr.light:hover td
{
tr.light:hover td{
background-color: #f5e8cc;
}
tr.dark td
{
tr.dark td{
background-color: #d6b161;
color: white;
}
tr.dark:hover td
{
tr.dark:hover td{
background-color: #ebd4a4;
color: white;
}
a.dark
{
a.dark{
color: white;
}

.dataset_table{
tr {
border-bottom: 1px solid #5f6990 !important;
}
th{
border: none !important;
}
td{
border: none !important;
tr, th, td{
border: none;
}
.dataset-first-column{
width: 30%;
}
}

th.button_heading{
width: 2em;
}

.bigdrop.select2-container .select2-results {
.bigdrop.select2-container .select2-results{
max-height: 300px;
}
.bigdrop .select2-results {
.bigdrop .select2-results{
max-height: 300px;
}
.select2-container-multi{
width: 100%;
}
.roles-selection {
.roles-selection{
width: 66%;
}

#library_toolbar {
#library_toolbar{
margin-bottom: 0.5em;
span {
span{
margin-right: 0.2em;
}
.toolbar-item{
margin-left: 1em;
}
}

#libraries_element, #folder_items_element{
button{
margin-left: 0.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;
// width: 100%;
overflow: auto;
}

pre.peek th {
color: white;
background: @table-heading-bg;
}

.help-button {
.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 @state-danger-border;
background: @state-danger-bg;
}

.libraryItem-queued {
margin-right: 2px;
padding: 0 2px 0 2px;
border: 1px solid @state-default-border;
background: @state-default-bg;
}

.libraryItem-running {
margin-right: 2px;
padding: 0 2px 0 2px;
border: 1px solid @state-running-border;
background: @state-running-bg;
}

.libraryItem-upload {
margin-right: 2px;
padding: 0 2px 0 2px;
border: 1px solid @state-upload-border;
background: @state-upload-bg;
}
.pagination-sm {
.pagination-sm{
height: 15px;
}
.library-paginator {
.library-paginator{
margin-left: 2em;
}
.import-type-switch{
Expand All @@ -260,3 +142,60 @@ span.expandLink {
}

}

// Follows the style for the deprecated admin libraries interface
#library-grid{
ul{
list-style: none;
}
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 @state-danger-border;
background: @state-danger-bg;
}
.libraryItem-queued{
margin-right: 2px;
padding: 0 2px 0 2px;
border: 1px solid @state-default-border;
background: @state-default-bg;
}
.libraryItem-running{
margin-right: 2px;
padding: 0 2px 0 2px;
border: 1px solid @state-running-border;
background: @state-running-bg;
}
.libraryItem-upload{
margin-right: 2px;
padding: 0 2px 0 2px;
border: 1px solid @state-upload-border;
background: @state-upload-bg;
}
}
.libraryTitle{
th{
text-align: left;
}
.rowTitle{
padding: 2px;
}
}
2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/style/blue/base.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/style/blue/library.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fb6f3c9

Please sign in to comment.