Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into feature/recipe

Browse Source
This commit is contained in:
Samuele Locatelli
2020-06-30 15:30:43 +02:00
parent d272ff5e02 4f6f5ab867
commit cc9f87d079
3 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active/wwwroot/assets/styles/base/colors.less
+20 -15
View File
@@ -5,23 +5,23 @@
@color-cef-transparency-key: #00FF00;
@color-apple-green:#7ed321;
@color-apple-green: #7ed321;
@color-black-40: rgba(0,0,0,0.4);
@color-black-50: rgba(0,0,0,0.5);
@color-black-40: rgba(0, 0, 0, 0.4);
@color-black-50: rgba(0, 0, 0, 0.5);
@color-background-white: #fff;
@color-white2: #f1f1f1;
@color-whitetwo: #f8f8f8;
@color-white3: #dfdfdf;
@color-white4:#f3f3f3;
@color-white5:#f4f4f4;
@color-white4: #f3f3f3;
@color-white5: #f4f4f4;
@color-whitegrey: #dddddd;
@color-whitethree: #e7e7e7;
@color-silver: #bbbcbc;
@color-battleship-grey: #657178;
@color-nice-blue: #1756ad;
@color-slate-gray:#5c656b;
@color-slate-gray: #5c656b;
@color-gunmetal: #4e585e;
@color-bluish-grey: #808e96;
@color-cerulean: #007cc3;
@@ -32,8 +32,8 @@
@color-darkish-blue: #002680;
@color-darkish-blue-two: #004990;
@color-clear-blue: #1791ff;
@color-clear-blue-30: rgba(23,145,255,0.3);
@color-clear-blue-75: rgba(23,145,255,0.75);
@color-clear-blue-30: rgba(23, 145, 255, 0.3);
@color-clear-blue-75: rgba(23, 145, 255, 0.75);
@color-perrywinkle: #8eb5e2;
@color-white: #fff;
@color-input-light: #4b4b4b;
@@ -44,8 +44,8 @@
@color-squash : #f5a623;
@color-harmonies: #f4bf7e;
@color-light-orange: #ffb31e;
@color-scarlet:#d0021b;
@color-faded-red:#d84b5c;
@color-scarlet: #d0021b;
@color-faded-red: #d84b5c;
@color-sandy: #f3d39d;
@color-duck-egg-blue: #e5f1f9;
@color-greyish-brown: #4b4b4b;
@@ -59,11 +59,11 @@
@color-alarm-background-image: linear-gradient(to bottom, #ff4d63, #a10518);
@color-alarm-background-image: linear-gradient(to bottom, #ff4d63, #a10518);
@color-alarm-box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.4);
@color-alarm-list-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
@color-alarm-list-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.5);
@color-warning-background-image: linear-gradient(to bottom, #f6a623, #dc8c09);
@color-warning-background-image: linear-gradient(to bottom, #f6a623, #dc8c09);
@color-ribbon-opened: linear-gradient(to bottom, #ffffff, #eeeeee);
@@ -76,6 +76,11 @@
@color-button-oval-background-image: linear-gradient(to bottom, #cce8f8, #93cbfc);
@color-button-oval-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.7);
.text-success{
color:@color-darkish-blue;
.text-success {
color: @color-darkish-blue;
}
.warning {
color: @color-light-orange;
}
Thermo.Active/wwwroot/assets/styles/style.css
+3
View File
@@ -390,6 +390,9 @@ article .box .body {
.text-success {
color: #002680;
}
.warning {
color: #ffb31e;
}
.modal {
min-width: 500px;
height: 400px;
Thermo.Active/wwwroot/src/modules/app-footer.vue
+21 -4
View File
@@ -13,8 +13,8 @@
<button
@click="openProgram('/setup')"
:title="'footer_tooltip_setup' | localize('Setup')"
:disabled="!isAreaEnabled('setup')"
v-if="isAreaVisible('setup')"
:disabled="false"
v-if="true"
class="oval jobeditor"
:class="{ big:isInPath('setup') && !state.isMainViewLiftedUp}"
></button>
@@ -22,8 +22,8 @@
<button
@click="openProgram('/production')"
:title="'footer_tooltip_production' | localize('Production')"
:disabled="!isAreaEnabled('production')"
v-if="isAreaVisible('production')"
:disabled="false"
v-if="true"
class="oval main-production"
:class="{ big:isInPath('production') && !state.isMainViewLiftedUp}"
></button>
@@ -73,5 +73,22 @@
<button class="under">Auto</button>
</div>
</footer>
<!--
<div class="machine-area">
<button
class="under"
@mouseup="toggleMainView()"
:class="{'pressed':state.isMainViewLiftedUp}"
:title="'footer_tooltip_under_hood' | localize('Open/Close Under-the-hood area')"
>
<img src="assets/icons/png/siemens-logo.png" v-if="isSiemens()" />
<img src="assets/icons/png/fanuc-logo.png" v-if="isFanuc()" />
<img src="assets/icons/png/osai-logo.png" v-if="isOsai()" />
<span v-if="isDemo()" class="btn-demo">DEMO</span>
</button>
</div>
</footer>
-->
</template>
<script lang="ts" src="./app-footer.ts"></script>