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

Client build: update style tools: grunt-contrib-less to 1.0, grunt-spritesmith to 4.7, fixes NameError with grunt style on node > 0.10, update galaxy_bootstrap/variables for different(?) lighten/saturate

Browse Source
This commit is contained in:
Carl Eberhard
2015-07-17 09:18:04 -04:00
parent 223583470b
commit 9e2e909d3e
16 changed files with 49 additions and 2647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/style/less/base.less
+3 -6
View File
@@ -1447,9 +1447,6 @@ div.permissionContainer {
}
// ============================================================================ History
@import "sprite-history-states.less";
@import "sprite-history-buttons.less";
@import "ui/icon-btn.less";
@import "list-item.less";
@import "history.less";
@@ -1628,7 +1625,7 @@ div.toolTitleNoSection
.sprite(@tags);
}
.icon-button.tag--plus {
.sprite(@tag--plus);
.sprite(@tag-plus);
}
.icon-button.toggle-expand {
.sprite(@toggle-expand);
@@ -1676,10 +1673,10 @@ div.toolTitleNoSection
.sprite(@chart);
}
.icon-button.disk--arrow {
.sprite(@disk--arrow-bw);
.sprite(@disk-arrow-bw);
}
.icon-button.disk--arrow:hover {
.sprite(@disk--arrow);
.sprite(@disk-arrow);
}
.icon-button.cross-circle {
.sprite(@cross-circle-bw);
client/galaxy/style/less/galaxy_bootstrap/variables.less
+7 -7
View File
@@ -15,13 +15,13 @@
// Default border bolor, this is between gray-light and gray-lighter -- classic Galaxy border color
@border-default-color: lighten(black, 75%);
// When making borders for components with other colors, how much to darken
// When making borders for components with other colors, how much to darken
@border-darken-percent: 40%;
// For making state colors, how much to darken and lighten
@state-text-darken-percent: 15%;
@state-bg-lighten-percent: 40%;
@state-bg-saturate-percent: 30%;
@state-bg-lighten-percent: 66%;
@state-bg-saturate-percent: 22%;
// Why bootstrap stopped defining these as variables I don't know
@white: #fff;
@@ -422,19 +422,19 @@
// -------------------------
@state-warning-text: darken(@brand-warning, @state-text-darken-percent);
@state-warning-bg: saturate(lighten(@brand-warning, @state-bg-lighten-percent),@state-bg-saturate-percent);
@state-warning-bg: saturate(lighten(@brand-warning, @state-bg-lighten-percent),@state-bg-saturate-percent, relative);
@state-warning-border: darken(@state-warning-bg, @border-darken-percent);
@state-danger-text: darken(@brand-danger, @state-text-darken-percent);
@state-danger-bg: saturate(lighten(@brand-danger, @state-bg-lighten-percent),@state-bg-saturate-percent);
@state-danger-bg: saturate(lighten(@brand-danger, @state-bg-lighten-percent),@state-bg-saturate-percent, relative);
@state-danger-border: darken(@state-danger-bg, @border-darken-percent);
@state-success-text: darken(@brand-success, @state-text-darken-percent);
@state-success-bg: saturate(lighten(@brand-success, @state-bg-lighten-percent),@state-bg-saturate-percent);
@state-success-bg: saturate(lighten(@brand-success, @state-bg-lighten-percent, relative),@state-bg-saturate-percent, relative);
@state-success-border: darken(@state-success-bg, @border-darken-percent);
@state-info-text: darken(@brand-info, @state-text-darken-percent);
@state-info-bg: saturate(lighten(@brand-info, @state-bg-lighten-percent),@state-bg-saturate-percent);
@state-info-bg: saturate(lighten(@brand-info, @state-bg-lighten-percent),@state-bg-saturate-percent, relative);
@state-info-border: darken(@state-info-bg, @border-darken-percent);
client/galaxy/style/less/history.less
+15 -12
View File
@@ -1,3 +1,6 @@
@import "sprite-history-states.less";
@import "sprite-history-buttons.less";
// ---------------------------------------------------------------------------- panel header buttons
.history-panel-header {
.panel-header-button {
@@ -862,14 +865,14 @@ div.historyItem-failed_metadata {
div.historyItem-error {
background: @state-danger-bg;
.state-icon {
.sprite(@data_error);
.sprite(@data-error);
}
}
div.historyItem-empty {
background: @state-danger-bg;
.state-icon {
.sprite(@data_empty);
.sprite(@data-empty);
}
}
@@ -897,7 +900,7 @@ div.historyItem-upload {
div.historyItem-queued {
background: @state-default-bg;
.state-icon {
.sprite(@data_queued);
.sprite(@data-queued);
}
}
@@ -945,31 +948,31 @@ div.historyItemButtons {
float: right;
.icon-button.display {
.sprite(@eye_icon);
.sprite(@eye-icon);
}
.icon-button.display:hover {
.sprite(@eye_icon_dark);
.sprite(@eye-icon-dark);
}
.icon-button.display_disabled {
.sprite(@eye_icon_grey);
.sprite(@eye-icon-grey);
}
.icon-button.delete {
.sprite(@delete_icon);
.sprite(@delete-icon);
}
.icon-button.delete:hover {
.sprite(@delete_icon_dark);
.sprite(@delete-icon-dark);
}
.icon-button.delete_disabled {
.sprite(@delete_icon_grey);
.sprite(@delete-icon-grey);
}
.icon-button.edit {
.sprite(@pencil_icon);
.sprite(@pencil-icon);
}
.icon-button.edit:hover {
.sprite(@pencil_icon_dark);
.sprite(@pencil-icon-dark);
}
.icon-button.edit_disabled {
.sprite(@pencil_icon_grey);
.sprite(@pencil-icon-grey);
}
}
client/grunt-tasks/style.js
+11 -8
View File
@@ -31,21 +31,21 @@ module.exports = function( grunt ){
},
'history-buttons': {
src: fmt( '%s/history-buttons/*.png', imagesPath ),
destImg: fmt( '%s/sprite-history-buttons.png', styleDistPath ),
dest: fmt( '%s/sprite-history-buttons.png', styleDistPath ),
imgPath: fmt( 'sprite-history-buttons.png' ),
destCSS: fmt( '%s/sprite-history-buttons.less', lessPath )
destCss: fmt( '%s/sprite-history-buttons.less', lessPath )
},
'history-states': {
src: fmt( '%s/history-states/*.png', imagesPath ),
destImg: fmt( '%s/sprite-history-states.png', styleDistPath ),
dest: fmt( '%s/sprite-history-states.png', styleDistPath ),
imgPath: fmt( 'sprite-history-states.png' ),
destCSS: fmt( '%s/sprite-history-states.less', lessPath )
destCss: fmt( '%s/sprite-history-states.less', lessPath )
},
'fugue': {
src: fmt( '%s/fugue/*.png', imagesPath ),
destImg: fmt( '%s/sprite-fugue.png', styleDistPath ),
dest: fmt( '%s/sprite-fugue.png', styleDistPath ),
imgPath: fmt( 'sprite-fugue.png' ),
destCSS: fmt( '%s/sprite-fugue.less', lessPath )
destCss: fmt( '%s/sprite-fugue.less', lessPath )
}
});
@@ -53,11 +53,14 @@ module.exports = function( grunt ){
grunt.config( 'less', {
options: {
compress: true,
paths: [ styleDistPath ]
paths: [ lessPath ],
strictImports: true
},
dist: {
files: _.reduce( lessFiles, function( d, s ) {
d[ fmt( '%s/%s.css', styleDistPath, s ) ] = [ fmt( '%s/%s.less', lessPath, s ) ]; return d;
var output = fmt( '%s/%s.css', styleDistPath, s ),
input = fmt( '%s/%s.less', lessPath, s );
d[ output ] = [ input ]; return d;
}, {} )
}
});
client/package.json
+2 -2
View File
@@ -11,11 +11,11 @@
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-less": "~0.7.0",
"grunt-contrib-less": "^1.0.1",
"grunt-contrib-uglify": "^0.8.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-exec": "^0.4.6",
"grunt-spritesmith": "~1.7.0",
"grunt-spritesmith": "^4.7.1",
"grunt-webpack": "^1.0.8",
"i18n-webpack-plugin": "^0.2.7",
"webpack": "^1.5.1",
static/style/blue/autocomplete_tagging.css
+1 -21
View File
@@ -1,21 +1 @@
.ac_results{padding:0px;border:1px solid black;background-color:white;overflow:hidden;z-index:99999}
.ac_results ul{width:100%;list-style-position:outside;list-style:none;padding:0;margin:0}
.ac_results li{padding:2px 5px;cursor:default;display:block;font-size:12px;line-height:16px;overflow:hidden}
.ac_loading{background:#fff url('indicator.gif') right center no-repeat}
.ac_odd{background-color:#fff;margin-left:0.3em}
.ac_even{margin-left:0.3em}
.ac_over{background-color:#0A246A;color:white}
.ac_header{font-style:normal;color:gray;border-bottom:0.1em solid gray}
.tag-area{width:100%}
.individual-tag-area{cursor:pointer;border:1px dotted transparent}
.individual-tag-area:hover{border:1px dotted #999999}
.active-tag-area{background-color:white}
.toggle-link{font-weight:normal;padding:0.3em;margin-bottom:1em;width:100%;padding:0.2em 0em 0.2em 0em}
.tag-button{width:auto;color:#444;text-decoration:none;display:inline-block;cursor:pointer;margin:0.2em;border:solid #bbb 1px;padding:0.1em 0.5em 0.1em 0.5em;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;background:#eee}
.tag-button img{padding-left:0.4em}
.tag-button .tag-name:hover{color:black}
.add-tag-button{margin-bottom:0.3em;vertical-align:middle;padding:0.3em}
.add-tag-button:hover{cursor:pointer}
.tag-input{vertical-align:bottom;border:none;outline:none;resize:none}
.delete-tag-img{margin-left:0.3em}
.active-tag-name{font-weight:bold}
.ac_results{padding:0;border:1px solid black;background-color:white;overflow:hidden;z-index:99999}.ac_results ul{width:100%;list-style-position:outside;list-style:none;padding:0;margin:0}.ac_results li{padding:2px 5px;cursor:default;display:block;font-size:12px;line-height:16px;overflow:hidden}.ac_loading{background:white url('indicator.gif') right center no-repeat}.ac_odd{background-color:#fff;margin-left:.3em}.ac_even{margin-left:.3em}.ac_over{background-color:#0a246a;color:white}.ac_header{font-style:normal;color:gray;border-bottom:.1em solid gray}.tag-area{width:100%}.individual-tag-area{cursor:pointer;border:1px dotted transparent}.individual-tag-area:hover{border:1px dotted #999}.active-tag-area{background-color:white}.toggle-link{font-weight:normal;padding:.3em;margin-bottom:1em;width:100%;padding:.2em 0 .2em 0}.tag-button{width:auto;color:#444;text-decoration:none;display:inline-block;cursor:pointer;margin:.2em;border:solid #bbb 1px;padding:.1em .5em .1em .5em;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em;background:#eee}.tag-button img{padding-left:.4em}.tag-button .tag-name:hover{color:black}.add-tag-button{margin-bottom:.3em;vertical-align:middle;padding:.3em}.add-tag-button:hover{cursor:pointer}.tag-input{vertical-align:bottom;border:none;outline:none;resize:none}.delete-tag-img{margin-left:.3em}.active-tag-name{font-weight:bold}
static/style/blue/base.css
+4 -2379
View File
File diff suppressed because one or more lines are too long
static/style/blue/circster.css
+1 -2
View File
@@ -1,2 +1 @@
.chrom-label{font-size:80%}
.tick{font-size:80%}
.chrom-label{font-size:80%}.tick{font-size:80%}
static/style/blue/embed_item.css
+1 -14
View File
@@ -1,14 +1 @@
.embedded-item{margin:0em auto;width:90%;-moz-border-radius:0.5em;-webkit-border-radius:0.5em;border-radius:0.5em}.embedded-item .expanded-content{display:none;background-color:white}
.embedded-item .item-content{max-height:45em;overflow:auto}
.embedded-item>.title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:5px}
.embedded-item.placeholder .content{padding:0.5em 0.5em;font-style:italic;text-align:center}
.embedded-item p{background:inherit;margin-top:0;margin-bottom:0}
.embedded-item table.annotated-item{width:100%;border-collapse:collapse}
.embedded-item table.annotated-item td,.embedded-item th{padding:0}
.embedded-item table.annotated-item .annotation{padding-left:2em;width:40%}
.embedded-item table.annotated-item td.annotation{vertical-align:text-top;padding-top:1em}
.embedded-item.display{padding:5px 10px 10px 10px}
.embedded-item.history{background-color:#C1C9E5}
.embedded-item.dataset{background-color:#CFC}.embedded-item.dataset .item-content{padding:5px}
.embedded-item.workflow{background-color:#FBDDB3}.embedded-item.workflow .item-content{padding:5px}
.embedded-item.visualization{background-color:#BBBBBB}.embedded-item.visualization .item-content{overflow:hidden;height:100%}.embedded-item.visualization .item-content iframe{min-height:320px;margin-bottom:-4px}
.embedded-item{margin:0 auto;width:90%;-moz-border-radius:.5em;-webkit-border-radius:.5em;border-radius:.5em}.embedded-item .expanded-content{display:none;background-color:white}.embedded-item .item-content{max-height:45em;overflow:auto}.embedded-item>.title{vertical-align:top;text-align:center;font-weight:bold;padding-bottom:5px}.embedded-item.placeholder .content{padding:.5em .5em;font-style:italic;text-align:center}.embedded-item p{background:inherit;margin-top:0;margin-bottom:0}.embedded-item table.annotated-item{width:100%;border-collapse:collapse}.embedded-item table.annotated-item td,.embedded-item th{padding:0}.embedded-item table.annotated-item .annotation{padding-left:2em;width:40%}.embedded-item table.annotated-item td.annotation{vertical-align:text-top;padding-top:1em}.embedded-item.display{padding:5px 10px 10px 10px}.embedded-item.history{background-color:#c1c9e5}.embedded-item.dataset{background-color:#cfc}.embedded-item.dataset .item-content{padding:5px}.embedded-item.workflow{background-color:#fbddb3}.embedded-item.workflow .item-content{padding:5px}.embedded-item.visualization{background-color:#bbb}.embedded-item.visualization .item-content{overflow:hidden;height:100%}.embedded-item.visualization .item-content iframe{min-height:320px;margin-bottom:-4px}
static/style/blue/iphone.css
+1 -55
View File
File diff suppressed because one or more lines are too long
static/style/blue/library.css
+1 -46
View File
@@ -1,46 +1 @@
a{text-decoration:underline}
label{font-weight:normal}
.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}
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:1em}#library_toolbar span{margin-right:0.2em}
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 #dd1c15;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 #aa6;background:#ffc}
.libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #1197c0;background:#a6e4f7}
.pagination-sm{height:15px}
.library-paginator{margin-left:2em}
a{text-decoration:underline}label{font-weight:normal}.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}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:1em}#library_toolbar span{margin-right:.2em}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 #da2520;background:#f8cfce}.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 #aa6;background:#ffc}.libraryItem-upload{margin-right:2px;padding:0 2px 0 2px;border:1px solid #1992b6;background:#a8e2f3}.pagination-sm{height:15px}.library-paginator{margin-left:2em}
static/style/blue/masthead.css
+1 -10
View File
@@ -1,10 +1 @@
a{text-decoration:underline}
label{font-weight:normal}
body{background:#2c3143;color:#999;padding:0;border:0;margin:3px;margin-right:5px;margin-left:5px;overflow:hidden}
div.pageTitle{font-size:175%;font-weight:bold}
div.pageTitle a:link,div.pageTitle a:visited,div.pageTitle a:active,div.pageTitle a:hover{text-decoration:none}
a:link,a:visited,a:active{color:$masthead_link}
#tab-bar-bottom{z-index:-1;position:absolute;top:27px;left:0;width:100%;height:100%;background:#181a24}
span.link-group{margin:0;padding:0;display:inline;padding-bottom:10px;margin-bottom:-10px}
span.link-group span{margin:0;padding:0;display:inline}
span.link-group span.active-link{background:#181a24;padding-left:3px;padding-right:3px;margin-left:-3px;margin-right:-3px;padding-bottom:10px;margin-bottom:-10px}
a{text-decoration:underline}label{font-weight:normal}body{background:#2c3143;color:#999;padding:0;border:0;margin:3px;margin-right:5px;margin-left:5px;overflow:hidden}div.pageTitle{font-size:175%;font-weight:bold}div.pageTitle a:link,div.pageTitle a:visited,div.pageTitle a:active,div.pageTitle a:hover{text-decoration:none}a:link,a:visited,a:active{color:$masthead_link}#tab-bar-bottom{z-index:-1;position:absolute;top:27px;left:0;width:100%;height:100%;background:#181a24}span.link-group{margin:0;padding:0;display:inline;padding-bottom:10px;margin-bottom:-10px}span.link-group span{margin:0;padding:0;display:inline}span.link-group span.active-link{background:#181a24;padding-left:3px;padding-right:3px;margin-left:-3px;margin-right:-3px;padding-bottom:10px;margin-bottom:-10px}
static/style/blue/sprite-fugue.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 31 KiB

static/style/blue/sprite-history-buttons.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

static/style/blue/sprite-history-states.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

static/style/blue/trackster.css
+1 -85
View File
File diff suppressed because one or more lines are too long