Upgrade prettier (now handles .scss well), apply to style sources.

This commit is contained in:
Dannon Baker
2018-04-02 11:02:05 -04:00
parent d51d25fca2
commit 45559e29fa
40 changed files with 3205 additions and 2705 deletions
@@ -3,47 +3,47 @@
/****************************************************************************/
.ac_results {
padding: 0px;
border: 1px solid black;
background-color: white;
overflow: hidden;
z-index: 99999;
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;
width: 100%;
list-style-position: outside;
list-style: none;
padding: 0;
margin: 0;
}
.ac_results li {
padding: 2px 5px;
cursor: default;
display: block;
/*
padding: 2px 5px;
cursor: default;
display: block;
/*
if width will be 100% horizontal scrollbar will apear
when scroll mode will be used
*/
/*width: 100%;*/
/*width: 100%;*/
/* font: menu; */
font-size: 12px;
/*
font-size: 12px;
/*
it is very important, if line-height not setted or setted
in relative units scroll will be broken in firefox
*/
line-height: 16px;
overflow: hidden;
line-height: 16px;
overflow: hidden;
}
.ac_loading {
background: white url('indicator.gif') right center no-repeat;
background: white url("indicator.gif") right center no-repeat;
}
.ac_odd {
background-color: #fff; /* #eee */
margin-left: 0.3em;
background-color: #fff; /* #eee */
margin-left: 0.3em;
}
.ac_even {
@@ -51,8 +51,8 @@
}
.ac_over {
background-color: #0A246A;
color: white;
background-color: #0a246a;
color: white;
}
.ac_header {
@@ -68,14 +68,12 @@
width: 100%;
}
.individual-tag-area
{
.individual-tag-area {
cursor: pointer;
border: 1px dotted transparent;
}
.individual-tag-area:hover
{
.individual-tag-area:hover {
border: 1px dotted #999999;
}
@@ -83,9 +81,8 @@
background-color: white;
}
.toggle-link
{
font-weight: normal;
.toggle-link {
font-weight: normal;
padding: 0.3em;
margin-bottom: 1em;
width: 100%;
@@ -101,31 +98,27 @@
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;
-moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em;
border-radius: 0.5em;
background: #eee;
}
.tag-button img
{
.tag-button img {
padding-left: 0.4em;
}
.tag-button .tag-name:hover
{
.tag-button .tag-name:hover {
color: black;
}
.add-tag-button
{
.add-tag-button {
margin-bottom: 0.3em;
vertical-align: middle;
padding: 0.3em;
}
.add-tag-button:hover
{
.add-tag-button:hover {
cursor: pointer;
}
@@ -136,13 +129,10 @@
resize: none;
}
.delete-tag-img
{
.delete-tag-img {
margin-left: 0.3em;
}
.active-tag-name
{
.active-tag-name {
font-weight: bold;
}
File diff suppressed because it is too large Load Diff
+4 -3
View File
@@ -37,7 +37,7 @@
position: relative;
margin-left: 5px;
top: -1px;
font-size: 1.0em;
font-size: 1em;
display: inline;
}
.icon {
@@ -100,7 +100,8 @@
.portlet-content {
padding: 0px;
}
.ui-table-section, .ui-portlet-panel .portlet-content {
.ui-table-section,
.ui-portlet-panel .portlet-content {
padding-left: 5px;
}
}
@@ -125,4 +126,4 @@
.charts-right {
display: none;
}
}
}
+3 -3
View File
@@ -1,7 +1,7 @@
.chrom-label {
font-size: 80%;
font-size: 80%;
}
.tick {
font-size: 80%;
}
font-size: 80%;
}
+81 -34
View File
@@ -1,7 +1,6 @@
@import "sprite-history-states.scss";
@import "sprite-history-buttons.scss";
// ---------------------------------------------------------------------------- dataset states
//.dataset .state-icon {
.state-icon {
@@ -25,24 +24,44 @@
animation: spin 2s infinite linear;
@-moz-keyframes spin {
0% { -moz-transform: rotate(0deg); }
100% { -moz-transform: rotate(359deg); }
0% {
-moz-transform: rotate(0deg);
}
100% {
-moz-transform: rotate(359deg);
}
}
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(359deg); }
0% {
-webkit-transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(359deg);
}
}
@-o-keyframes spin {
0% { -o-transform: rotate(0deg); }
100% { -o-transform: rotate(359deg); }
0% {
-o-transform: rotate(0deg);
}
100% {
-o-transform: rotate(359deg);
}
}
@-ms-keyframes spin {
0% { -ms-transform: rotate(0deg); }
100% { -ms-transform: rotate(359deg); }
0% {
-ms-transform: rotate(0deg);
}
100% {
-ms-transform: rotate(359deg);
}
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(359deg); }
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(359deg);
}
}
&:before {
// TODO: dannon fixme, fontawesome upgrade.
@@ -61,24 +80,44 @@
animation: eclipse 2s infinite linear;
@-moz-keyframes eclipse {
0% { -moz-transform: translate(0px,16px); }
100% { -moz-transform: translate(0px,-16px); }
0% {
-moz-transform: translate(0px, 16px);
}
100% {
-moz-transform: translate(0px, -16px);
}
}
@-webkit-keyframes eclipse {
0% { -webkit-transform: translate(0px,16px); }
100% { -webkit-transform: translate(0px,-16px); }
0% {
-webkit-transform: translate(0px, 16px);
}
100% {
-webkit-transform: translate(0px, -16px);
}
}
@-o-keyframes eclipse {
0% { -o-transform: translate(0px,16px); }
100% { -o-transform: translate(0px,-16px); }
0% {
-o-transform: translate(0px, 16px);
}
100% {
-o-transform: translate(0px, -16px);
}
}
@-ms-keyframes eclipse {
0% { -ms-transform: translate(0px,16px); }
100% { -ms-transform: translate(0px,-16px); }
0% {
-ms-transform: translate(0px, 16px);
}
100% {
-ms-transform: translate(0px, -16px);
}
}
@keyframes eclipse {
0% { transform: translate(0px,16px); }
100% { transform: translate(0px,-16px); }
0% {
transform: translate(0px, 16px);
}
100% {
transform: translate(0px, -16px);
}
}
content: $fa-var-arrow-up;
}
@@ -159,8 +198,8 @@
&.state-noPermission {
background: $state-default-bg;
filter: alpha(opacity=60);
-moz-opacity: .60;
opacity: .60;
-moz-opacity: 0.6;
opacity: 0.6;
.state-icon {
font-size: 20px;
&:before {
@@ -184,15 +223,16 @@
@extend .state-icon-running;
}
}
}
.blinking {
animation: blinker 500ms linear infinite;
animation: blinker 500ms linear infinite;
}
@keyframes blinker {
50% { opacity: 0; }
50% {
opacity: 0;
}
}
// ---------------------------------------------------------------------------- datasets as list-items
@@ -204,19 +244,20 @@
.blurb {
margin-bottom: 2px;
}
.datatype, .dbkey {
.datatype,
.dbkey {
display: inline;
.value {
font-weight: bold;
}
}
.datatype .value:after {
content: ',';
content: ",";
@extend .list-item.help-text !optional;
margin-right: 4px;
}
.dbkey:after {
content: ' ';
content: " ";
display: block;
@extend .list-item.vertical-spacing !optional;
}
@@ -285,7 +326,7 @@
font-style: italic;
color: grey;
//TODO: move out for localization
content : 'Click here to edit annotation';
content: "Click here to edit annotation";
}
textarea {
margin: 0px 0px 2px 0px;
@@ -303,7 +344,7 @@
.toolhelp {
width: 100%;
background:#eee;
background: #eee;
border-radius: 3px;
margin-top: 5px;
padding: 3px;
@@ -319,12 +360,15 @@
font-size: 10px;
overflow: auto;
//TODO: there doesn't seem to be a way to pad text-only peeks (binary data, etc.)
//TODO: there doesn't seem to be a way to pad text-only peeks (binary data, etc.)
th {
color: white;
background: $panel-primary-heading-bg;
}
table, th, tr, td {
table,
th,
tr,
td {
font-family: $font-family-monospace;
font-size: 10px;
}
@@ -343,7 +387,10 @@ pre.peek {
color: white;
background: $panel-primary-heading-bg;
}
table, th, tr, td {
table,
th,
tr,
td {
font-family: $font-family-monospace;
font-size: 10px;
}
+10 -9
View File
@@ -1,4 +1,4 @@
.embedded-item {
.embedded-item {
margin: 0em auto;
width: 90%;
-moz-border-radius: 0.5em;
@@ -30,8 +30,8 @@
p {
background: inherit;
margin-top:0;
margin-bottom:0;
margin-top: 0;
margin-bottom: 0;
}
table.annotated-item {
@@ -39,7 +39,8 @@
border-collapse: collapse;
}
table.annotated-item td,th {
table.annotated-item td,
th {
padding: 0;
}
@@ -59,25 +60,25 @@
}
.embedded-item.history {
background-color: #C1C9E5;
background-color: #c1c9e5;
}
.embedded-item.dataset {
background-color: #CFC;
background-color: #cfc;
.item-content {
padding: 5px;
}
}
.embedded-item.workflow {
background-color: #FBDDB3;
.embedded-item.workflow {
background-color: #fbddb3;
.item-content {
padding: 5px;
}
}
.embedded-item.visualization {
background-color: #BBBBBB;
background-color: #bbbbbb;
.item-content {
overflow: hidden;
height: 100%;
+3 -3
View File
@@ -1,5 +1,5 @@
// ------------------------------------ prefix mixin
@mixin vendor-prefix-property($property, $value){
@mixin vendor-prefix-property($property, $value) {
#{"-webkit-" + $property}: $value;
// -moz-${property}: $value;
#{"-ms-" + $property}: $value;
@@ -49,7 +49,7 @@
// ------------------------------------ convenience versions
// has a fixed height header
@mixin two-rows-header($header-height){
@mixin two-rows-header($header-height) {
@extend flex-vertical-container;
> * {
@@ -64,7 +64,7 @@
}
// has a fixed height header and footer
@mixin three-rows-header-footer($header-height, $footer-height){
@mixin three-rows-header-footer($header-height, $footer-height) {
@include two-rows-header($header-height);
> .footer {
@extend flex-column;
+98 -98
View File
@@ -1,4 +1,4 @@
.galaxy-frame{
.galaxy-frame {
.corner {
-moz-border-radius: $border-radius-large;
border-radius: $border-radius-large;
@@ -9,146 +9,146 @@
}
.frame-background {
z-index : $zindex-navbar;
position : absolute;
top : 0px;
left : 0px;
height : 100%;
width : 100%;
opacity : 0.6;
background : $black;
overflow : auto;
z-index: $zindex-navbar;
position: absolute;
top: 0px;
left: 0px;
height: 100%;
width: 100%;
opacity: 0.6;
background: $black;
overflow: auto;
}
.frame-shadow {
z-index : $zindex-navbar + 1;
position : absolute;
display : none;
top : 0px;
left : 0px;
opacity : 0.5;
background : $navbar-inverse-bg;
border : 1px solid $navbar-default-border;
z-index: $zindex-navbar + 1;
position: absolute;
display: none;
top: 0px;
left: 0px;
opacity: 0.5;
background: $navbar-inverse-bg;
border: 1px solid $navbar-default-border;
}
/*
panel menu button
*/
.frame-menu {
z-index : $zindex-navbar + 5;
position : absolute;
cursor : pointer;
color : gold;
right : 10px;
z-index: $zindex-navbar + 5;
position: absolute;
cursor: pointer;
color: gold;
right: 10px;
}
.frame-scroll-up {
top : 50px;
top: 50px;
}
.frame-scroll-down {
bottom : 20px;
bottom: 20px;
}
/*
frame components
*/
.frame {
z-index : $zindex-navbar + 2;
overflow : hidden;
position : absolute;
background : $white;
border : 1px solid $navbar-default-border;
-webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
.f-content{
position : absolute;
overflow : hidden;
background : $white;
border : none;
top : 24px;
bottom : 3px;
left : 3px;
right : 3px;
z-index: $zindex-navbar + 2;
overflow: hidden;
position: absolute;
background: $white;
border: 1px solid $navbar-default-border;
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
.f-content {
position: absolute;
overflow: hidden;
background: $white;
border: none;
top: 24px;
bottom: 3px;
left: 3px;
right: 3px;
}
.f-cover{
position : absolute;
display : none;
top : 0px;
left : 0px;
height : 100%;
width : 100%;
opacity : 0.0;
background : $white;
.f-cover {
position: absolute;
display: none;
top: 0px;
left: 0px;
height: 100%;
width: 100%;
opacity: 0;
background: $white;
}
.f-iframe{
border : none;
width : 100%;
height : 100%;
.f-iframe {
border: none;
width: 100%;
height: 100%;
}
.f-header{
height : 17px;
margin : 2px;
cursor : pointer;
border : 1px solid $black;
background : $base-color-1;
color : $white;
.f-icon-left{
cursor : pointer;
font-size : 15px;
margin-left : 3px;
float : left;
.f-header {
height: 17px;
margin: 2px;
cursor: pointer;
border: 1px solid $black;
background: $base-color-1;
color: $white;
.f-icon-left {
cursor: pointer;
font-size: 15px;
margin-left: 3px;
float: left;
&[disabled] {
opacity : 0.25;
opacity: 0.25;
}
}
}
.f-title {
position : absolute;
top : 2px;
left : 32px;
right : 32px;
font-size : 12px;
font-family : $font-family-sans-serif;
text-align : center;
position: absolute;
top: 2px;
left: 32px;
right: 32px;
font-size: 12px;
font-family: $font-family-sans-serif;
text-align: center;
}
/*
frame icons
*/
.f-not-allowed{
cursor : not-allowed;
.f-not-allowed {
cursor: not-allowed;
}
.f-close{
cursor : pointer;
position : absolute;
font-size : 15px;
right : 5px;
top : 2px;
.f-close {
cursor: pointer;
position: absolute;
font-size: 15px;
right: 5px;
top: 2px;
}
.f-resize{
cursor : pointer;
position : absolute;
font-size : 15px;
right : 0px;
bottom : 0px;
background : $white;
width : 16px;
height : 16px;
color : $base-color-1;
right : 0px;
bottom : 0px;
text-align : center;
line-height : 16px;
border : 0px;
.f-resize {
cursor: pointer;
position: absolute;
font-size: 15px;
right: 0px;
bottom: 0px;
background: $white;
width: 16px;
height: 16px;
color: $base-color-1;
right: 0px;
bottom: 0px;
text-align: center;
line-height: 16px;
border: 0px;
}
}
}
@@ -1,30 +1,31 @@
.navbar-fixed-top .navbar-brand {
font-family: Verdana;
font-weight: bold;
font-size: 160%;
font-family: Verdana;
font-weight: bold;
font-size: 160%;
}
// Don't wrap text inside pre
pre {
overflow: auto;
word-wrap: normal;
white-space: pre;
overflow: auto;
word-wrap: normal;
white-space: pre;
}
.btn.hover {
$btn:hover();
$btn: hover();
}
// Allow text in buttons to wrap
.btn {
white-space: normal;
white-space: normal;
}
.dropdown-menu {
max-width: auto;
}
input[type="checkbox"],input[type="radio"] {
input[type="checkbox"],
input[type="radio"] {
margin-left: 0.5ex;
margin-right: 0.5ex;
}
@@ -36,14 +37,14 @@ input[type="checkbox"],input[type="radio"] {
}
.pagination {
> .active > a {
background-color: #ebd9b2;
color: black;
&:hover {
color: black;
background-color: #ebd9b2;
> .active > a {
background-color: #ebd9b2;
color: black;
&:hover {
color: black;
background-color: #ebd9b2;
}
}
}
}
/*
@@ -73,32 +74,32 @@ NOTE: these styles do not currently work.
// Scroll modal body.
.modal-body {
overflow: auto;
overflow: auto;
}
// Tabs -- border color is hardcoded in navs.scss, change to $btnBorder here
.nav-tabs {
margin-bottom: 15px;
margin-bottom: 15px;
}
// Don't make blockquotes very large since they're often used in the toolform
// and this does not look nice to have a quoted portion of a tool's help
// documentation be rendered 150% larger.
div.ui-form-help {
blockquote {
p {
font-size: inherit;
font-weight: inherit;
line-height: inherit;
blockquote {
p {
font-size: inherit;
font-weight: inherit;
line-height: inherit;
}
}
}
}
// pre styling
pre.code {
white-space: pre-wrap;
background: #1d1f21;
color: white;
padding: 1em;
white-space: pre-wrap;
background: #1d1f21;
color: white;
padding: 1em;
}
@@ -2,13 +2,13 @@
// Caveat: currently only works for light colored backgrounds, scss provides functions (contrast) that could be used to improve this
// Base color -- Based on the Galaxy masthead color
$base-color-1: #2C3143;
$base-color-2: lighten($base-color-1,25%);
$base-color-3: lighten($base-color-1,50%);
$base-color-1: #2c3143;
$base-color-2: lighten($base-color-1, 25%);
$base-color-3: lighten($base-color-1, 50%);
$complement-color-1: spin($base-color-1,180);
$complement-color-2: spin($base-color-2,180);
$complement-color-3: spin($base-color-3,180);
$complement-color-1: spin($base-color-1, 180);
$complement-color-2: spin($base-color-2, 180);
$complement-color-3: spin($base-color-3, 180);
$base-color: $base-color-2;
@@ -18,24 +18,23 @@ $border-default-color: lighten(black, 75%);
// When making borders for components with other colors, how much to darken
$border-darken-percent: 40%;
$panel-bg-color: #DFE5F9;
$panel-bg-color: #dfe5f9;
// Derived variables used below
@function luma($color) {
$r: red($color) / 255;
$g: green($color) / 255;
$b: blue($color) / 255;
$r: red($color)/255;
$g: green($color)/255;
$b: blue($color)/255;
// Taken from https://github.com/less/less.js/blob/master/lib/less/tree/color.js#L54
// This replicates the color values originally dervied with less and boostrap 2.
@return ( 0.2126 * $r + 0.7152 * $g + 0.0722 * $b ) * 100;
// Taken from https://github.com/less/less.js/blob/master/lib/less/tree/color.js#L54
// This replicates the color values originally dervied with less and boostrap 2.
@return (0.2126 * $r + 0.7152 * $g + 0.0722 * $b) * 100;
}
$sat: saturation($base-color);
$sat: saturation($base-color);
$luma: luma($base-color);
$tone: desaturate($base-color,100%);
$tone: desaturate($base-color, 100%);
// Standard boostrap variables begin here
@@ -43,7 +42,6 @@ $tone: desaturate($base-color,100%);
// Variables
// --------------------------------------------------
// Global values
// --------------------------------------------------
@@ -51,15 +49,15 @@ $tone: desaturate($base-color,100%);
// -------------------------
// These are from Boostrap 2/3 but are used in Galaxy styles
$gray-darker: lighten(black, 13.5%); // #222
$gray-dark: lighten(black, 20%); // #333
$gray: lighten(black, 33.5%); // #555
$gray-light: lighten(black, 60%); // #999
$gray-lighter: lighten(black, 93.5%); // #eee
$gray-darker: lighten(black, 13.5%); // #222
$gray-dark: lighten(black, 20%); // #333
$gray: lighten(black, 33.5%); // #555
$gray-light: lighten(black, 60%); // #999
$gray-lighter: lighten(black, 93.5%); // #eee
// ... and these come from Bootstrap 4 _variables.scss
// FIXME: reconcile the grays 👽
$white: #fff !default;
$white: #fff !default;
$gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default;
@@ -69,7 +67,7 @@ $gray-600: #868e96 !default;
$gray-700: #495057 !default;
$gray-800: #343a40 !default;
$gray-900: #212529 !default;
$black: #000 !default;
$black: #000 !default;
// Brand colors
// -------------------------
@@ -104,84 +102,87 @@ $brand-danger: saturate(lighten($galaxy-bs3-danger, 10%), 30%);
// they use a map called $theme-colors, so here we override that
$theme-colors: ();
$theme-colors: map-merge((
"primary": $brand-primary,
"secondary": $gray-600,
"success": $brand-success,
"info": $brand-info,
"warning": $brand-warning,
"danger": $brand-danger,
"light": $gray-100,
"dark": $gray-800
), $theme-colors);
$theme-colors: map-merge(
(
"primary": $brand-primary,
"secondary": $gray-600,
"success": $brand-success,
"info": $brand-info,
"warning": $brand-warning,
"danger": $brand-danger,
"light": $gray-100,
"dark": $gray-800
),
$theme-colors
);
// This is the default but we need to use it here.
$theme-color-interval: 5% !default;
// Alerts and states
$alert-bg-level: -13 !default;
$alert-border-level: -6 !default;
$alert-color-level: 8 !default;
$alert-bg-level: -13 !default;
$alert-border-level: -6 !default;
$alert-color-level: 8 !default;
// These are not Bootstrap styles but are used extensively in Galaxy. This
// duplicated the way that Bootstrap 4 alerts are derived.
$state-warning-text: theme-color-level('warning', $alert-color-level);
$state-warning-bg: theme-color-level('warning', $alert-bg-level);
$state-warning-border: theme-color-level('warning', $alert-border-level);
$state-warning-text: theme-color-level("warning", $alert-color-level);
$state-warning-bg: theme-color-level("warning", $alert-bg-level);
$state-warning-border: theme-color-level("warning", $alert-border-level);
$state-danger-text: theme-color-level('danger', $alert-color-level);
$state-danger-bg: theme-color-level('danger', $alert-bg-level);
$state-danger-border: theme-color-level('danger', $alert-border-level);
$state-danger-text: theme-color-level("danger", $alert-color-level);
$state-danger-bg: theme-color-level("danger", $alert-bg-level);
$state-danger-border: theme-color-level("danger", $alert-border-level);
$state-info-text: theme-color-level('info', $alert-color-level);
$state-info-bg: theme-color-level('info', $alert-bg-level);
$state-info-border: theme-color-level('info', $alert-border-level);
$state-info-text: theme-color-level("info", $alert-color-level);
$state-info-bg: theme-color-level("info", $alert-bg-level);
$state-info-border: theme-color-level("info", $alert-border-level);
$state-success-text: theme-color-level('success', $alert-color-level);
$state-success-bg: theme-color-level('success', $alert-bg-level);
$state-success-border: theme-color-level('success', $alert-border-level);
$state-success-text: theme-color-level("success", $alert-color-level);
$state-success-bg: theme-color-level("success", $alert-bg-level);
$state-success-border: theme-color-level("success", $alert-border-level);
// Body text and link colors
$body-bg: $white;
$text-color: $gray-dark;
$body-bg: $white;
$text-color: $gray-dark;
$link-color: #303030;
$link-hover-color: darken($link-color, 15%);
$link-color: #303030;
$link-hover-color: darken($link-color, 15%);
// Fonts and sizes
$font-family-sans-serif: "Lucida Grande",verdana,arial,helvetica,sans-serif; //JT "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif;
$font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
$font-family-base: $font-family-sans-serif;
$font-family-sans-serif: "Lucida Grande", verdana, arial, helvetica, sans-serif; //JT "Helvetica Neue", Helvetica, Arial, sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif;
$font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
$font-family-base: $font-family-sans-serif;
$font-size-base: .75rem; // default 1rem
$font-size-base: 0.75rem; // default 1rem
$h1-font-size: floor($font-size-base * 2); // default 2.5
$h2-font-size: floor($font-size-base * 1.75); // default 2
$h3-font-size: ceil($font-size-base * 1.5); // default 1.75
$h4-font-size: ceil($font-size-base * 1.25); // default 1.5
$h5-font-size: $font-size-base; // default 1.25
$h6-font-size: ceil($font-size-base * 0.85); // default 1
$h1-font-size: floor($font-size-base * 2); // default 2.5
$h2-font-size: floor($font-size-base * 1.75); // default 2
$h3-font-size: ceil($font-size-base * 1.5); // default 1.75
$h4-font-size: ceil($font-size-base * 1.25); // default 1.5
$h5-font-size: $font-size-base; // default 1.25
$h6-font-size: ceil($font-size-base * 0.85); // default 1
// This is the default for $line-height-base, but we use $line-height-computed
// in base.css, that should be removed.
$line-height-base: 1.5; // for scaling, as a multiplier -- not concrete units.
$line-height-computed: floor($font-size-base * $line-height-base);
$line-height-computed-px: 16px;
$line-height-base: 1.5; // for scaling, as a multiplier -- not concrete units.
$line-height-computed: floor($font-size-base * $line-height-base);
$line-height-computed-px: 16px;
$headings-font-weight: 800; // default 500
$headings-line-height: 1.1; // default 1.2
$headings-font-weight: 800; // default 500
$headings-line-height: 1.1; // default 1.2
// Iconography
// These are no longer specified in Bootstrap 4's variable
$icon-font-path: "../fonts/";
$icon-font-name: "glyphicons-halflings-regular";
$icon-font-path: "../fonts/";
$icon-font-name: "glyphicons-halflings-regular";
// BOOTSTRAP 4 STYLE REFACTORING BREAK POINT
// Anything that is actually used should be moved above this line and
@@ -193,39 +194,38 @@ $icon-font-name: "glyphicons-halflings-regular";
// Components
// -------------------------
$padding-base-vertical: .25rem;
$padding-base-horizontal: .625rem;
$padding-base-vertical: 0.25rem;
$padding-base-horizontal: 0.625rem;
$line-height-large: 1.33;
$line-height-small: 1.5;
$line-height-large: 1.33;
$line-height-small: 1.5;
$border-radius-base: .1875rem;
$border-radius-large: .3125rem;
$border-radius-small: .125rem;
$border-radius-base: 0.1875rem;
$border-radius-large: 0.3125rem;
$border-radius-small: 0.125rem;
// Tables
// -------------------------
$table-bg: transparent; // overall background-color
$table-bg-accent: #f9f9f9; // for striping
$table-bg-hover: #f5f5f5;
$table-bg-active: $table-bg-hover;
$table-border-color: $border-default-color; // table and cell border
$table-bg: transparent; // overall background-color
$table-bg-accent: #f9f9f9; // for striping
$table-bg-hover: #f5f5f5;
$table-bg-active: $table-bg-hover;
$table-border-color: $border-default-color; // table and cell border
// Buttons
// -------------------------
$btn-default-color: #333;
$btn-default-bg: darken($white,5%);
$btn-default-border: $border-default-color;
$btn-default-color: #333;
$btn-default-bg: darken($white, 5%);
$btn-default-border: $border-default-color;
// Forms
// -------------------------
$input-bg: $white;
$input-bg-disabled: $gray-lighter;
$input-bg: $white;
$input-bg-disabled: $gray-lighter;
// COMPONENT VARIABLES
// --------------------------------------------------
@@ -235,116 +235,114 @@ $input-bg-disabled: $gray-lighter;
// Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :)
$zindex-navbar: 1000;
$zindex-dropdown: 1000;
$zindex-popover: 1010;
$zindex-tooltip: 1030;
$zindex-navbar-fixed: 1030;
$zindex-modal-background: 1040;
$zindex-modal: 1050;
$zindex-navbar: 1000;
$zindex-dropdown: 1000;
$zindex-popover: 1010;
$zindex-tooltip: 1030;
$zindex-navbar-fixed: 1030;
$zindex-modal-background: 1040;
$zindex-modal: 1050;
// Grid system
// --------------------------------------------------
// Number of columns in the grid system
$grid-columns: 12;
$grid-columns: 12;
// Padding, to be divided by two and applied to the left and right of all columns
$grid-gutter-width: 30px;
$grid-gutter-width: 30px;
// Point at which the navbar stops collapsing
$grid-float-breakpoint: 0px;
$grid-float-breakpoint: 0px;
// Navbar
// -------------------------
// Basics of a navbar
$navbar-height: 33px; // 2.062500rem;
$navbar-margin-bottom: $line-height-base;
$navbar-default-color: #777;
$navbar-default-bg: $gray-lighter; // JT #f8f8f8;
$navbar-default-border: darken($navbar-default-bg, $border-darken-percent);
$navbar-border-radius: $border-radius-base;
$navbar-padding-horizontal: floor($grid-gutter-width / 2);
$navbar-padding-vertical: (($navbar-height - $line-height-computed-px) / 2);
$navbar-height: 33px; // 2.062500rem;
$navbar-margin-bottom: $line-height-base;
$navbar-default-color: #777;
$navbar-default-bg: $gray-lighter; // JT #f8f8f8;
$navbar-default-border: darken($navbar-default-bg, $border-darken-percent);
$navbar-border-radius: $border-radius-base;
$navbar-padding-horizontal: floor($grid-gutter-width / 2);
$navbar-padding-vertical: (($navbar-height - $line-height-computed-px) / 2);
// Navbar links
$navbar-default-link-color: #777;
$navbar-default-link-hover-color: #333;
$navbar-default-link-hover-bg: transparent;
$navbar-default-link-active-color: #555;
$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%);
$navbar-default-link-disabled-color: #ccc;
$navbar-default-link-disabled-bg: transparent;
$navbar-default-link-color: #777;
$navbar-default-link-hover-color: #333;
$navbar-default-link-hover-bg: transparent;
$navbar-default-link-active-color: #555;
$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%);
$navbar-default-link-disabled-color: #ccc;
$navbar-default-link-disabled-bg: transparent;
// Navbar brand label
$navbar-default-brand-color: $navbar-default-link-color;
$navbar-default-brand-hover-color: darken($navbar-default-link-color, 10%);
$navbar-default-brand-hover-bg: transparent;
$navbar-default-brand-color: $navbar-default-link-color;
$navbar-default-brand-hover-color: darken($navbar-default-link-color, 10%);
$navbar-default-brand-hover-bg: transparent;
// Navbar toggle
$navbar-default-toggle-hover-bg: #ddd;
$navbar-default-toggle-icon-bar-bg: #ccc;
$navbar-default-toggle-border-color: #ddd;
$navbar-default-toggle-hover-bg: #ddd;
$navbar-default-toggle-icon-bar-bg: #ccc;
$navbar-default-toggle-border-color: #ddd;
// Inverted navbar
//
// Reset inverted navbar basics
$navbar-inverse-color: $gray-light;
$navbar-inverse-bg: darken($base-color,25%); //JT #222;
$navbar-inverse-border: darken($navbar-inverse-bg, 10%);
$navbar-inverse-color: $gray-light;
$navbar-inverse-bg: darken($base-color, 25%); //JT #222;
$navbar-inverse-border: darken($navbar-inverse-bg, 10%);
// Inverted navbar links
$navbar-inverse-link-color: $gray-light;
$navbar-inverse-link-hover-color: $white;
$navbar-inverse-link-hover-bg: transparent;
$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color;
$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%);
$navbar-inverse-link-disabled-color: #666;
$navbar-inverse-link-disabled-bg: transparent;
$navbar-inverse-link-color: $gray-light;
$navbar-inverse-link-hover-color: $white;
$navbar-inverse-link-hover-bg: transparent;
$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color;
$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%);
$navbar-inverse-link-disabled-color: #666;
$navbar-inverse-link-disabled-bg: transparent;
// Inverted navbar brand label
$navbar-inverse-brand-color: $navbar-inverse-link-color;
$navbar-inverse-brand-hover-color: $white;
$navbar-inverse-brand-hover-bg: transparent;
$navbar-inverse-brand-color: $navbar-inverse-link-color;
$navbar-inverse-brand-hover-color: $white;
$navbar-inverse-brand-hover-bg: transparent;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg: #333;
$navbar-inverse-toggle-icon-bar-bg: $white;
$navbar-inverse-toggle-border-color: #333;
$navbar-inverse-toggle-hover-bg: #333;
$navbar-inverse-toggle-icon-bar-bg: $white;
$navbar-inverse-toggle-border-color: #333;
// Navs
// -------------------------
$nav-link-padding: $padding-base-vertical $padding-base-horizontal; //JT 10px 15px;
$nav-link-padding: $padding-base-vertical $padding-base-horizontal; //JT 10px 15px;
// Panels
// -------------------------
$panel-bg: $white;
$panel-inner-border: $border-default-color;
$panel-border-radius: $border-radius-base;
$panel-footer-bg: #f5f5f5;
$panel-bg: $white;
$panel-inner-border: $border-default-color;
$panel-border-radius: $border-radius-base;
$panel-footer-bg: #f5f5f5;
$panel-default-text: $gray-dark;
$panel-default-border: $border-default-color;
$panel-default-heading-bg: #f5f5f5;
$panel-default-text: $gray-dark;
$panel-default-border: $border-default-color;
$panel-default-heading-bg: #f5f5f5;
$panel-primary-text: $white;
$panel-primary-border: $brand-primary;
$panel-primary-heading-bg: $brand-primary;
$panel-primary-text: $white;
$panel-primary-border: $brand-primary;
$panel-primary-heading-bg: $brand-primary;
$panel-success-text: $state-success-text;
$panel-success-border: $state-success-border;
$panel-success-heading-bg: $state-success-bg;
$panel-success-text: $state-success-text;
$panel-success-border: $state-success-border;
$panel-success-heading-bg: $state-success-bg;
$panel-warning-text: $state-warning-text;
$panel-warning-border: $state-warning-border;
$panel-warning-heading-bg: $state-warning-bg;
$panel-warning-text: $state-warning-text;
$panel-warning-border: $state-warning-border;
$panel-warning-heading-bg: $state-warning-bg;
$panel-danger-text: $state-danger-text;
$panel-danger-border: $state-danger-border;
$panel-danger-heading-bg: $state-danger-bg;
$panel-danger-text: $state-danger-text;
$panel-danger-border: $state-danger-border;
$panel-danger-heading-bg: $state-danger-bg;
$panel-info-text: $state-info-text;
$panel-info-border: $state-info-border;
$panel-info-heading-bg: $state-info-bg;
$panel-info-text: $state-info-text;
$panel-info-border: $state-info-border;
$panel-info-heading-bg: $state-info-bg;
@@ -5,8 +5,8 @@ $base-bg: $white;
$base-text-color: $black;
$header-text-color: $base-text-color;
$side-panel-bg: lighten(black,95%);
$layout-border-color: darken($border-default-color,15%);
$side-panel-bg: lighten(black, 95%);
$layout-border-color: darken($border-default-color, 15%);
$form-heading-bg: $complement-color-3;
$form-border: $complement-color-3;
@@ -23,11 +23,11 @@ $state-default-border: $border-default-color;
$state-upload-border: $state-info-border;
$state-upload-bg: $state-info-bg;
$state-paused-border: #6666AA;
$state-paused-border: #6666aa;
$state-paused-bg: #d9edf7;
$state-running-border: #AAAA66;
$state-running-bg: #FFFFCC;
$state-running-border: #aaaa66;
$state-running-bg: #ffffcc;
// $state-deleted-border: #330066;
// $state-deleted-bg: #3399FF;
+25 -33
View File
@@ -16,11 +16,11 @@
font-weight: bold;
}
}
.subtitle:not(:empty){
.subtitle:not(:empty) {
min-height: 15px;
margin: -4px 0px 8px;
span+span:before {
content: ', ';
span + span:before {
content: ", ";
}
}
.history-size {
@@ -51,7 +51,8 @@
}
//TODO: move these out
.tags-display, .annotation-display {
.tags-display,
.annotation-display {
display: none;
margin-bottom: 8px;
.prompt {
@@ -63,14 +64,14 @@
color: #555;
}
.prompt:after {
content: ':';
content: ":";
}
}
.annotation-display {
.annotation {
background: white;
border-radius: 3px;
border: 1px solid fadeout( $layout-border-color, 50% );
border: 1px solid fadeout($layout-border-color, 50%);
padding: 4px;
white-space: pre-wrap;
overflow: auto;
@@ -83,7 +84,7 @@
font-style: italic;
color: grey;
//TODO: move out for localization
content : 'Click here to edit annotation';
content: "Click here to edit annotation";
}
textarea {
margin: 0px 0px 2px 0px;
@@ -206,12 +207,12 @@
.title-bar {
.title {
.hid:after {
content: ':';
content: ":";
}
}
}
div.nametags {
max-height:26px;
max-height: 26px;
overflow-y: auto;
span.badge {
display: inline-block;
@@ -222,7 +223,6 @@
}
}
// ---------------------------------------------------------------------------- collapsed history controls
// compact the history controls when scrolling away from the top
.history-panel > .controls.collapsed {
@@ -257,7 +257,6 @@
}
}
// ---------------------------------------------------------------------------- added class for wider display
// since these are rendered *within parts* of other pages, we need something more than a media query
.history-panel.wide {
@@ -268,7 +267,6 @@
}
}
// ---------------------------------------------------------------------------- collections nested in histories
.history-panel {
.dataset-collection {
@@ -278,7 +276,6 @@
}
}
// ---------------------------------------------------------------------------- annotated-history-panel
.annotated-history-panel {
& > .controls {
@@ -338,7 +335,6 @@
}
}
& > .list-items {
width: 100%;
border-bottom: 1px solid lightgrey;
@@ -349,7 +345,6 @@
}
}
// ---------------------------------------------------------------------------- embedded in pages
.embedded-item.display.history .annotated-history-panel {
& > .controls {
@@ -359,10 +354,8 @@
}
}
// ---------------------------------------------------------------------------- current-history-panel
.current-history-panel {
& > .controls .list-pagination {
// text a bit smaller for all
font-size: 90%;
@@ -371,15 +364,14 @@
}
}
// .current-content is added to dataset/collection when displayed/edited/visualized, etc@mixin
// .current-content is added to dataset/collection when displayed/edited/visualized, etc@mixin
// (roughly: when it's being used in the center panel)
.list-item.history-content.current-content {
//TODO: Galaxy's 'bs-primary' color - not sure where this is defined
border-left: 5px solid #4E5777;
border-left: 5px solid #4e5777;
}
}
// ---------------------------------------------------------------------------- analyze data page - right panel
#right.history-right-panel {
background-color: $panel-bg-color;
@@ -387,12 +379,12 @@
.unified-panel-header-inner {
.panel-header-buttons {
.panel-header-button {
display : inline-block;
height : $icon-btn-size;
width : $icon-btn-size;
text-align : center;
line-height : $icon-btn-size - 3;
font-size : 1.2em;
display: inline-block;
height: $icon-btn-size;
width: $icon-btn-size;
text-align: center;
line-height: $icon-btn-size - 3;
font-size: 1.2em;
padding: 0px;
&:not(:last-child) {
margin-right: 2px;
@@ -494,7 +486,7 @@
width: 100%;
height: 26px;
}
input[type=checkbox] {
input[type="checkbox"] {
margin-top: 1px;
}
}
@@ -592,17 +584,17 @@
// current history
&:first-child {
position: fixed;
z-index : 10;
z-index: 10;
// visually differentiate the current history
.history-panel {
border: 1px solid black;
box-shadow: 4px 4px 4px rgba( 96, 96, 96, 0.3 );
box-shadow: 4px 4px 4px rgba(96, 96, 96, 0.3);
}
}
&:nth-child(2) {
// push the column after the current away from the left (since it's fixed)
margin-left: ( $mph-column_width + $mph-column_gap );
margin-left: ($mph-column_width + $mph-column_gap);
}
&:last-child {
margin-right: 0px;
@@ -613,7 +605,7 @@
.panel-controls {
width: 100%;
height: ( $mph-controls_height + 4 );
height: ($mph-controls_height + 4);
border-radius: 3px;
background-color: white;
text-align: center;
@@ -660,8 +652,8 @@
& > .controls .subtitle {
min-height: 15px;
margin: -4px 0px 8px;
span+span:before {
content: ', ';
span + span:before {
content: ", ";
}
}
+159 -157
View File
@@ -1,461 +1,463 @@
@font-face {
font-family: 'IconicStroke';
src: url('/static/images/fonts/iconic_stroke.eot');
src: url('/static/images/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'), url('../images/fonts/iconic_stroke.ttf') format('truetype'), url('../images/fonts/iconic_stroke.svg#iconic') format('svg');
font-weight: normal;
font-style: normal;
font-family: "IconicStroke";
src: url("/static/images/fonts/iconic_stroke.eot");
src: url("/static/images/fonts/iconic_stroke.eot?#iefix") format("embedded-opentype"),
url("../images/fonts/iconic_stroke.ttf") format("truetype"),
url("../images/fonts/iconic_stroke.svg#iconic") format("svg");
font-weight: normal;
font-style: normal;
}
.iconic {
display: inline-block;
font-family: 'IconicStroke';
display: inline-block;
font-family: "IconicStroke";
}
.iconic.lightbulb:before {
content: '\e063';
content: "\e063";
}
.iconic.equalizer:before {
content: '\e052';
content: "\e052";
}
.iconic.map_pin_stroke:before {
content: '\e068';
content: "\e068";
}
.iconic.brush_alt:before {
content: '\e01c';
content: "\e01c";
}
.iconic.move:before {
content: '\e03e';
content: "\e03e";
}
.iconic.pen_alt_stroke:before {
content: '\e005';
content: "\e005";
}
.iconic.move_vertical:before {
content: '\e03b';
content: "\e03b";
}
.iconic.book_alt2:before {
content: '\e06a';
content: "\e06a";
}
.iconic.layers:before {
content: '\e01f';
content: "\e01f";
}
.iconic.pause:before {
content: '\e049';
content: "\e049";
}
.iconic.layers_alt:before {
content: '\e020';
content: "\e020";
}
.iconic.cloud_upload:before {
content: '\e045';
content: "\e045";
}
.iconic.chart_alt:before {
content: '\e029';
content: "\e029";
}
.iconic.fullscreen_exit_alt:before {
content: '\e051';
content: "\e051";
}
.iconic.cloud_download:before {
content: '\e044';
content: "\e044";
}
.iconic.comment_alt2_stroke:before {
content: '\e004';
content: "\e004";
}
.iconic.mail:before {
content: '\2709';
content: "\2709";
}
.iconic.check_alt:before {
content: '\2718';
content: "\2718";
}
.iconic.document_stroke:before {
content: '\e066';
content: "\e066";
}
.iconic.battery_charging:before {
content: '\e05d';
content: "\e05d";
}
.iconic.stop:before {
content: '\e04a';
content: "\e04a";
}
.iconic.arrow_up:before {
content: '\2191';
content: "\2191";
}
.iconic.move_horizontal:before {
content: '\e038';
content: "\e038";
}
.iconic.compass:before {
content: '\e021';
content: "\e021";
}
.iconic.minus_alt:before {
content: '\e009';
content: "\e009";
}
.iconic.battery_empty:before {
content: '\e05c';
content: "\e05c";
}
.iconic.map_pin_alt:before {
content: '\e002';
content: "\e002";
}
.iconic.unlock_stroke:before {
content: '\e076';
content: "\e076";
}
.iconic.lock_stroke:before {
content: '\e075';
content: "\e075";
}
.iconic.question_mark:before {
content: '\003f';
content: "\003f";
}
.iconic.list:before {
content: '\e055';
content: "\e055";
}
.iconic.upload:before {
content: '\e043';
content: "\e043";
}
.iconic.reload:before {
content: '\e030';
content: "\e030";
}
.iconic.loop_alt4:before {
content: '\e035';
content: "\e035";
}
.iconic.loop_alt3:before {
content: '\e034';
content: "\e034";
}
.iconic.loop_alt2:before {
content: '\e033';
content: "\e033";
}
.iconic.loop_alt1:before {
content: '\e032';
content: "\e032";
}
.iconic.left_quote:before {
content: '\275d';
content: "\275d";
}
.iconic.x:before {
content: '\2713';
content: "\2713";
}
.iconic.last:before {
content: '\e04d';
content: "\e04d";
}
.iconic.document_alt_stroke:before {
content: '\e000';
content: "\e000";
}
.iconic.bars:before {
content: '\e06f';
content: "\e06f";
}
.iconic.arrow_left:before {
content: '\2190';
content: "\2190";
}
.iconic.arrow_down:before {
content: '\2193';
content: "\2193";
}
.iconic.download:before {
content: '\e042';
content: "\e042";
}
.iconic.home:before {
content: '\2302';
content: "\2302";
}
.iconic.calendar:before {
content: '\e001';
content: "\e001";
}
.iconic.right_quote_alt:before {
content: '\e012';
content: "\e012";
}
.iconic.fullscreen:before {
content: '\e04e';
content: "\e04e";
}
.iconic.dial:before {
content: '\e058';
content: "\e058";
}
.iconic.plus_alt:before {
content: '\e008';
content: "\e008";
}
.iconic.clock:before {
content: '\e079';
content: "\e079";
}
.iconic.movie:before {
content: '\e060';
content: "\e060";
}
.iconic.steering_wheel:before {
content: '\e024';
content: "\e024";
}
.iconic.pen:before {
content: '\270e';
content: "\270e";
}
.iconic.tag_stroke:before {
content: '\e02b';
content: "\e02b";
}
.iconic.pin:before {
content: '\e067';
content: "\e067";
}
.iconic.denied:before {
content: '\26d4';
content: "\26d4";
}
.iconic.left_quote_alt:before {
content: '\e011';
content: "\e011";
}
.iconic.volume_mute:before {
content: '\e071';
content: "\e071";
}
.iconic.arrow_up_alt2:before {
content: '\e018';
content: "\e018";
}
.iconic.list_nested:before {
content: '\e056';
content: "\e056";
}
.iconic.arrow_up_alt1:before {
content: '\e014';
content: "\e014";
}
.iconic.comment_stroke:before {
content: '\e06d';
content: "\e06d";
}
.iconic.undo:before {
content: '\e02f';
content: "\e02f";
}
.iconic.umbrella:before {
content: '\2602';
content: "\2602";
}
.iconic.bolt:before {
content: '\26a1';
content: "\26a1";
}
.iconic.article:before {
content: '\e053';
content: "\e053";
}
.iconic.read_more:before {
content: '\e054';
content: "\e054";
}
.iconic.beaker:before {
content: '\e023';
content: "\e023";
}
.iconic.beaker_alt:before {
content: '\e010';
content: "\e010";
}
.iconic.battery_full:before {
content: '\e073';
content: "\e073";
}
.iconic.arrow_right:before {
content: '\2192';
content: "\2192";
}
.iconic.new_window:before {
content: '\e059';
content: "\e059";
}
.iconic.plus:before {
content: '\2795';
content: "\2795";
}
.iconic.cog:before {
content: '\2699';
content: "\2699";
}
.iconic.key_stroke:before {
content: '\26bf';
content: "\26bf";
}
.iconic.first:before {
content: '\e04c';
content: "\e04c";
}
.iconic.comment_alt1_stroke:before {
content: '\e003';
content: "\e003";
}
.iconic.trash_stroke:before {
content: '\e05a';
content: "\e05a";
}
.iconic.image:before {
content: '\e027';
content: "\e027";
}
.iconic.chat_alt_stroke:before {
content: '\e007';
content: "\e007";
}
.iconic.cd:before {
content: '\e064';
content: "\e064";
}
.iconic.right_quote:before {
content: '\275e';
content: "\275e";
}
.iconic.brush:before {
content: '\e01b';
content: "\e01b";
}
.iconic.cloud:before {
content: '\2601';
content: "\2601";
}
.iconic.eye:before {
content: '\e025';
content: "\e025";
}
.iconic.play_alt:before {
content: '\e048';
content: "\e048";
}
.iconic.transfer:before {
content: '\e041';
content: "\e041";
}
.iconic.pen_alt2:before {
content: '\e006';
content: "\e006";
}
.iconic.camera:before {
content: '\e070';
content: "\e070";
}
.iconic.move_horizontal_alt2:before {
content: '\e03a';
content: "\e03a";
}
.iconic.curved_arrow:before {
content: '\2935';
content: "\2935";
}
.iconic.move_horizontal_alt1:before {
content: '\e039';
content: "\e039";
}
.iconic.aperture:before {
content: '\e026';
content: "\e026";
}
.iconic.reload_alt:before {
content: '\e031';
content: "\e031";
}
.iconic.magnifying_glass:before {
content: '\e074';
content: "\e074";
}
.iconic.iphone:before {
content: '\e06e';
content: "\e06e";
}
.iconic.fork:before {
content: '\e046';
content: "\e046";
}
.iconic.box:before {
content: '\e06b';
content: "\e06b";
}
.iconic.bars_alt:before {
content: '\e00a';
content: "\e00a";
}
.iconic.heart_stroke:before {
content: '\2764';
content: "\2764";
}
.iconic.volume:before {
content: '\e072';
content: "\e072";
}
.iconic.x_alt:before {
content: '\2714';
content: "\2714";
}
.iconic.link:before {
content: '\e077';
content: "\e077";
}
.iconic.moon_stroke:before {
content: '\263e';
content: "\263e";
}
.iconic.eyedropper:before {
content: '\e01e';
content: "\e01e";
}
.iconic.spin:before {
content: '\e036';
content: "\e036";
}
.iconic.rss:before {
content: '\e02c';
content: "\e02c";
}
.iconic.info:before {
content: '\2139';
content: "\2139";
}
.iconic.target:before {
content: '\e02a';
content: "\e02a";
}
.iconic.cursor:before {
content: '\e057';
content: "\e057";
}
.iconic.minus:before {
content: '\2796';
content: "\2796";
}
.iconic.book_alt:before {
content: '\e00b';
content: "\e00b";
}
.iconic.headphones:before {
content: '\e061';
content: "\e061";
}
.iconic.hash:before {
content: '\0023';
content: "\0023";
}
.iconic.arrow_left_alt1:before {
content: '\e013';
content: "\e013";
}
.iconic.arrow_left_alt2:before {
content: '\e017';
content: "\e017";
}
.iconic.fullscreen_exit:before {
content: '\e050';
content: "\e050";
}
.iconic.share:before {
content: '\e02e';
content: "\e02e";
}
.iconic.fullscreen_alt:before {
content: '\e04f';
content: "\e04f";
}
.iconic.at:before {
content: '\0040';
content: "\0040";
}
.iconic.chat:before {
content: '\e05e';
content: "\e05e";
}
.iconic.move_vertical_alt2:before {
content: '\e03d';
content: "\e03d";
}
.iconic.move_vertical_alt1:before {
content: '\e03c';
content: "\e03c";
}
.iconic.check:before {
content: '\2717';
content: "\2717";
}
.iconic.mic:before {
content: '\e05f';
content: "\e05f";
}
.iconic.calendar_alt_stroke:before {
content: '\e06c';
content: "\e06c";
}
.iconic.book:before {
content: '\e069';
content: "\e069";
}
.iconic.move_alt1:before {
content: '\e03f';
content: "\e03f";
}
.iconic.move_alt2:before {
content: '\e040';
content: "\e040";
}
.iconic.award_stroke:before {
content: '\e022';
content: "\e022";
}
.iconic.wrench:before {
content: '\e078';
content: "\e078";
}
.iconic.play:before {
content: '\e047';
content: "\e047";
}
.iconic.star:before {
content: '\2605';
content: "\2605";
}
.iconic.chart:before {
content: '\e028';
content: "\e028";
}
.iconic.rain:before {
content: '\26c6';
content: "\26c6";
}
.iconic.folder_stroke:before {
content: '\e065';
content: "\e065";
}
.iconic.sun_stroke:before {
content: '\2600';
content: "\2600";
}
.iconic.user:before {
content: '\e062';
content: "\e062";
}
.iconic.battery_half:before {
content: '\e05b';
content: "\e05b";
}
.iconic.aperture_alt:before {
content: '\e00c';
content: "\e00c";
}
.iconic.eject:before {
content: '\e04b';
content: "\e04b";
}
.iconic.arrow_down_alt1:before {
content: '\e016';
content: "\e016";
}
.iconic.pilcrow:before {
content: '\00b6';
content: "\00b6";
}
.iconic.arrow_down_alt2:before {
content: '\e01a';
content: "\e01a";
}
.iconic.arrow_right_alt1:before {
content: '\e015';
content: "\e015";
}
.iconic.arrow_right_alt2:before {
content: '\e019';
content: "\e019";
}
.iconic.rss_alt:before {
content: '\e02d';
content: "\e02d";
}
.iconic.spin_alt:before {
content: '\e037';
content: "\e037";
}
+2 -3
View File
@@ -15,7 +15,7 @@
.params {
padding: 0px 8px 0px 8px;
//display: table;
.param,
.input {
//display: table-row;
@@ -38,7 +38,7 @@
}
.list-panel {
padding : 0px;
padding: 0px;
.list-items {
border: 0px;
border-radius: 0px;
@@ -47,7 +47,6 @@
border-radius: 0px;
border-top: 1px solid $border-default-color;
&:last-child {
}
}
}
File diff suppressed because it is too large Load Diff
+66 -58
View File
@@ -1,134 +1,141 @@
@import "galaxy_bootstrap/variables.scss";
@import "galaxy_variables.scss";
.library_style_container{
.library_style_container {
width: 95%;
margin: auto;
margin-top:2em;
margin-top: 2em;
overflow: auto !important;
.fa{
.fa {
font-size: 12px;
}
.fa-globe, .fa-shield, .fa-key, .fa-ban{
.fa-globe,
.fa-shield,
.fa-key,
.fa-ban {
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{
border-top:1px solid #5f6990 !important;
.library_table {
td {
border-top: 1px solid #5f6990 !important;
}
th{
th {
border-bottom: 2px solid #5f6990 !important;
}
a{
color: #0A143D;
&:hover{
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, th, td{
.dataset_table {
tr,
th,
td {
border: none;
}
.dataset-first-column{
.dataset-first-column {
width: 30%;
}
}
th.button_heading{
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{
.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{
.toolbar-item {
margin-left: 0.5em;
}
}
#libraries_element, #folder_items_element{
button{
#libraries_element,
#folder_items_element {
button {
margin-left: 0.5em;
}
}
.right-float{
.right-float {
float: right;
}
.pagination-sm{
.pagination-sm {
height: 15px;
}
.library-paginator{
.library-paginator {
margin-left: 2em;
}
.import-type-switch{
.import-type-switch {
text-decoration: underline;
}
.libimport-select-none,
.libimport-select-all{
.libimport-select-all {
margin-left: 0.5em;
}
.paginator-bottom{
.paginator-bottom {
width: 27em;
margin-left: auto;
margin-right: auto;
@@ -138,31 +145,32 @@
}
// Extra style for Galaxy modal
.modal-content{
.library_selected_history_content{
ul{
.modal-content {
.library_selected_history_content {
ul {
list-style-type: none;
}
}
.library-collection-type-select, .library-collection-history-select{
margin-left:auto;
margin-right:auto;
width:200px;
min-width:200px;
.library-collection-type-select,
.library-collection-history-select {
margin-left: auto;
margin-right: auto;
width: 200px;
min-width: 200px;
}
.library-modal-item{
width:90%;
.library-modal-item {
width: 90%;
margin-left: auto;
margin-right: auto;
margin-top: 1.5em;
}
}
.libraryTitle{
th{
.libraryTitle {
th {
text-align: left;
}
.rowTitle{
.rowTitle {
padding: 2px;
}
}
+9 -10
View File
@@ -9,14 +9,14 @@
.info-section {
border-radius: 3px;
border: 1px solid fadeout( $layout-border-color, 70% );
border: 1px solid fadeout($layout-border-color, 70%);
padding: 4px;
}
$spacing-top : 6px;
$spacing-right : 10px;
$spacing-bottom : 6px;
$spacing-left : 8px;
$spacing-top: 6px;
$spacing-right: 10px;
$spacing-bottom: 6px;
$spacing-left: 8px;
.padded {
padding: $spacing-top $spacing-right $spacing-bottom $spacing-left;
}
@@ -50,8 +50,8 @@
width: 32px;
height: 32px;
//HACK: neg. on the bottom due to padding-bottom in title-bar - very tweakish
margin: 0px 0px -( $spacing-bottom ) 0px;
padding: ( $spacing-top + 2 ) 0px 2px ( $spacing-left - 1 );
margin: 0px 0px - ($spacing-bottom) 0px;
padding: ($spacing-top + 2) 0px 2px ($spacing-left - 1);
font-size: 80%;
color: $btn-default-color;
cursor: pointer;
@@ -76,7 +76,7 @@
word-break: break-all;
line-height: 16px;
}
//TODO: show keyboard/tab focus for keyboard users
//TODO: show keyboard/tab focus for keyboard users
//&:focus {
// color: maroon;
//}
@@ -122,7 +122,7 @@
@extend .help-text;
}
.prompt:after {
content: ':';
content: ":";
margin-right: 4px;
}
}
@@ -130,7 +130,6 @@
// ---------------------------------------------------------------------------- generic panel list (of list-items)
.list-panel {
overflow: hidden;
// overflow-x: hidden;
+23 -18
View File
@@ -1,6 +1,5 @@
// ############################################################# Reports Webapp
// ======================================================== Left ==============
.reports-panel-container {
position: absolute;
@@ -29,14 +28,14 @@
}
.jqstooltip {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
// ======================================================== Sorting ===========
.dir_arrow {
visibility: hidden
visibility: hidden;
}
// ======================================================== Home page =========
@@ -64,7 +63,8 @@
text-anchor: end;
}
.axis path, .axis line {
.axis path,
.axis line {
fill: none;
stroke: #000;
shape-rendering: preserveAspectRatio;
@@ -78,7 +78,7 @@
.chart .title {
fill: black;
font-size: 15px;
font-family: "Lucida Grande",verdana,arial,helvetica,sans-serif;
font-family: "Lucida Grande", verdana, arial, helvetica, sans-serif;
font-weight: 800;
line-height: 1.1;
}
@@ -87,7 +87,8 @@
fill: black;
}
.hr_container, .dy_container {
.hr_container,
.dy_container {
position: relative;
z-index: 2;
display: inline-block;
@@ -103,12 +104,12 @@
display: block;
overflow-x: auto;
overflow-y: hidden;
white-space: nowrap
white-space: nowrap;
}
.trim {
position:relative;
height:10px;
position: relative;
height: 10px;
top: 50px;
background: #ebd9b2;
color: #000;
@@ -122,7 +123,11 @@
// ======================================================== Paging ============
// ------------------------------------ Pages ---------------------------------
#back_button, #next_button, #curr_button, .miss_pages, .page_button {
#back_button,
#next_button,
#curr_button,
.miss_pages,
.page_button {
position: relative;
float: left;
height: 24px;
@@ -198,14 +203,13 @@
border-radius: 11px;
background-color: #ebd9b2;
text-align: center;
opacity: 0.0;
opacity: 0;
z-index: 0;
}
// ======================================================== Misc. =============
.half_width {
width: 50%
width: 50%;
}
.third_width {
width: 30%;
@@ -228,10 +232,11 @@
border-collapse: separate;
}
.lastAccessForm, .diskUsageForm {
.lastAccessForm,
.diskUsageForm {
width: 70%;
margin-left: auto;
margin-right: auto;
padding: 5px;
border-spacing: 5px;
}
}
+104 -72
View File
@@ -15,14 +15,14 @@ Version: 3.5.1 Timestamp: Tue Jul 22 18:58:56 EDT 2014
.select2-drop,
.select2-search,
.select2-search input {
/*
/*
Force border-box so that % widths fit the parent
container without overlap because of margin/padding.
More Info : http://www.quirksmode.org/css/box.html
*/
-webkit-box-sizing: border-box; /* webkit */
-moz-box-sizing: border-box; /* firefox */
box-sizing: border-box; /* css3 */
-webkit-box-sizing: border-box; /* webkit */
-moz-box-sizing: border-box; /* firefox */
box-sizing: border-box; /* css3 */
}
.select2-container .select2-choice {
@@ -43,10 +43,10 @@ Version: 3.5.1 Timestamp: Tue Jul 22 18:58:56 EDT 2014
background-clip: padding-box;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
background-color: #fff;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff));
@@ -105,7 +105,7 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
text-decoration: none;
border: 0;
background: url('../images/select2.png') right top no-repeat;
background: url("../images/select2.png") right top no-repeat;
cursor: pointer;
outline: 0;
}
@@ -151,8 +151,8 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
border-radius: 0 0 4px 4px;
-webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
}
.select2-drop.select2-drop-above {
@@ -162,8 +162,8 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
border-radius: 4px 4px 0 0;
-webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, 0.15);
box-shadow: 0 -4px 5px rgba(0, 0, 0, 0.15);
}
.select2-drop-active {
@@ -218,7 +218,7 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow {
display: block;
width: 100%;
height: 100%;
background: url('../images/select2.png') no-repeat 0 1px;
background: url("../images/select2.png") no-repeat 0 1px;
}
html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
@@ -254,23 +254,29 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
box-shadow: none;
background: #fff url('../images/select2.png') no-repeat 100% -22px;
background: url('../images/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url('../images/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
background: #fff url("../images/select2.png") no-repeat 100% -22px;
background: url("../images/select2.png") no-repeat 100% -22px,
-webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url("../images/select2.png") no-repeat 100% -22px,
-webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url("../images/select2.png") no-repeat 100% -22px,
-moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url("../images/select2.png") no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
}
html[dir="rtl"] .select2-search input {
padding: 4px 5px 4px 20px;
background: #fff url('../images/select2.png') no-repeat -37px -22px;
background: url('../images/select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url('../images/select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
background: #fff url("../images/select2.png") no-repeat -37px -22px;
background: url("../images/select2.png") no-repeat -37px -22px,
-webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url("../images/select2.png") no-repeat -37px -22px,
-webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url("../images/select2.png") no-repeat -37px -22px,
-moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url("../images/select2.png") no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
}
.select2-drop.select2-drop-above .select2-search input {
@@ -278,11 +284,14 @@ html[dir="rtl"] .select2-search input {
}
.select2-search input.select2-active {
background: #fff url('../images/select2-spinner.gif') no-repeat 100%;
background: url('../images/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url('../images/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
background: #fff url("../images/select2-spinner.gif") no-repeat 100%;
background: url("../images/select2-spinner.gif") no-repeat 100%,
-webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url("../images/select2-spinner.gif") no-repeat 100%,
-webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url("../images/select2-spinner.gif") no-repeat 100%,
-moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url("../images/select2-spinner.gif") no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
}
.select2-container-active .select2-choice,
@@ -290,14 +299,14 @@ html[dir="rtl"] .select2-search input {
border: 1px solid #5897fb;
outline: none;
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
}
.select2-dropdown-open .select2-choice {
border-bottom-color: transparent;
-webkit-box-shadow: 0 1px 0 #fff inset;
box-shadow: 0 1px 0 #fff inset;
box-shadow: 0 1px 0 #fff inset;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
@@ -389,19 +398,33 @@ html[dir="rtl"] .select2-results {
min-height: 1em;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.select2-results-dept-1 .select2-result-label { padding-left: 20px }
.select2-results-dept-2 .select2-result-label { padding-left: 40px }
.select2-results-dept-3 .select2-result-label { padding-left: 60px }
.select2-results-dept-4 .select2-result-label { padding-left: 80px }
.select2-results-dept-5 .select2-result-label { padding-left: 100px }
.select2-results-dept-6 .select2-result-label { padding-left: 110px }
.select2-results-dept-7 .select2-result-label { padding-left: 120px }
.select2-results-dept-1 .select2-result-label {
padding-left: 20px;
}
.select2-results-dept-2 .select2-result-label {
padding-left: 40px;
}
.select2-results-dept-3 .select2-result-label {
padding-left: 60px;
}
.select2-results-dept-4 .select2-result-label {
padding-left: 80px;
}
.select2-results-dept-5 .select2-result-label {
padding-left: 100px;
}
.select2-results-dept-6 .select2-result-label {
padding-left: 110px;
}
.select2-results-dept-7 .select2-result-label {
padding-left: 120px;
}
.select2-results .select2-highlighted {
background: #3875d7;
@@ -441,9 +464,9 @@ disabled look for disabled choices in the results dropdown
cursor: default;
}
.select2-results .select2-disabled {
background: #f4f4f4;
display: list-item;
cursor: default;
background: #f4f4f4;
display: list-item;
cursor: default;
}
.select2-results .select2-selected {
@@ -451,11 +474,11 @@ disabled look for disabled choices in the results dropdown
}
.select2-more-results.select2-active {
background: #f4f4f4 url('../images/select2-spinner.gif') no-repeat 100%;
background: #f4f4f4 url("../images/select2-spinner.gif") no-repeat 100%;
}
.select2-results .select2-ajax-error {
background: rgba(255, 50, 50, .2);
background: rgba(255, 50, 50, 0.2);
}
.select2-more-results {
@@ -482,7 +505,6 @@ disabled look for disabled choices in the results dropdown
display: none;
}
/* multiselect */
.select2-container-multi .select2-choices {
@@ -508,7 +530,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices {
}
.select2-locked {
padding: 3px 5px 3px 5px !important;
padding: 3px 5px 3px 5px !important;
}
.select2-container-multi .select2-choices {
@@ -519,15 +541,14 @@ html[dir="rtl"] .select2-container-multi .select2-choices {
border: 1px solid #5897fb;
outline: none;
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
box-shadow: 0 0 5px rgba(0, 0, 0, .3);
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
}
.select2-container-multi .select2-choices li {
float: left;
list-style: none;
}
html[dir="rtl"] .select2-container-multi .select2-choices li
{
html[dir="rtl"] .select2-container-multi .select2-choices li {
float: right;
}
.select2-container-multi .select2-choices .select2-search-field {
@@ -546,12 +567,12 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
outline: 0;
border: 0;
-webkit-box-shadow: none;
box-shadow: none;
box-shadow: none;
background: transparent !important;
}
.select2-container-multi .select2-choices .select2-search-field input.select2-active {
background: #fff url('../images/select2-spinner.gif') no-repeat 100% !important;
background: #fff url("../images/select2-spinner.gif") no-repeat 100% !important;
}
.select2-default {
@@ -571,25 +592,32 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
border-radius: 3px;
-webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
background-clip: padding-box;
-webkit-touch-callout: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
background-color: #e4e4e4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
background-image: -webkit-gradient(
linear,
0% 0%,
0% 100%,
color-stop(20%, #f4f4f4),
color-stop(50%, #f0f0f0),
color-stop(52%, #e8e8e8),
color-stop(100%, #eee)
);
background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
background-image: linear-gradient(to top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
}
html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
{
html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice {
margin: 3px 5px 3px 0;
padding: 3px 18px 3px 5px;
}
@@ -610,7 +638,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
font-size: 1px;
outline: none;
background: url('../images/select2.png') right top no-repeat;
background: url("../images/select2.png") right top no-repeat;
}
html[dir="rtl"] .select2-search-choice-close {
right: auto;
@@ -627,7 +655,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
}
.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
background-position: right -11px;
background-position: right -11px;
}
.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
background-position: right -11px;
@@ -648,18 +676,22 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
background-color: #f4f4f4;
}
.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { display: none;
.select2-container-multi.select2-container-disabled
.select2-choices
.select2-search-choice
.select2-search-choice-close {
display: none;
background: none;
}
/* end multiselect */
.select2-result-selectable .select2-match,
.select2-result-unselectable .select2-match {
text-decoration: underline;
}
.select2-offscreen, .select2-offscreen:focus {
.select2-offscreen,
.select2-offscreen:focus {
clip: rect(0 0 0 0) !important;
width: 1px !important;
height: 1px !important;
@@ -688,12 +720,12 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
/* Retina-ize icons */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 2dppx) {
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 2dppx) {
.select2-search input,
.select2-search-choice-close,
.select2-container .select2-choice abbr,
.select2-container .select2-choice .select2-arrow b {
background-image: url('../images/select2x2.png') !important;
background-image: url("../images/select2x2.png") !important;
background-repeat: no-repeat !important;
background-size: 60px 40px !important;
}
+5 -5
View File
@@ -1,22 +1,22 @@
// Override colors to closely resemble the style as of Fall 2013
$side-panel-bg: #DFE5F9;
$side-panel-bg: #dfe5f9;
$layout-border-color: #999;
$form-heading-bg: #ebd9b2;
$form-border: darken($form-heading-bg,20%);
$form-border: darken($form-heading-bg, 20%);
$table-heading-bg: #ebd9b2;
$table-border-color: darken($table-heading-bg,20%);
$table-border-color: darken($table-heading-bg, 20%);
$input-border: #aaa;
a {
text-decoration: underline;
text-decoration: underline;
}
// Label is used in places it probably shouldn't be (grid cells), replace with data- attributes and remove this.
label {
font-weight: normal;
font-weight: normal;
}
+216 -205
View File
@@ -8,7 +8,7 @@ $navbar-inverse-color: black;
$navbar-inverse-bg: white;
$navbar-inverse-link-color: black;
$navbar-inverse-link-hover-color: $gray-dark;
$jumbotron-bg: white;
$jumbotron-bg: white;
$form-heading-bg: black;
$border-radius-large: 0px;
@@ -16,38 +16,37 @@ $border-radius-base: 0px;
$input-border-radius: 0px;
// y'all're seriously obsesed with round edges.
* {
border-radius: 0px !important;
border-radius: 0px !important;
}
.state-icon {
border-radius: 8px !important;
border-radius: 8px !important;
}
// Tables
$table-heading-bg: black;
$table-border-color: black;
th a {
color: white;
&:hover {
color: black;
background: white;
}
color: white;
&:hover {
color: black;
background: white;
}
}
.jumbotron {
box-shadow: 0 0 11px black;
box-shadow: 0 0 11px black;
}
.dropdown-menu {
border: 1px solid black;
border: 1px solid black;
}
li.dropdown:hover a.dropdown-toggle:focus {
color: white;
color: white;
}
#masthead .navbar-brand a {
color: black !important;
color: black !important;
}
$navbar-hover-thingy-link-color: darken(white, 10%);
@@ -61,10 +60,10 @@ $navbar-hover-thingy-background: lighten(black, 10%);
}
.navbar-tabs {
.toggle {
color : $navbar-hover-thingy-link-color !important;
color: $navbar-hover-thingy-link-color !important;
}
.dropdown-note {
color : $navbar-hover-thingy-link-color !important;
color: $navbar-hover-thingy-link-color !important;
}
}
li.dropdown:hover {
@@ -80,159 +79,160 @@ $navbar-hover-thingy-background: lighten(black, 10%);
}
}
// Tool links
a.tool-link {
//display: block;
//padding: 0.5em;
//display: block;
//padding: 0.5em;
&:hover {
background: $gray-lighter;
}
&:hover {
background: $gray-lighter;
}
}
$navbar-default-bg: white;
#masthead {
border-bottom: 1px solid black;
border-bottom: 1px solid black;
}
.search-clear.fa.fa-times-circle {
color: #d82c2c
color: #d82c2c;
}
div.toolMenuContainer {
padding-left: 0px !important;
padding-right: 0px !important;
padding-left: 0px !important;
padding-right: 0px !important;
#tool-search {
padding-left: 1em;
background: white;
//border-bottom: 1px solid $gray-light
top: 65px; // seems to be the real / correct value.
padding-bottom: 5px;
}
#tool-search {
padding-left: 1em;
background: white;
//border-bottom: 1px solid $gray-light
top: 65px; // seems to be the real / correct value.
padding-bottom: 5px;
}
#tool-search-query {
border: 1px solid transparent;
background: #eee;
#tool-search-query {
border: 1px solid transparent;
background: #eee;
&:focus, &:active {
background: white;
border: 1px solid black;
box-shadow: none;
}
}
&:focus,
&:active {
background: white;
border: 1px solid black;
box-shadow: none;
}
}
}
#tool-search {
padding-left: 1em;
background: white;
//border-bottom: 1px solid $gray-light
top: 65px; // seems to be the real / correct value.
padding-bottom: 5px;
padding-left: 1em;
background: white;
//border-bottom: 1px solid $gray-light
top: 65px; // seems to be the real / correct value.
padding-bottom: 5px;
}
div.search div.search-input input {
border: 1px solid transparent;
background: #eee;
border: 1px solid transparent;
background: #eee;
&:focus, &:active {
background: white;
border: 1px solid black;
box-shadow: none;
}
&:focus,
&:active {
background: white;
border: 1px solid black;
box-shadow: none;
}
}
// Easy to click tool section titles
div.toolSectionWrapper {
margin-bottom: 0px !important;
padding-bottom: 0px !important;
padding-left: 0px;
border-left: 1px solid black;
margin-left: 0.2em;
margin-bottom: 0px !important;
padding-bottom: 0px !important;
padding-left: 0px;
border-left: 1px solid black;
margin-left: 0.2em;
div.toolSectionTitle {
padding-left: 0.2em;
border-left: 2px solid black;
}
div.toolSectionTitle {
padding-left: 0.2em;
border-left: 2px solid black;
}
}
div.toolTitleNoSection {
margin-bottom: 0px !important;
padding-bottom: 0px !important;
padding-left: 0.5em;
font-weight: normal;
margin-bottom: 0px !important;
padding-bottom: 0px !important;
padding-left: 0.5em;
font-weight: normal;
}
div.toolSectionTitle, div.toolSectionWrapper {
a {
padding-top: 0.4em;
padding-bottom: 0.4em;
display: block;
text-decoration: none;
}
div.toolSectionTitle,
div.toolSectionWrapper {
a {
padding-top: 0.4em;
padding-bottom: 0.4em;
display: block;
text-decoration: none;
}
}
div.toolPanelLabel {
margin-left: 0.7em !important;
margin-left: 0.7em !important;
}
div.toolSectionBody div.toolPanelLabel {
margin-left: 1em !important;
margin-left: 1em !important;
}
div.toolTitle, div.toolTitleNoSection {
margin-left: 0em !important;
padding-left: 1em !important;
padding-top: 0px !important;
padding-bottom: 0px !important;
div.toolTitle,
div.toolTitleNoSection {
margin-left: 0em !important;
padding-left: 1em !important;
padding-top: 0px !important;
padding-bottom: 0px !important;
a {
font-weight: normal;
padding-top: 0.4em;
padding-bottom: 0.4em;
display: block;
}
a {
font-weight: normal;
padding-top: 0.4em;
padding-bottom: 0.4em;
display: block;
}
&:hover {
background: $gray-lighter;
}
&:hover {
background: $gray-lighter;
}
}
input[type="submit"] {
background: $brand-primary !important;
border: 1px solid black !important;
color: contrast($brand-primary) !important;
background: $brand-primary !important;
border: 1px solid black !important;
color: contrast($brand-primary) !important;
}
// Adjust older tool forms
.toolFormTitle, .form .form-title {
color: white;
a {
color: white !important;
border: 1px solid white !important;
}
.toolFormTitle,
.form .form-title {
color: white;
a {
color: white !important;
border: 1px solid white !important;
}
}
// portlets
.portlet-header {
.portlet-operations > div {
color: white !important;
background: transparent;
}
.portlet-title {
color: white !important;
}
.portlet-operations > div {
color: white !important;
background: transparent;
}
.portlet-title {
color: white !important;
}
}
.ui-portlet-repeat {
border-left-width: 1px !important;
border-left-width: 1px !important;
}
.form-row .help, .toolParamHelp {
color: $gray-dark !important;
.form-row .help,
.toolParamHelp {
color: $gray-dark !important;
}
// History
@@ -253,143 +253,154 @@ $state-success-border: black;
$state-success-bg: lighten(green, 15%);
.current-history-panel {
.annotation-display {
.annotation {
border: 1px solid $gray-light !important;
background: white !important;
.annotation-display {
.annotation {
border: 1px solid $gray-light !important;
background: white !important;
textarea {
border: none;
}
textarea:focus {
background: white;
}
}
}
textarea {
border: none;
}
textarea:focus {
background: white;
}
}
}
}
a.icon-btn, div.icon-btn, div.icon-btn > a {
background: transparent;
color: black;
border: 0px;
a.icon-btn,
div.icon-btn,
div.icon-btn > a {
background: transparent;
color: black;
border: 0px;
}
a.icon-btn:hover {
background: $gray-light;
background: $gray-light;
}
ul.list-items {
border: 0px;
border: 0px;
.dataset {
border: 0px;
.dataset {
border: 0px;
div.summary {
.help-text {
color: black;
}
.job-error-text {
background: $gray-darker;
color: white;
border: 0px;
}
}
div.summary {
.help-text {
color: black;
}
.job-error-text {
background: $gray-darker;
color: white;
border: 0px;
}
}
.dataset-peek {
background: $gray-darker !important;
color: white !important;
}
.dataset-peek {
background: $gray-darker !important;
color: white !important;
}
.primary-actions, .left, .right {
a.icon-btn, div.icon-btn, div.icon-btn > a {
background: transparent;
color: white;
border: 0px;
}
a.icon-btn:hover {
background: $gray-dark;
}
}
}
.primary-actions,
.left,
.right {
a.icon-btn,
div.icon-btn,
div.icon-btn > a {
background: transparent;
color: white;
border: 0px;
}
a.icon-btn:hover {
background: $gray-dark;
}
}
}
.warnings {
div {
border: 1px solid black;
background-color: white;
}
}
.warnings {
div {
border: 1px solid black;
background-color: white;
}
}
.dataset.state-running {
.title-bar {
color: white;
}
}
.dataset.state-paused, .dataset.state-new, .dataset.state-queued {
.title-bar {
color: black;
}
.primary-actions, .left, .right {
a.icon-btn, div.icon-btn, div.icon-btn > a {
color: black;
}
}
}
.dataset.state-running {
.title-bar {
color: white;
}
}
.dataset.state-paused,
.dataset.state-new,
.dataset.state-queued {
.title-bar {
color: black;
}
.primary-actions,
.left,
.right {
a.icon-btn,
div.icon-btn,
div.icon-btn > a {
color: black;
}
}
}
}
.current-history-panel .list-item.history-content.current-content {
border-left: 5px solid $gray-darker !important;
border-left: 5px solid $gray-darker !important;
}
// Modals
//
div.modal {
div.modal-footer {
button {
border: 1px solid black;
background: white;
}
}
div.modal-footer {
button {
border: 1px solid black;
background: white;
}
}
}
// Select2
.select2-container {
box-shadow: none;
box-shadow: none;
ul.select2-choices {
border: 1px solid $gray-dark;
box-shadow: none;
ul.select2-choices {
border: 1px solid $gray-dark;
box-shadow: none;
li.select2-search-choice {
background: white;
color: black;
border: 1px solid black;
}
}
li.select2-search-choice {
background: white;
color: black;
border: 1px solid black;
}
}
}
// pages
.unified-panel-header {
.panel-header-text {
color: black !important;
}
.panel-header-text {
color: black !important;
}
}
// Library
.library_style_container tr:hover td {
background-color: $gray-lighter !important;
background-color: $gray-lighter !important;
}
.library_style_container tr.dark td {
background-color: $gray-light !important;
border-bottom-color: $gray-light !important;
background-color: $gray-light !important;
border-bottom-color: $gray-light !important;
}
// Pagination
.pagination > .active > a {
background-color: $brand-primary !important;
background-color: $brand-primary !important;
}
.pagination a {
padding-left: 0.8em !important;
padding-right: 0.8em !important;
padding-left: 0.8em !important;
padding-right: 0.8em !important;
}
+136 -137
View File
@@ -1,232 +1,231 @@
// Mix-ins
@mixin borderRadius($radius) {
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
border-radius: $radius;
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
border-radius: $radius;
}
@mixin boxShadow($boxShadow) {
-moz-box-shadow: $boxShadow;
-webkit-box-shadow: $boxShadow;
box-shadow: $boxShadow;
-moz-box-shadow: $boxShadow;
-webkit-box-shadow: $boxShadow;
box-shadow: $boxShadow;
}
@mixin opacity($opacity) {
$opacityPercent: $opacity * 100;
opacity: $opacity;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=${opacityPercent})";
filter: "alpha(opacity=${opacityPercent})";
$opacityPercent: $opacity * 100;
opacity: $opacity;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=${opacityPercent})";
filter: "alpha(opacity=${opacityPercent})";
}
@mixin wordWrap($wordWrap: break-word) {
-ms-word-wrap: $wordWrap;
word-wrap: $wordWrap;
-ms-word-wrap: $wordWrap;
word-wrap: $wordWrap;
}
// Variables
$black: #000000;
$grey: #999999;
$light-grey: #CCCCCC;
$white: #FFFFFF;
$light-grey: #cccccc;
$white: #ffffff;
$near-black: #030303;
$green: #51A351;
$red: #BD362F;
$blue: #2F96B4;
$orange: #F89406;
$green: #51a351;
$red: #bd362f;
$blue: #2f96b4;
$orange: #f89406;
// Styles
.toast-title {
font-weight: bold;
font-weight: bold;
}
.toast-message {
@include wordWrap();
@include wordWrap();
a,
label {
color: $white;
}
a,
label {
color: $white;
}
a:hover {
color: $light-grey;
text-decoration: none;
}
a:hover {
color: $light-grey;
text-decoration: none;
}
}
.toast-close-button {
position: relative;
right: -0.3em;
top: -0.3em;
float: right;
font-size: 20px;
font-weight: bold;
color: $white;
-webkit-text-shadow: 0 1px 0 rgba(255,255,255,1);
text-shadow: 0 1px 0 rgba(255,255,255,1);
@include opacity(1);
position: relative;
right: -0.3em;
top: -0.3em;
float: right;
font-size: 20px;
font-weight: bold;
color: $white;
-webkit-text-shadow: 0 1px 0 rgba(255, 255, 255, 1);
text-shadow: 0 1px 0 rgba(255, 255, 255, 1);
@include opacity(1);
&:hover,
&:focus {
color: $black;
text-decoration: none;
cursor: pointer;
@include opacity(1);
}
&:hover,
&:focus {
color: $black;
text-decoration: none;
cursor: pointer;
@include opacity(1);
}
}
/*Additional properties for button version
iOS requires the button element instead of an anchor tag.
If you want the anchor version, it requires `href="#"`.*/
button.toast-close-button {
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
}
//#endregion
.toast-top-full-width {
top: 0;
right: 0;
width: 100%;
top: 0;
right: 0;
width: 100%;
}
.toast-bottom-full-width {
bottom: 0;
right: 0;
width: 100%;
bottom: 0;
right: 0;
width: 100%;
}
.toast-top-left {
top: 12px;
left: 12px;
top: 12px;
left: 12px;
}
.toast-top-right {
top: 12px;
right: 12px;
top: 12px;
right: 12px;
}
.toast-bottom-right {
right: 12px;
bottom: 12px;
right: 12px;
bottom: 12px;
}
.toast-bottom-left {
bottom: 12px;
left: 12px;
bottom: 12px;
left: 12px;
}
#toast-container {
position: fixed;
z-index: 999999;
position: fixed;
z-index: 999999;
* {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
* {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
> div {
margin: 4em 0 6px;
padding: 15px 15px 15px 50px;
width: 300px;
@include borderRadius(3px 3px 3px 3px);
background-position: 15px center;
background-repeat: no-repeat;
@include boxShadow(0 0 12px $grey);
color: $white;
@include opacity(1);
}
> div {
margin: 4em 0 6px;
padding: 15px 15px 15px 50px;
width: 300px;
@include borderRadius(3px 3px 3px 3px);
background-position: 15px center;
background-repeat: no-repeat;
@include boxShadow(0 0 12px $grey);
color: $white;
@include opacity(1);
}
> :hover {
@include boxShadow(0 0 12px $black);
@include opacity(1);
cursor: pointer;
}
> :hover {
@include boxShadow(0 0 12px $black);
@include opacity(1);
cursor: pointer;
}
> .toast-info {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=") !important;
}
> .toast-info {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=") !important;
}
> .toast-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=") !important;
}
> .toast-error {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=") !important;
}
> .toast-success {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==") !important;
}
> .toast-success {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==") !important;
}
> .toast-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
}
> .toast-warning {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=") !important;
}
/*overrides*/
&.toast-top-full-width > div,
&.toast-bottom-full-width > div {
width: 96%;
margin: auto;
}
/*overrides*/
&.toast-top-full-width > div,
&.toast-bottom-full-width > div {
width: 96%;
margin: auto;
}
}
.toast {
background-color: $near-black;
background-color: $near-black;
}
.toast-success {
background-color: $green;
background-color: $green;
}
.toast-error {
background-color: $red;
background-color: $red;
}
.toast-info {
background-color: $blue;
background-color: $blue;
}
.toast-warning {
background-color: $orange;
background-color: $orange;
}
/*Responsive Design*/
@media all and (max-width: 240px) {
#toast-container {
#toast-container {
> div {
padding: 8px 8px 8px 50px;
width: 11em;
}
> div {
padding: 8px 8px 8px 50px;
width: 11em;
}
& .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
& .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
}
@media all and (min-width: 241px) and (max-width: 480px) {
#toast-container {
> div {
padding: 8px 8px 8px 50px;
width: 18em;
}
#toast-container {
> div {
padding: 8px 8px 8px 50px;
width: 18em;
}
& .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
& .toast-close-button {
right: -0.2em;
top: -0.2em;
}
}
}
@media all and (min-width: 481px) and (max-width: 768px) {
#toast-container {
> div {
padding: 15px 15px 15px 50px;
width: 25em;
}
}
#toast-container {
> div {
padding: 15px 15px 15px 50px;
width: 25em;
}
}
}
+3 -3
View File
@@ -1,4 +1,4 @@
.tour-tour > .popover-title{
background-color: $base-color-1;
color: $white;
.tour-tour > .popover-title {
background-color: $base-color-1;
color: $white;
}
+40 -37
View File
@@ -1,5 +1,5 @@
/* Z-indexes for levels used in viz; overlay level is shown above base level. */
$base-index: 1;
$base-index: 1;
$overlay-index: $base-index + 1;
$track-header-height: 16px;
$min-track-height: ($track-header-height + 4);
@@ -24,9 +24,9 @@ $separator-color: #888;
.trackster-nav {
padding: 0 0;
color:#333;
font-weight:bold;
background:#cccccc;
color: #333;
font-weight: bold;
background: #cccccc;
display: inline-block;
top: -2em;
background: transparent;
@@ -55,8 +55,9 @@ $separator-color: #888;
}
}
#zoom-in, #zoom-out {
display:inline-block;
#zoom-in,
#zoom-out {
display: inline-block;
height: 16px;
width: 16px;
margin-bottom: -3px;
@@ -87,7 +88,7 @@ $separator-color: #888;
.intro {
z-index: $overlay-index;
/* margin-top: 200px;*/
/* margin-top: 200px;*/
margin-left: auto;
margin-right: auto;
color: #555;
@@ -95,10 +96,10 @@ $separator-color: #888;
font-size: 16px;
.action-button {
background-color: #CCC;
background-color: #ccc;
margin-top: 10px;
padding: 1em;
text-decoration:underline;
text-decoration: underline;
}
}
@@ -111,8 +112,8 @@ $separator-color: #888;
.overview-viewport {
position: relative;
height: 14px;
/* border-top: solid #666 1px;*/
/* border-bottom: solid #aaa 1px;*/
/* border-top: solid #666 1px;*/
/* border-bottom: solid #aaa 1px;*/
background: white;
margin: 0;
}
@@ -153,7 +154,7 @@ $separator-color: #888;
position: absolute;
margin-top: 0px;
height: 14px;
background: #C1C9E5 url(../images/visualization/draggable_horizontal.png) center center no-repeat;
background: #c1c9e5 url(../images/visualization/draggable_horizontal.png) center center no-repeat;
border: solid #666 1px;
}
@@ -175,7 +176,7 @@ $separator-color: #888;
.group-handle {
cursor: move;
float: left;
background: #eee url('../images/tracks/block.png');
background: #eee url("../images/tracks/block.png");
width: 12px;
height: 12px;
}
@@ -205,7 +206,7 @@ $separator-color: #888;
/* Make header opaque when focused on. */
&:hover {
background-color: #DDDDDD;
background-color: #dddddd;
}
// Truncate long track names.
@@ -227,7 +228,7 @@ $separator-color: #888;
}
.tiles {
background: url('../images/tracks/diag_bg.gif');
background: url("../images/tracks/diag_bg.gif");
position: relative;
overflow: hidden;
}
@@ -262,15 +263,15 @@ $separator-color: #888;
border-bottom: 1px solid $separator-color;
&.error {
background: #ECB4AF;
background: #ecb4af;
}
&.nodata {
background: #EEEEEE;
background: #eeeeee;
}
&.pending {
background: #FFFFCC;
background: #ffffcc;
}
}
@@ -313,10 +314,9 @@ $separator-color: #888;
}
.track-content {
border: none;
background: white;
border: none;
background: white;
}
}
.reference-track {
@@ -362,7 +362,8 @@ input {
}
}
.dynamic-tool, .filters {
.dynamic-tool,
.filters {
padding-top: ($track-header-height + 2);
padding-bottom: 0.5em;
margin-left: 0.25em;
@@ -404,7 +405,7 @@ input {
float: left;
width: 40%;
position: relative;
padding-top:2px;
padding-top: 2px;
}
.tool-name {
@@ -434,7 +435,7 @@ input {
}
.track-icons {
float: left
float: left;
}
// Defines icons that change from black/white to normal on hover. Note that the images
@@ -442,10 +443,10 @@ input {
// TODO: make images into spritemap.
@mixin icon-hover-mixin($name) {
&.#{$name} {
background: transparent url('../images/fugue/${name}-bw.png') no-repeat;
background: transparent url("../images/fugue/${name}-bw.png") no-repeat;
&:hover {
background: transparent url('../images/fugue/${name}.png') no-repeat;
background: transparent url("../images/fugue/${name}.png") no-repeat;
}
}
}
@@ -466,22 +467,24 @@ input {
@include icon-hover-mixin(layer-transparent);
}
.remove-icon, .overview-close {
.remove-icon,
.overview-close {
background: transparent url(../images/fugue/cross-small-bw.png) no-repeat;
}
.icon-button.remove-icon:hover, .overview-close:hover {
.icon-button.remove-icon:hover,
.overview-close:hover {
background: transparent url(../images/fugue/cross-circle.png) no-repeat;
}
.child-track-icon {
background:url('../images/fugue/arrow-000-small-bw.png') no-repeat;
background: url("../images/fugue/arrow-000-small-bw.png") no-repeat;
width: 30px;
cursor: move;
}
.track-resize {
background: white url('../images/visualization/draggable_vertical.png') no-repeat top center;
background: white url("../images/visualization/draggable_vertical.png") no-repeat top center;
position: absolute;
right: 3px;
bottom: -4px;
@@ -492,12 +495,12 @@ input {
}
.bookmark {
background:white;
border:solid #999 1px;
border-right:none;
margin:0.5em;
margin-right:0;
padding:0.5em;
background: white;
border: solid #999 1px;
border-right: none;
margin: 0.5em;
margin-right: 0;
padding: 0.5em;
.position {
font-weight: bold;
@@ -505,7 +508,7 @@ input {
}
.delete-icon-container {
float:right;
float: right;
}
/*
+45 -41
View File
@@ -12,11 +12,11 @@
}
.no-transition {
-webkit-transition: none !important;
-moz-transition: none !important;
-o-transition: none !important;
-ms-transition: none !important;
transition: none !important;
-webkit-transition: none !important;
-moz-transition: none !important;
-o-transition: none !important;
-ms-transition: none !important;
transition: none !important;
}
.fa-rotate-45 {
@@ -71,7 +71,7 @@ $ui-margin-horizontal-large: 10px;
}
.ui-label {
font-weight: bold;
font-weight: bold;
}
.ui-tags {
@@ -180,7 +180,7 @@ $ui-margin-horizontal-large: 10px;
font-size: 0.8em;
font-weight: normal;
top: -1px;
word-wrap:break-word;
word-wrap: break-word;
}
}
.button.disabled {
@@ -212,7 +212,7 @@ $ui-margin-horizontal-large: 10px;
color: $base-text-color;
background: $side-panel-bg;
padding: 10px;
min-height:100%;
min-height: 100%;
.ui-side-section-title {
font-weight: bold;
}
@@ -281,7 +281,7 @@ $ui-margin-horizontal-large: 10px;
padding: 5px;
margin: 5px;
cursor: pointer;
border-radius:5px;
border-radius: 5px;
.ui-thumbnails-title {
text-align: center;
font-size: 0.9em;
@@ -320,11 +320,11 @@ $ui-margin-horizontal-large: 10px;
}
}
.ui-thumbnail-current-highlight {
border-color:#66afe9;
background-color:#EEEEFF;
outline:0;
-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
border-color: #66afe9;
background-color: #eeeeff;
outline: 0;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
}
.ui-thumbnails-item-float {
float: left;
@@ -348,7 +348,7 @@ $ui-margin-horizontal-large: 10px;
.ui-table-striped {
@extend .table;
@extend .table-striped;
width : 100%;
width: 100%;
margin-bottom: 0px;
th {
text-align: center;
@@ -364,7 +364,7 @@ $ui-margin-horizontal-large: 10px;
.ui-table-plain {
@extend .ui-table;
table-layout:fixed;
table-layout: fixed;
tbody {
cursor: auto !important;
@@ -424,7 +424,7 @@ $ui-margin-horizontal-large: 10px;
height: 100%;
background: $white;
display: block;
opacity: 0.0;
opacity: 0;
cursor: default;
}
}
@@ -448,8 +448,8 @@ $ui-margin-horizontal-large: 10px;
}
.ui-form-separator {
font-weight: bold;
font-size: 0.9em;
font-weight: bold;
font-size: 0.9em;
}
.ui-form-help {
@@ -466,7 +466,7 @@ $ui-margin-horizontal-large: 10px;
padding: 2px 5px;
}
.ui-form-title {
clear:both;
clear: both;
font-weight: bold;
padding-right: $ui-margin-horizontal;
}
@@ -474,7 +474,7 @@ $ui-margin-horizontal-large: 10px;
.ui-form-error {
display: none;
.ui-form-error-text {
.ui-form-error-text {
padding-left: $ui-margin-horizontal;
}
}
@@ -511,14 +511,15 @@ $ui-margin-horizontal-large: 10px;
.portlet-content {
padding: 0px $ui-margin-horizontal 0px $ui-margin-horizontal;
}
.ui-table-section, .ui-portlet-repeat .portlet-content {
.ui-table-section,
.ui-portlet-repeat .portlet-content {
padding-left: $ui-margin-horizontal-large;
}
}
}
.ui-message {
margin-top: 0px;
margin-bottom:10px;
margin-bottom: 10px;
}
}
@@ -535,7 +536,7 @@ $ui-margin-horizontal-large: 10px;
border-bottom: solid $form-border 1px;
padding: 2px 8px;
overflow: visible;
width:100%;
width: 100%;
.portlet-title {
word-wrap: break-word;
display: inline;
@@ -567,9 +568,9 @@ $ui-margin-horizontal-large: 10px;
padding-right: 10px;
clear: both;
.portlet-body {
padding : 0px;
height : 100%;
width : 100%;
padding: 0px;
height: 100%;
width: 100%;
}
.portlet-buttons {
margin-top: $ui-margin-vertical-large;
@@ -579,7 +580,8 @@ $ui-margin-horizontal-large: 10px;
}
}
}
.portlet-content.nopadding, .portlet-body.nopadding {
.portlet-content.nopadding,
.portlet-body.nopadding {
padding: 0px;
}
.portlet-backdrop {
@@ -656,7 +658,8 @@ $ui-margin-horizontal-large: 10px;
.portlet-content {
padding: 0px;
}
.ui-table-section, .ui-portlet-repeat .portlet-content {
.ui-table-section,
.ui-portlet-repeat .portlet-content {
padding-left: $ui-margin-horizontal;
}
}
@@ -701,7 +704,7 @@ $ui-margin-horizontal-large: 10px;
color: $input-color;
border: 1px solid $input-border;
border-radius: $input-border-radius;
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075));
background-image: none;
background: transparent;
-webkit-appearance: none;
@@ -716,7 +719,7 @@ $ui-margin-horizontal-large: 10px;
.ui-input-basic {
@extend .ui-input;
@include box-shadow(inset 0 -1px 1px rgba(0,0,0,.075));
@include box-shadow(inset 0 -1px 1px rgba(0, 0, 0, 0.075));
}
.ui-textarea {
@@ -728,7 +731,8 @@ $ui-margin-horizontal-large: 10px;
.ui-options-list {
@extend .ui-input;
height: 100% !important;
input[type=checkbox], input[type=radio] {
input[type="checkbox"],
input[type="radio"] {
display: none;
}
label {
@@ -736,18 +740,17 @@ $ui-margin-horizontal-large: 10px;
cursor: pointer;
}
.ui-drilldown-button {
float:left;
float: left;
cursor: pointer;
font-size: 1.2em;
margin-right: 5px;
margin-top: 3px;
}
.ui-drilldown-subgroup {
display: none;
margin-left: 25px;
}
input[type=checkbox] + label:before {
input[type="checkbox"] + label:before {
font-family: FontAwesome;
display: inline-block;
font-style: normal;
@@ -758,10 +761,10 @@ $ui-margin-horizontal-large: 10px;
width: 10px;
content: "\f096";
}
input[type=checkbox]:checked + label:before {
input[type="checkbox"]:checked + label:before {
content: "\f046";
}
input[type=radio] + label:before {
input[type="radio"] + label:before {
font-family: FontAwesome;
display: inline-block;
font-style: normal;
@@ -772,7 +775,7 @@ $ui-margin-horizontal-large: 10px;
width: 10px;
content: "\f1db";
}
input[type=radio]:checked + label:before {
input[type="radio"]:checked + label:before {
content: "\f192";
}
}
@@ -891,7 +894,8 @@ $ui-margin-horizontal-large: 10px;
float: left;
}
}
.ui-list-message, .ui-list-portlet {
.ui-list-message,
.ui-list-portlet {
clear: both;
padding-top: 1px;
}
@@ -980,7 +984,7 @@ $ui-margin-horizontal-large: 10px;
}
select {
height: 80px;
@include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075));
}
}
@@ -1025,7 +1029,7 @@ $ui-margin-horizontal-large: 10px;
.select2-dropdown-open .select2-choice,
.select2-dropdown-open .select2-choices {
border: 1px solid $input-border;
border-bottom-left-radius: 0px ;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
}
.select2-dropdown-open.select2-drop-above .select2-choice,
@@ -15,7 +15,7 @@
.prompt {
margin-right: 8px;
&:after {
content: ':';
content: ":";
}
&:empty {
display: none;
@@ -34,13 +34,13 @@
.subtitle {
color: grey;
&:before {
content: '-';
content: "-";
margin: 0px 4px 0px 4px;
}
i {
font-style: normal;
&:not(:last-child):after {
content: ', ';
content: ", ";
}
}
}
@@ -91,4 +91,3 @@
font-size: 120%;
}
}
+11 -11
View File
@@ -1,14 +1,14 @@
$icon-btn-size: 22px;
$icon-btn-margin: 2px;
$icon-btn-color: $btn-default-color;
$icon-btn-size: 22px;
$icon-btn-margin: 2px;
$icon-btn-color: $btn-default-color;
$icon-btn-bg: $btn-default-bg;
$icon-btn-border: $btn-default-border;
$icon-btn-bg: $btn-default-bg;
$icon-btn-border: $btn-default-border;
.icon-btn {
display : inline-block;
height : $icon-btn-size;
width : $icon-btn-size;
display: inline-block;
height: $icon-btn-size;
width: $icon-btn-size;
font-size: 125%;
// center the icon
@@ -19,7 +19,7 @@ $icon-btn-border: $btn-default-border;
border-radius: 3px;
border: 1px solid $icon-btn-border;
background-color: $icon-btn-bg;
color : $icon-btn-color;
color: $icon-btn-color;
cursor: pointer;
@@ -33,8 +33,8 @@ $icon-btn-border: $btn-default-border;
.icon-btn.disabled {
background-color: transparent;
color: #BBB;
border-color: #BBB;
color: #bbb;
border-color: #bbb;
}
.icon-btn-group {
+13 -13
View File
@@ -4,31 +4,31 @@
}
.pagination-scroll-container {
display : inline-block;
background-color: #F8F8F8;
border-radius : 3px;
border : 1px solid #BFBFBF;
overflow : auto;
display: inline-block;
background-color: #f8f8f8;
border-radius: 3px;
border: 1px solid #bfbfbf;
overflow: auto;
}
.pagination-scroll-container .pagination-page-list {
margin : 3px 0px 3px 0px;
margin: 3px 0px 3px 0px;
}
.pagination-scroll-container .pagination-page-list > li:first-child > a,
.pagination-scroll-container .pagination-page-list > li:first-child > span {
border-radius : 0px;
border-left : 0px;
border-radius: 0px;
border-left: 0px;
}
.pagination-scroll-container .pagination-page-list > li:last-child > a,
.pagination-scroll-container .pagination-page-list > li:last-child > span {
border-radius : 0px;
border-radius: 0px;
}
.pagination-scroll-container .pagination-page-list > li > a {
float : none;
position : static;
border : 1px solid #BFBFBF;
border-width : 0px 0px 0px 1px;
float: none;
position: static;
border: 1px solid #bfbfbf;
border-width: 0px 0px 0px 1px;
}
@@ -1,6 +1,5 @@
// ======================================================================== all types
.collection-creator {
height: 100%;
overflow: hidden;
@@ -9,7 +8,8 @@
-ms-user-select: none;
// ------------------------------------------------------------------------ general
ol, li {
ol,
li {
list-style: none;
padding: 0;
margin: 0;
@@ -18,7 +18,7 @@
padding: 0px 8px 0px 8px;
}
.btn {
border-color: #BFBFBF;
border-color: #bfbfbf;
}
.vertically-spaced {
@@ -131,7 +131,7 @@
.title-info {
color: grey;
&:before {
content: ' - ';
content: " - ";
}
}
}
@@ -177,7 +177,8 @@
//text-decoration: underline;
//text-decoration-style: dashed;
}
ul, li {
ul,
li {
list-style: circle;
margin-left: 16px;
}
@@ -210,7 +211,6 @@
.reverse-column .column-title {
text-align: right;
}
}
// ------------------------------------------------------------------------ middle
@@ -249,7 +249,7 @@
margin-left: 34px;
margin-right: 34px;
border: 2px solid grey;
background: #AFF1AF;
background: #aff1af;
span {
display: inline-block;
@@ -262,7 +262,7 @@
&:after {
margin-left: 8px;
font-family: FontAwesome;
content: '\f061';
content: "\f061";
}
}
.pair-name-column {
@@ -277,7 +277,7 @@
&:before {
margin-right: 8px;
font-family: FontAwesome;
content: '\f060';
content: "\f060";
}
}
}
@@ -331,7 +331,7 @@
height: 8px;
cursor: ns-resize;
&:before {
content: '...';
content: "...";
}
line-height: 2px;
text-align: center;
@@ -376,8 +376,8 @@
background: transparent;
font-size: 120%;
&:hover {
border-color: #BFBFBF;
background: #DEDEDE;
border-color: #bfbfbf;
background: #dedede;
}
}
.empty-message {
@@ -385,16 +385,16 @@
}
}
.element-drop-placeholder {
width : 60px;
height : 3px;
margin : 2px 0px 0px 14px;
background : black;
width: 60px;
height: 3px;
margin: 2px 0px 0px 14px;
background: black;
&:before {
float: left;
font-size: 120%;
margin: -9px 0px 0px -8px;
font-family: FontAwesome;
content: '\f0da';
content: "\f0da";
}
&:last-child {
margin-bottom: 8px;
@@ -425,7 +425,7 @@
}
.collection-name-prompt.validation-warning:before {
//TODO: localize (somehow)
content: '(required)';
content: "(required)";
margin-right: 4px;
color: red;
}
@@ -449,7 +449,6 @@
// ======================================================================== list
.collection-creator.list-collection-creator {
.footer {
margin-top: 8px;
}
@@ -477,7 +476,7 @@
.collection-element {
height: 32px;
margin: 2px 4px 0px 4px;
opacity: 1.0;
opacity: 1;
border: 1px solid lightgrey;
border-radius: 3px;
padding: 0 8px 0 8px;
@@ -519,7 +518,7 @@
}
}
.element-drop-placeholder {
margin-left : 8px;
margin-left: 8px;
&:before {
margin: -8.5px 0px 0px -8px;
}
@@ -564,7 +563,7 @@
.collection-element {
height: 32px;
margin: 2px 4px 0px 4px;
opacity: 1.0;
opacity: 1;
border: 1px solid lightgrey;
border-radius: 3px;
padding: 0 8px 0 8px;
@@ -584,7 +583,7 @@
}
.identifier {
&:after {
content: ':';
content: ":";
margin-right: 6px;
}
}
@@ -608,4 +607,3 @@
margin-bottom: 8px;
}
}
@@ -48,7 +48,7 @@
}
.peek-column-selector .control td:hover .button {
background-color: #EEE;
background-color: #eee;
border: 1px solid black;
cursor: pointer;
color: black;
@@ -57,9 +57,9 @@
.peek-column-selector .control td.disabled .button,
.peek-column-selector .control td.disabled:hover .button {
background-color: transparent;
border: 1px solid #CCC;
border: 1px solid #ccc;
cursor: not-allowed;
color: #CCC;
color: #ccc;
}
.peek-column-selector .control td.selected .button {
+12 -13
View File
@@ -1,27 +1,26 @@
// search bar, see: scripts/jq-plugins/ui/search-input.js
.search-input {
.search-query {
width : 100%;
padding-right : 24px;
width: 100%;
padding-right: 24px;
}
.search-clear,
.search-loading {
// it places the icons on the right of the bar (and puts the lotion on its skin)
position : relative;
display : inline-block;
position: relative;
display: inline-block;
float : right;
margin-top : -24px;
margin-right : 4px;
float: right;
margin-top: -24px;
margin-right: 4px;
font-size : 1.4em;
line-height : 23px;
color : grey;
font-size: 1.4em;
line-height: 23px;
color: grey;
}
.search-clear:hover {
color : $link-color;
cursor : pointer;
color: $link-color;
cursor: pointer;
}
}
+38 -38
View File
@@ -37,25 +37,25 @@
.upload-view-default {
.highlight {
border-color : $table-border-color !important;
border-width : 2px !important;
padding : 9px !important;
border-color: $table-border-color !important;
border-width: 2px !important;
padding: 9px !important;
.upload-helper {
color : $table-border-color !important;
color: $table-border-color !important;
}
}
.upload-box {
width : 100%;
height : 310px;
text-align : center;
overflow : scroll;
font-size : $font-size-base;
line-height : $line-height-large;
width: 100%;
height: 310px;
text-align: center;
overflow: scroll;
font-size: $font-size-base;
line-height: $line-height-large;
-moz-border-radius: $border-radius-large;
border-radius : $border-radius-large;
border : 1px dashed $btn-default-border;
padding : 10px;
overflow-x : hidden;
border-radius: $border-radius-large;
border: 1px dashed $btn-default-border;
padding: 10px;
overflow-x: hidden;
-ms-overflow-style: none;
.upload-helper {
@extend h3;
@@ -83,14 +83,14 @@
.upload-title {
width: 130px;
word-wrap: break-word;
font-size : $font-size-sm;
font-size: $font-size-sm;
float: left;
}
/* Add back in lenght of extension, genome, and settings. */
.upload-title-extended {
width: 380px;
word-wrap: break-word;
font-size : $font-size-sm;
font-size: $font-size-sm;
float: left;
}
.upload-size {
@@ -100,12 +100,12 @@
.upload-extension {
width: 100px;
min-width: 100px;
font-size : $font-size-sm;
font-size: $font-size-sm;
}
.upload-genome {
width: 150px;
min-width: 150px;
font-size : $font-size-sm;
font-size: $font-size-sm;
}
.upload-mode {
font-size: 1.2em;
@@ -120,7 +120,7 @@
position: absolute;
display: none;
.upload-text-content {
font-size : $font-size-sm;
font-size: $font-size-sm;
width: 100%;
height: 80px;
resize: none;
@@ -131,16 +131,16 @@
}
.upload-text-info {
@extend .text-primary;
font-size : $font-size-sm;
font-size: $font-size-sm;
}
}
}
.upload-info {
width: 130px;
font-size : $font-size-sm;
font-size: $font-size-sm;
line-height: 1.2em;
.progress {
top:1px;
top: 1px;
position: relative;
width: 100%;
padding: 0px;
@@ -259,7 +259,7 @@
.upload-ftp-full {
@extend .upload-ftp-base;
.upload-ftp-content {
line-height: 2.0em !important;
line-height: 2em !important;
}
th {
text-align: center !important;
@@ -281,10 +281,10 @@
}
.upload-footer {
height:20px;
text-align:left;
max-height:20px;
line-height:18px;
height: 20px;
text-align: left;
max-height: 20px;
line-height: 18px;
margin-top: 10px;
.upload-footer-title {
font-weight: bold;
@@ -296,16 +296,16 @@
padding-left: 20px;
padding-right: 10px;
}
.upload-footer-selection{
width:200px;
min-width:200px;
font-size:11px;
.upload-footer-selection {
width: 200px;
min-width: 200px;
font-size: 11px;
padding-right: 10px;
}
.upload-footer-selection-compressed{
width:120px;
min-width:120px;
font-size:11px;
.upload-footer-selection-compressed {
width: 120px;
min-width: 120px;
font-size: 11px;
padding-right: 10px;
}
.select2-choice {
@@ -315,14 +315,14 @@
max-height: 20px;
line-height: 18px;
background: transparent;
text-align:center;
text-align: center;
font-weight: normal;
}
}
.upload-top {
height:20px;
text-align:center;
height: 20px;
text-align: center;
.upload-top-info {
margin-top: 0px;
font-weight: normal;
+4 -2
View File
@@ -54,7 +54,9 @@
"jshint": "jshint --exclude='galaxy/scripts/libs/**' galaxy/scripts/**/*.js",
"build-charts": "webpack -p --config ../config/plugins/visualizations/charts/webpack.config.js",
"build-scatterplot": "NODE_PATH=./node_modules webpack -p --config ../config/plugins/visualizations/scatterplot/webpack.config.js",
"prettier": "prettier --write --tab-width 4 --print-width 120 \"galaxy/scripts/{,!(libs)/**/}/{*.js,*.vue}\"",
"prettier": "concurrently \"yarn run prettier-style\" \"yarn run prettier-scripts\"",
"prettier-scripts": "prettier --write --tab-width 4 --print-width 120 \"galaxy/scripts/{,!(libs)/**/}/{*.js,*.vue}\"",
"prettier-style": "prettier --write --tab-width 4 --print-width 120 \"galaxy/style/scss/**/*.scss\"",
"styleguide": "vue-styleguidist server",
"styleguide:build": "vue-styleguidist build"
},
@@ -87,7 +89,7 @@
"node-sass": "^4.8.3",
"phantomjs-polyfill": "0.0.2",
"phantomjs-prebuilt": "^2.1.7",
"prettier": "^1.10.1",
"prettier": "^1.11.1",
"qunitjs": "^2.4.1",
"sass-loader": "^6.0.7",
"sinon": "^4.1.2",
+3 -3
View File
@@ -7888,9 +7888,9 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@^1.10.1:
version "1.10.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.1.tgz#01423fea6957ea23618d37d339ef0e7f7c967fc6"
prettier@^1.11.1:
version "1.11.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
prettier@^1.7.0:
version "1.8.2"
+4 -4
View File
@@ -45,7 +45,7 @@
margin-left: 0.3em; }
.ac_over {
background-color: #0A246A;
background-color: #0a246a;
color: white; }
.ac_header {
@@ -85,9 +85,9 @@
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;
-moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em;
border-radius: 0.5em;
background: #eee; }
.tag-button img {
+619 -280
View File
File diff suppressed because it is too large Load Diff
+6 -5
View File
@@ -26,7 +26,8 @@
.embedded-item table.annotated-item {
width: 100%;
border-collapse: collapse; }
.embedded-item table.annotated-item td, .embedded-item th {
.embedded-item table.annotated-item td,
.embedded-item th {
padding: 0; }
.embedded-item table.annotated-item .annotation {
padding-left: 2em;
@@ -39,20 +40,20 @@
padding: 5px 10px 10px 10px; }
.embedded-item.history {
background-color: #C1C9E5; }
background-color: #c1c9e5; }
.embedded-item.dataset {
background-color: #CFC; }
background-color: #cfc; }
.embedded-item.dataset .item-content {
padding: 5px; }
.embedded-item.workflow {
background-color: #FBDDB3; }
background-color: #fbddb3; }
.embedded-item.workflow .item-content {
padding: 5px; }
.embedded-item.visualization {
background-color: #BBBBBB; }
background-color: #bbbbbb; }
.embedded-item.visualization .item-content {
overflow: hidden;
height: 100%; }
+16 -7
View File
@@ -11,7 +11,10 @@ label {
overflow: auto !important; }
.library_style_container .fa {
font-size: 12px; }
.library_style_container .fa-globe, .library_style_container .fa-shield, .library_style_container .fa-key, .library_style_container .fa-ban {
.library_style_container .fa-globe,
.library_style_container .fa-shield,
.library_style_container .fa-key,
.library_style_container .fa-ban {
font-size: initial;
margin-left: 0.6em; }
.library_style_container .libraryRow {
@@ -22,9 +25,11 @@ label {
font-style: italic; }
.library_style_container div.libraryItemBody {
padding: 4px 4px 2px 4px; }
.library_style_container li.folderRow, .library_style_container li.datasetRow {
.library_style_container li.folderRow,
.library_style_container li.datasetRow {
border-top: solid 1px spin(#a8afc6, 180); }
.library_style_container li.folderRow:hover, .library_style_container li.datasetRow:hover {
.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;
@@ -38,7 +43,7 @@ label {
.library_style_container .library_table th {
border-bottom: 2px solid #5f6990 !important; }
.library_style_container .library_table a {
color: #0A143D; }
color: #0a143d; }
.library_style_container .library_table a:hover {
color: maroon; }
.library_style_container tr.light td {
@@ -54,7 +59,9 @@ label {
color: white; }
.library_style_container a.dark {
color: white; }
.library_style_container .dataset_table tr, .library_style_container .dataset_table th, .library_style_container .dataset_table td {
.library_style_container .dataset_table tr,
.library_style_container .dataset_table th,
.library_style_container .dataset_table td {
border: none; }
.library_style_container .dataset_table .dataset-first-column {
width: 30%; }
@@ -74,7 +81,8 @@ label {
margin-right: 0.2em; }
.library_style_container #library_toolbar .toolbar-item {
margin-left: 0.5em; }
.library_style_container #libraries_element button, .library_style_container #folder_items_element button {
.library_style_container #libraries_element button,
.library_style_container #folder_items_element button {
margin-left: 0.5em; }
.library_style_container .right-float {
float: right; }
@@ -97,7 +105,8 @@ label {
.modal-content .library_selected_history_content ul {
list-style-type: none; }
.modal-content .library-collection-type-select, .modal-content .library-collection-history-select {
.modal-content .library-collection-type-select,
.modal-content .library-collection-history-select {
margin-left: auto;
margin-right: auto;
width: 200px;
+13 -6
View File
@@ -49,7 +49,8 @@
font-size: 7px;
text-anchor: end; }
.axis path, .axis line {
.axis path,
.axis line {
fill: none;
stroke: #000;
shape-rendering: preserveAspectRatio; }
@@ -61,14 +62,15 @@
.chart .title {
fill: black;
font-size: 15px;
font-family: "Lucida Grande",verdana,arial,helvetica,sans-serif;
font-family: "Lucida Grande", verdana, arial, helvetica, sans-serif;
font-weight: 800;
line-height: 1.1; }
.chart .ax_title {
fill: black; }
.hr_container, .dy_container {
.hr_container,
.dy_container {
position: relative;
z-index: 2;
display: inline-block;
@@ -97,7 +99,11 @@
.tool_tip text {
fill: white; }
#back_button, #next_button, #curr_button, .miss_pages, .page_button {
#back_button,
#next_button,
#curr_button,
.miss_pages,
.page_button {
position: relative;
float: left;
height: 24px;
@@ -162,7 +168,7 @@
border-radius: 11px;
background-color: #ebd9b2;
text-align: center;
opacity: 0.0;
opacity: 0;
z-index: 0; }
.half_width {
@@ -186,7 +192,8 @@
border-spacing: 5px;
border-collapse: separate; }
.lastAccessForm, .diskUsageForm {
.lastAccessForm,
.diskUsageForm {
width: 70%;
margin-left: auto;
margin-right: auto;
+14 -10
View File
@@ -37,7 +37,8 @@
.nav-controls input {
margin: 0 5px; }
#zoom-in, #zoom-out {
#zoom-in,
#zoom-out {
display: inline-block;
height: 16px;
width: 16px;
@@ -71,7 +72,7 @@
text-align: center;
font-size: 16px; }
.intro .action-button {
background-color: #CCC;
background-color: #ccc;
margin-top: 10px;
padding: 1em;
text-decoration: underline; }
@@ -122,7 +123,7 @@
position: absolute;
margin-top: 0px;
height: 14px;
background: #C1C9E5 url(../images/visualization/draggable_horizontal.png) center center no-repeat;
background: #c1c9e5 url(../images/visualization/draggable_horizontal.png) center center no-repeat;
border: solid #666 1px; }
.viewport-canvas {
@@ -164,7 +165,7 @@
margin: 2px;
/* Make header opaque when focused on. */ }
.track-header:hover {
background-color: #DDDDDD; }
background-color: #dddddd; }
.track-header .track-name {
max-width: 200px;
white-space: nowrap;
@@ -204,11 +205,11 @@
position: relative;
border-bottom: 1px solid #888; }
.track.error {
background: #ECB4AF; }
background: #ecb4af; }
.track.nodata {
background: #EEEEEE; }
background: #eeeeee; }
.track.pending {
background: #FFFFCC; }
background: #ffffcc; }
.track-content {
text-align: center;
@@ -271,7 +272,8 @@ input {
input.color-input {
float: left; }
.dynamic-tool, .filters {
.dynamic-tool,
.filters {
padding-top: 18px;
padding-bottom: 0.5em;
margin-left: 0.25em; }
@@ -396,10 +398,12 @@ input {
.icon-button.layer-transparent:hover {
background: transparent url("../images/fugue/${name}.png") no-repeat; }
.remove-icon, .overview-close {
.remove-icon,
.overview-close {
background: transparent url(../images/fugue/cross-small-bw.png) no-repeat; }
.icon-button.remove-icon:hover, .overview-close:hover {
.icon-button.remove-icon:hover,
.overview-close:hover {
background: transparent url(../images/fugue/cross-circle.png) no-repeat; }
.child-track-icon {