[galaxy-commits] commit/galaxy-central: 2 new changesets

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ca4c4a24bd6a/ Changeset: ca4c4a24bd6a Branch: next-stable User: carlfeberhard Date: 2014-02-06 21:25:25 Summary: Fix css scoping in hda borders broken in 2b8e4f3 Affected #: 2 files diff -r a66e4111ba2aeca52572d203e1713153a5ee293a -r ca4c4a24bd6a853993fc171394c0d2da75fc8829 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1573,6 +1573,47 @@ .search-input .search-clear,.search-input .search-loading{position:relative;display:inline-block;float:right;margin-top:-23px;margin-right:4px;font-size:1.4em;line-height:23px;color:grey} .search-input .search-clear:hover{color:#303030} #history-refresh-button,#history-options-button{display:inline-block;height:22px;width:22px;text-align:center;line-height:19px;font-size:1.2em;padding:0px} +.history-panel .dataset{border:1px solid #bfbfbf}.history-panel .dataset .vertical-spacing{margin-bottom:8px} +.history-panel .dataset .info-section{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px} +.history-panel .dataset .dataset-padding{padding:6px 10px 6px 8px} +.history-panel .dataset [class$=messagesmall]{margin:6px 10px 2px 8px;font-size:90%} +.history-panel .dataset .help-text{font-weight:normal;color:#555} +.history-panel .dataset .dataset-selector{float:left;display:none;width:0px;margin:0 0 -6px 0;padding:5px 0 2px 8px;cursor:pointer;vertical-align:middle} +.history-panel .dataset .dataset-title-bar{cursor:pointer;outline:none;padding:6px 10px 6px 8px} +.history-panel .dataset .dataset-title-bar .dataset-title{display:inline;font-weight:bold;text-decoration:underline;word-wrap:break-word;word-break:break-all;line-height:16px} +.history-panel .dataset .dataset-primary-actions{display:inline-block;float:right;margin:6px 10px 0}.history-panel .dataset .dataset-primary-actions .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} +.history-panel .dataset .dataset-primary-actions .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} +.history-panel .dataset .dataset-primary-actions .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} +.history-panel .dataset .dataset-primary-actions .icon-btn{margin-left:2px} +.history-panel .dataset .dataset-body{display:none;padding:6px 10px 6px 8px}.history-panel .dataset .dataset-body [class$=messagesmall]{margin:0px 0px 8px 0px} +.history-panel .dataset .dataset-body label{margin:0px;padding:0px;font-weight:normal} +.history-panel .dataset .dataset-body .prompt{font-weight:normal;color:#555} +.history-panel .dataset .dataset-body .prompt:after{content:':'} +.history-panel .dataset .dataset-body .dataset-summary{margin-bottom:8px}.history-panel .dataset .dataset-body .dataset-summary .dataset-blurb{margin-bottom:2px} +.history-panel .dataset .dataset-body .dataset-summary .dataset-datatype,.history-panel .dataset .dataset-body .dataset-summary .dataset-dbkey{display:inline}.history-panel .dataset .dataset-body .dataset-summary .dataset-datatype .value,.history-panel .dataset .dataset-body .dataset-summary .dataset-dbkey .value{font-weight:bold} +.history-panel .dataset .dataset-body .dataset-summary .dataset-datatype .value:after{content:',';font-weight:normal;color:#555} +.history-panel .dataset .dataset-body .dataset-summary .dataset-dbkey:after{content:' ';display:block;margin-bottom:8px} +.history-panel .dataset .dataset-body .dataset-summary .dataset-info{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px}.history-panel .dataset .dataset-body .dataset-summary .dataset-info .value{white-space:pre-line} +.history-panel .dataset .dataset-body .dataset-summary .job-error-text{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;overflow:auto;white-space:pre} +.history-panel .dataset .dataset-body .dataset-actions .left{display:inline-block;float:left}.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} +.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} +.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} +.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn{margin-right:2px} +.history-panel .dataset .dataset-body .dataset-actions .left:not(:empty){margin-bottom:8px} +.history-panel .dataset .dataset-body .dataset-actions .right{float:right}.history-panel .dataset .dataset-body .dataset-actions .right .icon-btn{margin-left:2px} +.history-panel .dataset .dataset-body .tags-display{display:none;margin-bottom:8px}.history-panel .dataset .dataset-body .tags-display .select2-container{min-width:0px}.history-panel .dataset .dataset-body .tags-display .select2-container .select2-choices{border-radius:3px} +.history-panel .dataset .dataset-body .annotation-display{display:none;margin-bottom:8px}.history-panel .dataset .dataset-body .annotation-display .annotation{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;white-space:pre-line} +.history-panel .dataset .dataset-body .annotation-display .annotation:empty{height:22px} +.history-panel .dataset .dataset-body .annotation-display .annotation:empty:after{position:relative;top:-4px;font-size:10px;font-style:italic;color:grey;content:'Click here to edit annotation'} +.history-panel .dataset .dataset-body .annotation-display textarea{margin:0px 0px 2px 0px;display:block;border-radius:3px;width:100%} +.history-panel .dataset .dataset-body .dataset-display-applications .display-application:last-child{margin-bottom:8px} +.history-panel .dataset .dataset-body .dataset-peek{margin-bottom:8px}.history-panel .dataset .dataset-body .dataset-peek pre.peek{width:100%;margin:0px;border-radius:3px;background:white;color:black;font-size:10px;overflow:auto}.history-panel .dataset .dataset-body .dataset-peek pre.peek th{color:white;background:#5f6990} +.history-panel .dataset .dataset-body .dataset-peek pre.peek table,.history-panel .dataset .dataset-body .dataset-peek pre.peek th,.history-panel .dataset .dataset-body .dataset-peek pre.peek tr,.history-panel .dataset .dataset-body .dataset-peek pre.peek td{font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:10px} +.history-panel .dataset .icon-btn-group{display:inline-block}.history-panel .dataset .icon-btn-group .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} +.history-panel .dataset .icon-btn-group .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} +.history-panel .dataset .icon-btn-group .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} +.history-panel .dataset .state-icon{font-family:FontAwesome;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;vertical-align:middle;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px} +.state-icon-error{background-color:white;border-radius:8px}.state-icon-error:before{font-size:20px;line-height:16px;color:red;content:"\f057"} .history-panel [class$="messagesmall"]{margin:0px} .history-panel .editable-text{border:solid transparent 1px} .history-panel .editable-text:hover{cursor:pointer;border:1px dotted #999999} @@ -1604,47 +1645,6 @@ .history-panel .dataset:last-child{border-width:1px 0px 1px 0px} .history-panel .empty-history-message{display:none;margin:0px 10px 0px 10px} .history-panel .tag-button{display:inline-block;height:20px;margin:2px 2px 0px 0px;border:1px solid grey;border-radius:3px 10px 10px 3px;padding:2px 4px 2px 4px;background-color:#EEE;line-height:13px}.history-panel .tag-button .tag-name{margin-right:2px} -.dataset.hda{border:1px solid #bfbfbf}.dataset.hda .vertical-spacing{margin-bottom:8px} -.dataset.hda .info-section{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px} -.dataset.hda .dataset-padding{padding:6px 10px 6px 8px} -.dataset.hda [class$=messagesmall]{margin:6px 10px 2px 8px;font-size:90%} -.dataset.hda .help-text{font-weight:normal;color:#555} -.dataset.hda .dataset-selector{float:left;display:none;width:0px;margin:0 0 -6px 0;padding:5px 0 2px 8px;cursor:pointer;vertical-align:middle} -.dataset.hda .dataset-title-bar{cursor:pointer;outline:none;padding:6px 10px 6px 8px} -.dataset.hda .dataset-title-bar .dataset-title{display:inline;font-weight:bold;text-decoration:underline;word-wrap:break-word;word-break:break-all;line-height:16px} -.dataset.hda .dataset-primary-actions{display:inline-block;float:right;margin:6px 10px 0}.dataset.hda .dataset-primary-actions .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} -.dataset.hda .dataset-primary-actions .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} -.dataset.hda .dataset-primary-actions .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} -.dataset.hda .dataset-primary-actions .icon-btn{margin-left:2px} -.dataset.hda .dataset-body{display:none;padding:6px 10px 6px 8px}.dataset.hda .dataset-body [class$=messagesmall]{margin:0px 0px 8px 0px} -.dataset.hda .dataset-body label{margin:0px;padding:0px;font-weight:normal} -.dataset.hda .dataset-body .prompt{font-weight:normal;color:#555} -.dataset.hda .dataset-body .prompt:after{content:':'} -.dataset.hda .dataset-body .dataset-summary{margin-bottom:8px}.dataset.hda .dataset-body .dataset-summary .dataset-blurb{margin-bottom:2px} -.dataset.hda .dataset-body .dataset-summary .dataset-datatype,.dataset.hda .dataset-body .dataset-summary .dataset-dbkey{display:inline}.dataset.hda .dataset-body .dataset-summary .dataset-datatype .value,.dataset.hda .dataset-body .dataset-summary .dataset-dbkey .value{font-weight:bold} -.dataset.hda .dataset-body .dataset-summary .dataset-datatype .value:after{content:',';font-weight:normal;color:#555} -.dataset.hda .dataset-body .dataset-summary .dataset-dbkey:after{content:' ';display:block;margin-bottom:8px} -.dataset.hda .dataset-body .dataset-summary .dataset-info{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px}.dataset.hda .dataset-body .dataset-summary .dataset-info .value{white-space:pre-line} -.dataset.hda .dataset-body .dataset-summary .job-error-text{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;overflow:auto;white-space:pre} -.dataset.hda .dataset-body .dataset-actions .left{display:inline-block;float:left}.dataset.hda .dataset-body .dataset-actions .left .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} -.dataset.hda .dataset-body .dataset-actions .left .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} -.dataset.hda .dataset-body .dataset-actions .left .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} -.dataset.hda .dataset-body .dataset-actions .left .icon-btn{margin-right:2px} -.dataset.hda .dataset-body .dataset-actions .left:not(:empty){margin-bottom:8px} -.dataset.hda .dataset-body .dataset-actions .right{float:right}.dataset.hda .dataset-body .dataset-actions .right .icon-btn{margin-left:2px} -.dataset.hda .dataset-body .tags-display{display:none;margin-bottom:8px}.dataset.hda .dataset-body .tags-display .select2-container{min-width:0px}.dataset.hda .dataset-body .tags-display .select2-container .select2-choices{border-radius:3px} -.dataset.hda .dataset-body .annotation-display{display:none;margin-bottom:8px}.dataset.hda .dataset-body .annotation-display .annotation{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;white-space:pre-line} -.dataset.hda .dataset-body .annotation-display .annotation:empty{height:22px} -.dataset.hda .dataset-body .annotation-display .annotation:empty:after{position:relative;top:-4px;font-size:10px;font-style:italic;color:grey;content:'Click here to edit annotation'} -.dataset.hda .dataset-body .annotation-display textarea{margin:0px 0px 2px 0px;display:block;border-radius:3px;width:100%} -.dataset.hda .dataset-body .dataset-display-applications .display-application:last-child{margin-bottom:8px} -.dataset.hda .dataset-body .dataset-peek{margin-bottom:8px}.dataset.hda .dataset-body .dataset-peek pre.peek{width:100%;margin:0px;border-radius:3px;background:white;color:black;font-size:10px;overflow:auto}.dataset.hda .dataset-body .dataset-peek pre.peek th{color:white;background:#5f6990} -.dataset.hda .dataset-body .dataset-peek pre.peek table,.dataset.hda .dataset-body .dataset-peek pre.peek th,.dataset.hda .dataset-body .dataset-peek pre.peek tr,.dataset.hda .dataset-body .dataset-peek pre.peek td{font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:10px} -.dataset.hda .icon-btn-group{display:inline-block}.dataset.hda .icon-btn-group .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} -.dataset.hda .icon-btn-group .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} -.dataset.hda .icon-btn-group .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} -.dataset.hda .state-icon{font-family:FontAwesome;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;vertical-align:middle;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px} -.state-icon-error{background-color:white;border-radius:8px}.state-icon-error:before{font-size:20px;line-height:16px;color:red;content:"\f057"} .state-icon-running{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)} 100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)} 100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)} 100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)} 100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)} 100%{transform:rotate(359deg)}}.state-icon-running:before{content:"\f110"} .state-icon-upload{overflow:hidden}.state-icon-upload:before{display:inline-block;-webkit-animation:eclipse 2s infinite linear;-moz-animation:eclipse 2s infinite linear;-o-animation:eclipse 2s infinite linear;animation:eclipse 2s infinite linear;content:"\f062"}@-moz-keyframes eclipse{0%{-moz-transform:translate(0, 16px)} 100%{-moz-transform:translate(0, -16px)}}@-webkit-keyframes eclipse{0%{-webkit-transform:translate(0, 16px)} 100%{-webkit-transform:translate(0, -16px)}}@-o-keyframes eclipse{0%{-o-transform:translate(0, 16px)} 100%{-o-transform:translate(0, -16px)}}@-ms-keyframes eclipse{0%{-ms-transform:translate(0, 16px)} 100%{-ms-transform:translate(0, -16px)}}@keyframes eclipse{0%{transform:translate(0, 16px)} 100%{transform:translate(0, -16px)}} .dataset.state-ok,.dataset.state-failed_metadata{background:#aff1af}.dataset.state-ok .state-icon,.dataset.state-failed_metadata .state-icon{display:none} diff -r a66e4111ba2aeca52572d203e1713153a5ee293a -r ca4c4a24bd6a853993fc171394c0d2da75fc8829 static/style/src/less/history.less --- a/static/style/src/less/history.less +++ b/static/style/src/less/history.less @@ -98,6 +98,275 @@ } +// ---------------------------------------------------------------------------- datasets +//TODO: scope to history panels until embedded item .dataset is changed +.history-panel { + .dataset { + border: 1px solid @border-default-color; + + // body mixins + @vertical-gap: 8px; + .vertical-spacing { + margin-bottom: @vertical-gap; + } + .info-section { + border-radius: 3px; + border: 1px solid fadeout( @layout-border-color, 70% ); + //background-color: fadeout( white, 60% ); + padding: 4px; + } + @spacing-top : 6px; + @spacing-right : 10px; + @spacing-bottom : 6px; + @spacing-left : 8px; + .dataset-padding { + padding: @spacing-top @spacing-right @spacing-bottom @spacing-left; + } + + [class$=messagesmall] { + margin: @spacing-top @spacing-right ( @spacing-bottom - 4 ) @spacing-left; + font-size: 90%; + } + + .help-text { + font-weight: normal; + // font-style: italic; + // font-size: 90%; + color: #555; + } + + .dataset-selector { + float: left; + // always initially hidden and zero width + display: none; + width: 0px; + //HACK: neg. on the bottom due to padding-bottom in title-bar - very tweakish + margin: 0px 0px -@spacing-bottom 0px; + padding: ( @spacing-top - 1 ) 0px 2px @spacing-left; + cursor: pointer; + //text-align: center; + vertical-align: middle; + } + + .dataset-title-bar { + cursor: pointer; + outline: none; + .dataset-padding; + + .dataset-state-icon { + } + .dataset-title { + display: inline; + font-weight: bold; + text-decoration: underline; + word-wrap: break-word; + word-break: break-all; + line-height: 16px; + } + } + + .dataset-primary-actions { + .icon-btn-group(); + float: right; + margin: @spacing-top @spacing-right 0; + .icon-btn { + margin-left: @icon-btn-margin; + } + } + + .dataset-body { + display: none; + // background-color: fadeout( white, 70% ); + .dataset-padding; + + [class$=messagesmall] { + margin: 0px 0px 8px 0px; + } + + label { + margin: 0px; + padding: 0px; + font-weight: normal; + } + .prompt { + .help-text; + } + .prompt:after { + content: ':'; + } + + .dataset-summary { + .dataset-blurb { + margin-bottom: 2px; + } + .dataset-datatype, .dataset-dbkey { + display: inline; + .value { + font-weight: bold; + } + } + .dataset-datatype .value:after { + content: ','; + .help-text; + } + .dataset-dbkey:after { + content: ' '; + display: block; + .vertical-spacing; + } + .dataset-info { + .info-section; + .value { + white-space: pre-line; + } + } + + .job-error-text { + .info-section; + overflow: auto; + white-space: pre; + } + + // handle the last vertical gap in the parent as summary is used in other states as well (w/o info) + .vertical-spacing; + } + + .dataset-actions { + .left { + .icon-btn-group(); + float: left; + .icon-btn { + margin-right: @icon-btn-margin; + } + //.icon-btn-group { + // margin-right: @icon-btn-margin; + // .icon-btn { + // margin-right: 0; + // } + //} + &:not(:empty) { + // can't use :empty on dataset-actions - will always have left & right, so + // add gap to left (more likely to have children) + .vertical-spacing; + } + } + .right { + float: right; + .icon-btn { + margin-left: @icon-btn-margin; + } + } + } + + //TODO: move these out + .tags-display { + display: none; + .vertical-spacing; + .select2-container { + min-width: 0px; + .select2-choices { + border-radius: 3px; + } + } + } + .annotation-display { + display: none; + .vertical-spacing; + .annotation { + .info-section; + white-space: pre-line; + } + .annotation:empty { + height: @icon-btn-size; + } + // fake placeholder for editable text annotation + .annotation:empty:after { + position: relative; + top: -4px; + font-size: 10px; + font-style: italic; + color: grey; + content : 'Click here to edit annotation'; + } + textarea { + margin: 0px 0px 2px 0px; + display: block; + border-radius: 3px; + width: 100%; + } + } + + .dataset-display-applications { + .display-application:last-child { + .vertical-spacing; + } + } + + .dataset-peek { + .vertical-spacing; + pre.peek { + width: 100%; + margin: 0px; + border-radius: 3px; + background: white; + color: black; + font-size: 10px; + overflow: auto; + th { + color: white; + background: @panel-primary-heading-bg; + } + table, th, tr, td { + font-family: @font-family-monospace; + font-size: 10px; + } + } + } + } + + .icon-btn-group { + display: inline-block; + .icon-btn:not(:last-child) { + margin: 0px; + border-radius: 0px; + border-right: none; + } + .icon-btn:first-child { + margin-right: 0px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + } + .icon-btn:last-child { + margin-left: 0px; + border-radius: 0px 3px 3px 0px; + } + } + + } + + .dataset .state-icon { + .fa-icon; + display: inline-block; + vertical-align: middle; + width: 16px; + height: 16px; + line-height: 16px; + text-align: center; + font-size: 16px; + } +} + +.state-icon-error { + background-color: white; + border-radius: 8px; + &:before { + font-size: 20px; + line-height: 16px; + color: red; + content: @fa-var-times-circle; + } +} + // ---------------------------------------------------------------------------- history .history-panel { @@ -268,272 +537,6 @@ } } -// ---------------------------------------------------------------------------- datasets -.dataset.hda { - border: 1px solid @border-default-color; - - // body mixins - @vertical-gap: 8px; - .vertical-spacing { - margin-bottom: @vertical-gap; - } - .info-section { - border-radius: 3px; - border: 1px solid fadeout( @layout-border-color, 70% ); - //background-color: fadeout( white, 60% ); - padding: 4px; - } - @spacing-top : 6px; - @spacing-right : 10px; - @spacing-bottom : 6px; - @spacing-left : 8px; - .dataset-padding { - padding: @spacing-top @spacing-right @spacing-bottom @spacing-left; - } - - [class$=messagesmall] { - margin: @spacing-top @spacing-right ( @spacing-bottom - 4 ) @spacing-left; - font-size: 90%; - } - - .help-text { - font-weight: normal; - // font-style: italic; - // font-size: 90%; - color: #555; - } - - .dataset-selector { - float: left; - // always initially hidden and zero width - display: none; - width: 0px; - //HACK: neg. on the bottom due to padding-bottom in title-bar - very tweakish - margin: 0px 0px -@spacing-bottom 0px; - padding: ( @spacing-top - 1 ) 0px 2px @spacing-left; - cursor: pointer; - //text-align: center; - vertical-align: middle; - } - - .dataset-title-bar { - cursor: pointer; - outline: none; - .dataset-padding; - - .dataset-state-icon { - } - .dataset-title { - display: inline; - font-weight: bold; - text-decoration: underline; - word-wrap: break-word; - word-break: break-all; - line-height: 16px; - } - } - - .dataset-primary-actions { - .icon-btn-group(); - float: right; - margin: @spacing-top @spacing-right 0; - .icon-btn { - margin-left: @icon-btn-margin; - } - } - - .dataset-body { - display: none; - // background-color: fadeout( white, 70% ); - .dataset-padding; - - [class$=messagesmall] { - margin: 0px 0px 8px 0px; - } - - label { - margin: 0px; - padding: 0px; - font-weight: normal; - } - .prompt { - .help-text; - } - .prompt:after { - content: ':'; - } - - .dataset-summary { - .dataset-blurb { - margin-bottom: 2px; - } - .dataset-datatype, .dataset-dbkey { - display: inline; - .value { - font-weight: bold; - } - } - .dataset-datatype .value:after { - content: ','; - .help-text; - } - .dataset-dbkey:after { - content: ' '; - display: block; - .vertical-spacing; - } - .dataset-info { - .info-section; - .value { - white-space: pre-line; - } - } - - .job-error-text { - .info-section; - overflow: auto; - white-space: pre; - } - - // handle the last vertical gap in the parent as summary is used in other states as well (w/o info) - .vertical-spacing; - } - - .dataset-actions { - .left { - .icon-btn-group(); - float: left; - .icon-btn { - margin-right: @icon-btn-margin; - } - //.icon-btn-group { - // margin-right: @icon-btn-margin; - // .icon-btn { - // margin-right: 0; - // } - //} - &:not(:empty) { - // can't use :empty on dataset-actions - will always have left & right, so - // add gap to left (more likely to have children) - .vertical-spacing; - } - } - .right { - float: right; - .icon-btn { - margin-left: @icon-btn-margin; - } - } - } - - //TODO: move these out - .tags-display { - display: none; - .vertical-spacing; - .select2-container { - min-width: 0px; - .select2-choices { - border-radius: 3px; - } - } - } - .annotation-display { - display: none; - .vertical-spacing; - .annotation { - .info-section; - white-space: pre-line; - } - .annotation:empty { - height: @icon-btn-size; - } - // fake placeholder for editable text annotation - .annotation:empty:after { - position: relative; - top: -4px; - font-size: 10px; - font-style: italic; - color: grey; - content : 'Click here to edit annotation'; - } - textarea { - margin: 0px 0px 2px 0px; - display: block; - border-radius: 3px; - width: 100%; - } - } - - .dataset-display-applications { - .display-application:last-child { - .vertical-spacing; - } - } - - .dataset-peek { - .vertical-spacing; - pre.peek { - width: 100%; - margin: 0px; - border-radius: 3px; - background: white; - color: black; - font-size: 10px; - overflow: auto; - th { - color: white; - background: @panel-primary-heading-bg; - } - table, th, tr, td { - font-family: @font-family-monospace; - font-size: 10px; - } - } - } - } - - .icon-btn-group { - display: inline-block; - .icon-btn:not(:last-child) { - margin: 0px; - border-radius: 0px; - border-right: none; - } - .icon-btn:first-child { - margin-right: 0px; - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - } - .icon-btn:last-child { - margin-left: 0px; - border-radius: 0px 3px 3px 0px; - } - } - -} - -.dataset.hda .state-icon { - .fa-icon; - display: inline-block; - vertical-align: middle; - width: 16px; - height: 16px; - line-height: 16px; - text-align: center; - font-size: 16px; -} - -.state-icon-error { - background-color: white; - border-radius: 8px; - &:before { - font-size: 20px; - line-height: 16px; - color: red; - content: @fa-var-times-circle; - } -} - .state-icon-running { //TODO: couldn't find a way to do this with fa/spinning.less as mixin -webkit-animation: spin 2s infinite linear; https://bitbucket.org/galaxy/galaxy-central/commits/c6eac0859bf9/ Changeset: c6eac0859bf9 User: carlfeberhard Date: 2014-02-06 21:25:58 Summary: merge Affected #: 2 files diff -r 3db994bbb5794de782a824b5ea8b2220b99e97ec -r c6eac0859bf917c176ec5995bff92a25841a9420 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1574,6 +1574,47 @@ .search-input .search-clear,.search-input .search-loading{position:relative;display:inline-block;float:right;margin-top:-23px;margin-right:4px;font-size:1.4em;line-height:23px;color:grey} .search-input .search-clear:hover{color:#303030} #history-refresh-button,#history-options-button{display:inline-block;height:22px;width:22px;text-align:center;line-height:19px;font-size:1.2em;padding:0px} +.history-panel .dataset{border:1px solid #bfbfbf}.history-panel .dataset .vertical-spacing{margin-bottom:8px} +.history-panel .dataset .info-section{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px} +.history-panel .dataset .dataset-padding{padding:6px 10px 6px 8px} +.history-panel .dataset [class$=messagesmall]{margin:6px 10px 2px 8px;font-size:90%} +.history-panel .dataset .help-text{font-weight:normal;color:#555} +.history-panel .dataset .dataset-selector{float:left;display:none;width:0px;margin:0 0 -6px 0;padding:5px 0 2px 8px;cursor:pointer;vertical-align:middle} +.history-panel .dataset .dataset-title-bar{cursor:pointer;outline:none;padding:6px 10px 6px 8px} +.history-panel .dataset .dataset-title-bar .dataset-title{display:inline;font-weight:bold;text-decoration:underline;word-wrap:break-word;word-break:break-all;line-height:16px} +.history-panel .dataset .dataset-primary-actions{display:inline-block;float:right;margin:6px 10px 0}.history-panel .dataset .dataset-primary-actions .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} +.history-panel .dataset .dataset-primary-actions .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} +.history-panel .dataset .dataset-primary-actions .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} +.history-panel .dataset .dataset-primary-actions .icon-btn{margin-left:2px} +.history-panel .dataset .dataset-body{display:none;padding:6px 10px 6px 8px}.history-panel .dataset .dataset-body [class$=messagesmall]{margin:0px 0px 8px 0px} +.history-panel .dataset .dataset-body label{margin:0px;padding:0px;font-weight:normal} +.history-panel .dataset .dataset-body .prompt{font-weight:normal;color:#555} +.history-panel .dataset .dataset-body .prompt:after{content:':'} +.history-panel .dataset .dataset-body .dataset-summary{margin-bottom:8px}.history-panel .dataset .dataset-body .dataset-summary .dataset-blurb{margin-bottom:2px} +.history-panel .dataset .dataset-body .dataset-summary .dataset-datatype,.history-panel .dataset .dataset-body .dataset-summary .dataset-dbkey{display:inline}.history-panel .dataset .dataset-body .dataset-summary .dataset-datatype .value,.history-panel .dataset .dataset-body .dataset-summary .dataset-dbkey .value{font-weight:bold} +.history-panel .dataset .dataset-body .dataset-summary .dataset-datatype .value:after{content:',';font-weight:normal;color:#555} +.history-panel .dataset .dataset-body .dataset-summary .dataset-dbkey:after{content:' ';display:block;margin-bottom:8px} +.history-panel .dataset .dataset-body .dataset-summary .dataset-info{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px}.history-panel .dataset .dataset-body .dataset-summary .dataset-info .value{white-space:pre-line} +.history-panel .dataset .dataset-body .dataset-summary .job-error-text{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;overflow:auto;white-space:pre} +.history-panel .dataset .dataset-body .dataset-actions .left{display:inline-block;float:left}.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} +.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} +.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} +.history-panel .dataset .dataset-body .dataset-actions .left .icon-btn{margin-right:2px} +.history-panel .dataset .dataset-body .dataset-actions .left:not(:empty){margin-bottom:8px} +.history-panel .dataset .dataset-body .dataset-actions .right{float:right}.history-panel .dataset .dataset-body .dataset-actions .right .icon-btn{margin-left:2px} +.history-panel .dataset .dataset-body .tags-display{display:none;margin-bottom:8px}.history-panel .dataset .dataset-body .tags-display .select2-container{min-width:0px}.history-panel .dataset .dataset-body .tags-display .select2-container .select2-choices{border-radius:3px} +.history-panel .dataset .dataset-body .annotation-display{display:none;margin-bottom:8px}.history-panel .dataset .dataset-body .annotation-display .annotation{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;white-space:pre-line} +.history-panel .dataset .dataset-body .annotation-display .annotation:empty{height:22px} +.history-panel .dataset .dataset-body .annotation-display .annotation:empty:after{position:relative;top:-4px;font-size:10px;font-style:italic;color:grey;content:'Click here to edit annotation'} +.history-panel .dataset .dataset-body .annotation-display textarea{margin:0px 0px 2px 0px;display:block;border-radius:3px;width:100%} +.history-panel .dataset .dataset-body .dataset-display-applications .display-application:last-child{margin-bottom:8px} +.history-panel .dataset .dataset-body .dataset-peek{margin-bottom:8px}.history-panel .dataset .dataset-body .dataset-peek pre.peek{width:100%;margin:0px;border-radius:3px;background:white;color:black;font-size:10px;overflow:auto}.history-panel .dataset .dataset-body .dataset-peek pre.peek th{color:white;background:#5f6990} +.history-panel .dataset .dataset-body .dataset-peek pre.peek table,.history-panel .dataset .dataset-body .dataset-peek pre.peek th,.history-panel .dataset .dataset-body .dataset-peek pre.peek tr,.history-panel .dataset .dataset-body .dataset-peek pre.peek td{font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:10px} +.history-panel .dataset .icon-btn-group{display:inline-block}.history-panel .dataset .icon-btn-group .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} +.history-panel .dataset .icon-btn-group .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} +.history-panel .dataset .icon-btn-group .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} +.history-panel .dataset .state-icon{font-family:FontAwesome;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;vertical-align:middle;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px} +.state-icon-error{background-color:white;border-radius:8px}.state-icon-error:before{font-size:20px;line-height:16px;color:red;content:"\f057"} .history-panel [class$="messagesmall"]{margin:0px} .history-panel .editable-text{border:solid transparent 1px} .history-panel .editable-text:hover{cursor:pointer;border:1px dotted #999999} @@ -1605,47 +1646,6 @@ .history-panel .dataset:last-child{border-width:1px 0px 1px 0px} .history-panel .empty-history-message{display:none;margin:0px 10px 0px 10px} .history-panel .tag-button{display:inline-block;height:20px;margin:2px 2px 0px 0px;border:1px solid grey;border-radius:3px 10px 10px 3px;padding:2px 4px 2px 4px;background-color:#EEE;line-height:13px}.history-panel .tag-button .tag-name{margin-right:2px} -.dataset.hda{border:1px solid #bfbfbf}.dataset.hda .vertical-spacing{margin-bottom:8px} -.dataset.hda .info-section{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px} -.dataset.hda .dataset-padding{padding:6px 10px 6px 8px} -.dataset.hda [class$=messagesmall]{margin:6px 10px 2px 8px;font-size:90%} -.dataset.hda .help-text{font-weight:normal;color:#555} -.dataset.hda .dataset-selector{float:left;display:none;width:0px;margin:0 0 -6px 0;padding:5px 0 2px 8px;cursor:pointer;vertical-align:middle} -.dataset.hda .dataset-title-bar{cursor:pointer;outline:none;padding:6px 10px 6px 8px} -.dataset.hda .dataset-title-bar .dataset-title{display:inline;font-weight:bold;text-decoration:underline;word-wrap:break-word;word-break:break-all;line-height:16px} -.dataset.hda .dataset-primary-actions{display:inline-block;float:right;margin:6px 10px 0}.dataset.hda .dataset-primary-actions .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} -.dataset.hda .dataset-primary-actions .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} -.dataset.hda .dataset-primary-actions .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} -.dataset.hda .dataset-primary-actions .icon-btn{margin-left:2px} -.dataset.hda .dataset-body{display:none;padding:6px 10px 6px 8px}.dataset.hda .dataset-body [class$=messagesmall]{margin:0px 0px 8px 0px} -.dataset.hda .dataset-body label{margin:0px;padding:0px;font-weight:normal} -.dataset.hda .dataset-body .prompt{font-weight:normal;color:#555} -.dataset.hda .dataset-body .prompt:after{content:':'} -.dataset.hda .dataset-body .dataset-summary{margin-bottom:8px}.dataset.hda .dataset-body .dataset-summary .dataset-blurb{margin-bottom:2px} -.dataset.hda .dataset-body .dataset-summary .dataset-datatype,.dataset.hda .dataset-body .dataset-summary .dataset-dbkey{display:inline}.dataset.hda .dataset-body .dataset-summary .dataset-datatype .value,.dataset.hda .dataset-body .dataset-summary .dataset-dbkey .value{font-weight:bold} -.dataset.hda .dataset-body .dataset-summary .dataset-datatype .value:after{content:',';font-weight:normal;color:#555} -.dataset.hda .dataset-body .dataset-summary .dataset-dbkey:after{content:' ';display:block;margin-bottom:8px} -.dataset.hda .dataset-body .dataset-summary .dataset-info{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px}.dataset.hda .dataset-body .dataset-summary .dataset-info .value{white-space:pre-line} -.dataset.hda .dataset-body .dataset-summary .job-error-text{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;overflow:auto;white-space:pre} -.dataset.hda .dataset-body .dataset-actions .left{display:inline-block;float:left}.dataset.hda .dataset-body .dataset-actions .left .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} -.dataset.hda .dataset-body .dataset-actions .left .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} -.dataset.hda .dataset-body .dataset-actions .left .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} -.dataset.hda .dataset-body .dataset-actions .left .icon-btn{margin-right:2px} -.dataset.hda .dataset-body .dataset-actions .left:not(:empty){margin-bottom:8px} -.dataset.hda .dataset-body .dataset-actions .right{float:right}.dataset.hda .dataset-body .dataset-actions .right .icon-btn{margin-left:2px} -.dataset.hda .dataset-body .tags-display{display:none;margin-bottom:8px}.dataset.hda .dataset-body .tags-display .select2-container{min-width:0px}.dataset.hda .dataset-body .tags-display .select2-container .select2-choices{border-radius:3px} -.dataset.hda .dataset-body .annotation-display{display:none;margin-bottom:8px}.dataset.hda .dataset-body .annotation-display .annotation{border-radius:3px;border:1px solid rgba(153,153,153,0.30000000000000004);padding:4px;white-space:pre-line} -.dataset.hda .dataset-body .annotation-display .annotation:empty{height:22px} -.dataset.hda .dataset-body .annotation-display .annotation:empty:after{position:relative;top:-4px;font-size:10px;font-style:italic;color:grey;content:'Click here to edit annotation'} -.dataset.hda .dataset-body .annotation-display textarea{margin:0px 0px 2px 0px;display:block;border-radius:3px;width:100%} -.dataset.hda .dataset-body .dataset-display-applications .display-application:last-child{margin-bottom:8px} -.dataset.hda .dataset-body .dataset-peek{margin-bottom:8px}.dataset.hda .dataset-body .dataset-peek pre.peek{width:100%;margin:0px;border-radius:3px;background:white;color:black;font-size:10px;overflow:auto}.dataset.hda .dataset-body .dataset-peek pre.peek th{color:white;background:#5f6990} -.dataset.hda .dataset-body .dataset-peek pre.peek table,.dataset.hda .dataset-body .dataset-peek pre.peek th,.dataset.hda .dataset-body .dataset-peek pre.peek tr,.dataset.hda .dataset-body .dataset-peek pre.peek td{font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:10px} -.dataset.hda .icon-btn-group{display:inline-block}.dataset.hda .icon-btn-group .icon-btn:not(:last-child){margin:0px;border-radius:0px;border-right:none} -.dataset.hda .icon-btn-group .icon-btn:first-child{margin-right:0px;border-top-left-radius:3px;border-bottom-left-radius:3px} -.dataset.hda .icon-btn-group .icon-btn:last-child{margin-left:0px;border-radius:0px 3px 3px 0px} -.dataset.hda .state-icon{font-family:FontAwesome;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;vertical-align:middle;width:16px;height:16px;line-height:16px;text-align:center;font-size:16px} -.state-icon-error{background-color:white;border-radius:8px}.state-icon-error:before{font-size:20px;line-height:16px;color:red;content:"\f057"} .state-icon-running{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)} 100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)} 100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)} 100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)} 100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)} 100%{transform:rotate(359deg)}}.state-icon-running:before{content:"\f110"} .state-icon-upload{overflow:hidden}.state-icon-upload:before{display:inline-block;-webkit-animation:eclipse 2s infinite linear;-moz-animation:eclipse 2s infinite linear;-o-animation:eclipse 2s infinite linear;animation:eclipse 2s infinite linear;content:"\f062"}@-moz-keyframes eclipse{0%{-moz-transform:translate(0, 16px)} 100%{-moz-transform:translate(0, -16px)}}@-webkit-keyframes eclipse{0%{-webkit-transform:translate(0, 16px)} 100%{-webkit-transform:translate(0, -16px)}}@-o-keyframes eclipse{0%{-o-transform:translate(0, 16px)} 100%{-o-transform:translate(0, -16px)}}@-ms-keyframes eclipse{0%{-ms-transform:translate(0, 16px)} 100%{-ms-transform:translate(0, -16px)}}@keyframes eclipse{0%{transform:translate(0, 16px)} 100%{transform:translate(0, -16px)}} .dataset.state-ok,.dataset.state-failed_metadata{background:#aff1af}.dataset.state-ok .state-icon,.dataset.state-failed_metadata .state-icon{display:none} diff -r 3db994bbb5794de782a824b5ea8b2220b99e97ec -r c6eac0859bf917c176ec5995bff92a25841a9420 static/style/src/less/history.less --- a/static/style/src/less/history.less +++ b/static/style/src/less/history.less @@ -98,6 +98,275 @@ } +// ---------------------------------------------------------------------------- datasets +//TODO: scope to history panels until embedded item .dataset is changed +.history-panel { + .dataset { + border: 1px solid @border-default-color; + + // body mixins + @vertical-gap: 8px; + .vertical-spacing { + margin-bottom: @vertical-gap; + } + .info-section { + border-radius: 3px; + border: 1px solid fadeout( @layout-border-color, 70% ); + //background-color: fadeout( white, 60% ); + padding: 4px; + } + @spacing-top : 6px; + @spacing-right : 10px; + @spacing-bottom : 6px; + @spacing-left : 8px; + .dataset-padding { + padding: @spacing-top @spacing-right @spacing-bottom @spacing-left; + } + + [class$=messagesmall] { + margin: @spacing-top @spacing-right ( @spacing-bottom - 4 ) @spacing-left; + font-size: 90%; + } + + .help-text { + font-weight: normal; + // font-style: italic; + // font-size: 90%; + color: #555; + } + + .dataset-selector { + float: left; + // always initially hidden and zero width + display: none; + width: 0px; + //HACK: neg. on the bottom due to padding-bottom in title-bar - very tweakish + margin: 0px 0px -@spacing-bottom 0px; + padding: ( @spacing-top - 1 ) 0px 2px @spacing-left; + cursor: pointer; + //text-align: center; + vertical-align: middle; + } + + .dataset-title-bar { + cursor: pointer; + outline: none; + .dataset-padding; + + .dataset-state-icon { + } + .dataset-title { + display: inline; + font-weight: bold; + text-decoration: underline; + word-wrap: break-word; + word-break: break-all; + line-height: 16px; + } + } + + .dataset-primary-actions { + .icon-btn-group(); + float: right; + margin: @spacing-top @spacing-right 0; + .icon-btn { + margin-left: @icon-btn-margin; + } + } + + .dataset-body { + display: none; + // background-color: fadeout( white, 70% ); + .dataset-padding; + + [class$=messagesmall] { + margin: 0px 0px 8px 0px; + } + + label { + margin: 0px; + padding: 0px; + font-weight: normal; + } + .prompt { + .help-text; + } + .prompt:after { + content: ':'; + } + + .dataset-summary { + .dataset-blurb { + margin-bottom: 2px; + } + .dataset-datatype, .dataset-dbkey { + display: inline; + .value { + font-weight: bold; + } + } + .dataset-datatype .value:after { + content: ','; + .help-text; + } + .dataset-dbkey:after { + content: ' '; + display: block; + .vertical-spacing; + } + .dataset-info { + .info-section; + .value { + white-space: pre-line; + } + } + + .job-error-text { + .info-section; + overflow: auto; + white-space: pre; + } + + // handle the last vertical gap in the parent as summary is used in other states as well (w/o info) + .vertical-spacing; + } + + .dataset-actions { + .left { + .icon-btn-group(); + float: left; + .icon-btn { + margin-right: @icon-btn-margin; + } + //.icon-btn-group { + // margin-right: @icon-btn-margin; + // .icon-btn { + // margin-right: 0; + // } + //} + &:not(:empty) { + // can't use :empty on dataset-actions - will always have left & right, so + // add gap to left (more likely to have children) + .vertical-spacing; + } + } + .right { + float: right; + .icon-btn { + margin-left: @icon-btn-margin; + } + } + } + + //TODO: move these out + .tags-display { + display: none; + .vertical-spacing; + .select2-container { + min-width: 0px; + .select2-choices { + border-radius: 3px; + } + } + } + .annotation-display { + display: none; + .vertical-spacing; + .annotation { + .info-section; + white-space: pre-line; + } + .annotation:empty { + height: @icon-btn-size; + } + // fake placeholder for editable text annotation + .annotation:empty:after { + position: relative; + top: -4px; + font-size: 10px; + font-style: italic; + color: grey; + content : 'Click here to edit annotation'; + } + textarea { + margin: 0px 0px 2px 0px; + display: block; + border-radius: 3px; + width: 100%; + } + } + + .dataset-display-applications { + .display-application:last-child { + .vertical-spacing; + } + } + + .dataset-peek { + .vertical-spacing; + pre.peek { + width: 100%; + margin: 0px; + border-radius: 3px; + background: white; + color: black; + font-size: 10px; + overflow: auto; + th { + color: white; + background: @panel-primary-heading-bg; + } + table, th, tr, td { + font-family: @font-family-monospace; + font-size: 10px; + } + } + } + } + + .icon-btn-group { + display: inline-block; + .icon-btn:not(:last-child) { + margin: 0px; + border-radius: 0px; + border-right: none; + } + .icon-btn:first-child { + margin-right: 0px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + } + .icon-btn:last-child { + margin-left: 0px; + border-radius: 0px 3px 3px 0px; + } + } + + } + + .dataset .state-icon { + .fa-icon; + display: inline-block; + vertical-align: middle; + width: 16px; + height: 16px; + line-height: 16px; + text-align: center; + font-size: 16px; + } +} + +.state-icon-error { + background-color: white; + border-radius: 8px; + &:before { + font-size: 20px; + line-height: 16px; + color: red; + content: @fa-var-times-circle; + } +} + // ---------------------------------------------------------------------------- history .history-panel { @@ -268,272 +537,6 @@ } } -// ---------------------------------------------------------------------------- datasets -.dataset.hda { - border: 1px solid @border-default-color; - - // body mixins - @vertical-gap: 8px; - .vertical-spacing { - margin-bottom: @vertical-gap; - } - .info-section { - border-radius: 3px; - border: 1px solid fadeout( @layout-border-color, 70% ); - //background-color: fadeout( white, 60% ); - padding: 4px; - } - @spacing-top : 6px; - @spacing-right : 10px; - @spacing-bottom : 6px; - @spacing-left : 8px; - .dataset-padding { - padding: @spacing-top @spacing-right @spacing-bottom @spacing-left; - } - - [class$=messagesmall] { - margin: @spacing-top @spacing-right ( @spacing-bottom - 4 ) @spacing-left; - font-size: 90%; - } - - .help-text { - font-weight: normal; - // font-style: italic; - // font-size: 90%; - color: #555; - } - - .dataset-selector { - float: left; - // always initially hidden and zero width - display: none; - width: 0px; - //HACK: neg. on the bottom due to padding-bottom in title-bar - very tweakish - margin: 0px 0px -@spacing-bottom 0px; - padding: ( @spacing-top - 1 ) 0px 2px @spacing-left; - cursor: pointer; - //text-align: center; - vertical-align: middle; - } - - .dataset-title-bar { - cursor: pointer; - outline: none; - .dataset-padding; - - .dataset-state-icon { - } - .dataset-title { - display: inline; - font-weight: bold; - text-decoration: underline; - word-wrap: break-word; - word-break: break-all; - line-height: 16px; - } - } - - .dataset-primary-actions { - .icon-btn-group(); - float: right; - margin: @spacing-top @spacing-right 0; - .icon-btn { - margin-left: @icon-btn-margin; - } - } - - .dataset-body { - display: none; - // background-color: fadeout( white, 70% ); - .dataset-padding; - - [class$=messagesmall] { - margin: 0px 0px 8px 0px; - } - - label { - margin: 0px; - padding: 0px; - font-weight: normal; - } - .prompt { - .help-text; - } - .prompt:after { - content: ':'; - } - - .dataset-summary { - .dataset-blurb { - margin-bottom: 2px; - } - .dataset-datatype, .dataset-dbkey { - display: inline; - .value { - font-weight: bold; - } - } - .dataset-datatype .value:after { - content: ','; - .help-text; - } - .dataset-dbkey:after { - content: ' '; - display: block; - .vertical-spacing; - } - .dataset-info { - .info-section; - .value { - white-space: pre-line; - } - } - - .job-error-text { - .info-section; - overflow: auto; - white-space: pre; - } - - // handle the last vertical gap in the parent as summary is used in other states as well (w/o info) - .vertical-spacing; - } - - .dataset-actions { - .left { - .icon-btn-group(); - float: left; - .icon-btn { - margin-right: @icon-btn-margin; - } - //.icon-btn-group { - // margin-right: @icon-btn-margin; - // .icon-btn { - // margin-right: 0; - // } - //} - &:not(:empty) { - // can't use :empty on dataset-actions - will always have left & right, so - // add gap to left (more likely to have children) - .vertical-spacing; - } - } - .right { - float: right; - .icon-btn { - margin-left: @icon-btn-margin; - } - } - } - - //TODO: move these out - .tags-display { - display: none; - .vertical-spacing; - .select2-container { - min-width: 0px; - .select2-choices { - border-radius: 3px; - } - } - } - .annotation-display { - display: none; - .vertical-spacing; - .annotation { - .info-section; - white-space: pre-line; - } - .annotation:empty { - height: @icon-btn-size; - } - // fake placeholder for editable text annotation - .annotation:empty:after { - position: relative; - top: -4px; - font-size: 10px; - font-style: italic; - color: grey; - content : 'Click here to edit annotation'; - } - textarea { - margin: 0px 0px 2px 0px; - display: block; - border-radius: 3px; - width: 100%; - } - } - - .dataset-display-applications { - .display-application:last-child { - .vertical-spacing; - } - } - - .dataset-peek { - .vertical-spacing; - pre.peek { - width: 100%; - margin: 0px; - border-radius: 3px; - background: white; - color: black; - font-size: 10px; - overflow: auto; - th { - color: white; - background: @panel-primary-heading-bg; - } - table, th, tr, td { - font-family: @font-family-monospace; - font-size: 10px; - } - } - } - } - - .icon-btn-group { - display: inline-block; - .icon-btn:not(:last-child) { - margin: 0px; - border-radius: 0px; - border-right: none; - } - .icon-btn:first-child { - margin-right: 0px; - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - } - .icon-btn:last-child { - margin-left: 0px; - border-radius: 0px 3px 3px 0px; - } - } - -} - -.dataset.hda .state-icon { - .fa-icon; - display: inline-block; - vertical-align: middle; - width: 16px; - height: 16px; - line-height: 16px; - text-align: center; - font-size: 16px; -} - -.state-icon-error { - background-color: white; - border-radius: 8px; - &:before { - font-size: 20px; - line-height: 16px; - color: red; - content: @fa-var-times-circle; - } -} - .state-icon-running { //TODO: couldn't find a way to do this with fa/spinning.less as mixin -webkit-animation: spin 2s infinite linear; 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.