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 #527 from carlfeberhard/style-colors

Browse Source 
Fix to 9e2e909: revert saturate/lighten changes, use backwards compat…
This commit is contained in:
Dannon Baker
2015-07-30 08:36:24 -04:00
parent cf011d652b 87a58e2d43
commit ed29f74147
4 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/style/less/galaxy_bootstrap/variables.less
+34 -15
View File
@@ -20,8 +20,8 @@
// For making state colors, how much to darken and lighten
@state-text-darken-percent: 15%;
@state-bg-lighten-percent: 66%;
@state-bg-saturate-percent: 22%;
@state-bg-lighten-percent: 40%;
@state-bg-saturate-percent: 30%;
// Why bootstrap stopped defining these as variables I don't know
@white: #fff;
@@ -29,16 +29,16 @@
// Bootstrap default colors for states, will be adjusted based on @base-color
@bs-primary: #428bca;
@bs-info: #5bc0de;
@bs-primary: #428bca;
@bs-success: #5cb85c;
@bs-warning: #f0ad4e;
@bs-danger: #d9534f;
@bs-info: #5bc0de;
// Derived variables used below
@sat: saturation(@base-color);
@luma: luma(@base-color);
@luma: luminance(@base-color);
@light: lightness(@base-color);
@tone: desaturate(@base-color,100%);
@@ -64,13 +64,32 @@
// Brand colors
// -------------------------
@brand-primary: @base-color;
// @brand-primary: hsl(hue(@bs-primary),(saturation(@bs-info) + @sat + 20)/2,@luma - 10);
@brand-primary: hsl(
hue(@bs-primary),
(saturation(@bs-info) + @sat + 20)/2,
@luma - 10
);
@brand-info: hsl(hue(@bs-info),(saturation(@bs-info) + @sat + 20)/2,@luma);
@brand-success: hsl(hue(@bs-success),(saturation(@bs-success) + @sat + 20)/2,(luma(@bs-success) + @luma - 20)/2);
@brand-warning: hsl(hue(@bs-warning),(saturation(@bs-warning) + @sat + 20)/2,(luma(@bs-warning) + @luma - 20)/2);
@brand-danger: hsl(hue(@bs-danger),(saturation(@bs-danger) + @sat + 20)/2,(luma(@bs-danger) + @luma + 10)/2);
@brand-info: hsl(
hue(@bs-info),
(saturation(@bs-info) + @sat + 20)/2,
@luma
);
@brand-success: hsl(
hue(@bs-success),
(saturation(@bs-success) + @sat + 20)/2,
(luminance(@bs-success) + @luma - 20)/2
);
@brand-warning: hsl(
hue(@bs-warning),
(saturation(@bs-warning) + @sat + 20)/2,
(luminance(@bs-warning) + @luma - 20)/2
);
@brand-danger: hsl(
hue(@bs-danger),
(saturation(@bs-danger) + @sat + 20)/2,
(luminance(@bs-danger) + @luma + 10)/2
);
// Scaffolding
// -------------------------
@@ -422,19 +441,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, relative);
@state-warning-bg: saturate(lighten(@brand-warning, @state-bg-lighten-percent),@state-bg-saturate-percent);
@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, relative);
@state-danger-bg: saturate(lighten(@brand-danger, @state-bg-lighten-percent),@state-bg-saturate-percent);
@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, relative),@state-bg-saturate-percent, relative);
@state-success-bg: saturate(lighten(@brand-success, @state-bg-lighten-percent, relative),@state-bg-saturate-percent);
@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, relative);
@state-info-bg: saturate(lighten(@brand-info, @state-bg-lighten-percent),@state-bg-saturate-percent);
@state-info-border: darken(@state-info-bg, @border-darken-percent);
static/style/blue/base.css
+2 -2
View File
File diff suppressed because one or more lines are too long
static/style/blue/iphone.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}.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}
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 #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 #aa6;background:#ffc}.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}