Commit 0521eb67 authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Change stopped background color and add unique icon

parent ec30938f

client/src/components/History/Content/ContentItem.vue

+2 −6
Original line number Diff line number Diff line
@@ -110,11 +110,11 @@ import { updateContentFields } from "components/History/model/queries"; 
import { JobStateSummary } from "./Collection/JobStateSummary";

import { library } from "@fortawesome/fontawesome-svg-core";

import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";

import { faArrowCircleUp, faArrowCircleDown, faCheckCircle } from "@fortawesome/free-solid-svg-icons";

import { faArrowCircleUp, faArrowCircleDown, faCheckCircle, faStopCircle } from "@fortawesome/free-solid-svg-icons";

import { useEntryPointStore } from "stores/entryPointStore";

import { clearDrag, setDrag } from "@/utils/setDrag.js";



library.add(faArrowCircleUp, faArrowCircleDown, faCheckCircle);

library.add(faArrowCircleUp, faArrowCircleDown, faCheckCircle, faStopCircle);

export default {

    components: {

        CollectionDescription,
@@ -224,10 +224,6 @@ export default { 
            } else {

                this.$emit("view-collection", this.item, this.name);

            }

            console.log(this.isDataset);

            console.log(this.item.state);

            console.log(this.item);

            console.log(this.$el);

        },

        onDisplay() {

            const entryPointStore = useEntryPointStore();

client/src/components/History/Content/model/states.js

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ export const STATES = { 
    stopped: {

        text: "This job was stopped manually.",

        status: "stopped",

        icon: "stop-circle",

    },

};

client/src/style/scss/base.scss

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ $galaxy-state-border: ( 
    "deleted": darken($state-default-border, 30%),

    "hidden": $state-default-border,

    "setting_metadata": $state-warning-border,

    "stopped": $state-stopped-border,

    "stopped": $state-success-border,

);



$galaxy-state-bg: (
@@ -219,7 +219,7 @@ $galaxy-state-bg: ( 
    "deleted": darken($state-default-bg, 30%),

    "hidden": $state-default-bg,

    "setting_metadata": $state-warning-bg,

    "stopped": $state-stopped-bg,

    "stopped": $state-success-bg,

);



@each $state in map-keys($galaxy-state-border) {

client/src/style/scss/dataset.scss

+2 −2
Original line number Diff line number Diff line
@@ -179,9 +179,9 @@ 
    }



    &.state-stopped {

        background: $state-stopped-bg;

        background: $state-success-bg;

        .state-icon {

            display: none;

            content: fa-content($fa-var-stop-circle );

        }

    }

}

client/src/style/scss/theme/blue.scss

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ $state-default-bg: $gray-200; 
$state-default-border: $border-color;

$state-running-bg: lighten($brand-warning, 40%);

$state-running-border: $border-color;

$state-stopped-bg: #b3db25;

$state-stopped-bg: $brand-success;

$state-stopped-border: $border-color;



// Workflow editor