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_step into develop

Browse Source
This commit is contained in:
Paolo Possanzini
2018-03-23 16:53:16 +01:00
parent 9df4008d17 3905ab40bd
commit fcace7684f
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/assets/styles/base/head.less
+4 -3
View File
@@ -194,11 +194,12 @@
font-weight: 600;
span.process {
color: @color-darkish-blue;
width: 48px;
width: 35px;
font-size: 14px;
height: 21px;
height: 20px;
flex-grow: 0;
line-height: 21px;
line-height: 20px;
margin-top: 1px;
text-transform: uppercase;
text-align: center;
border: 1px solid @color-darkish-blue;
Step/wwwroot/assets/styles/base/layout.less
+5 -2
View File
@@ -39,15 +39,18 @@
.scrollable {
overflow-y: scroll;
}
.scrollable_auto {
overflow-y: auto;
}
.scrollable::-webkit-scrollbar {
.scrollable_auto::-webkit-scrollbar, .scrollable::-webkit-scrollbar {
border-radius: 15px;
width: 16px;
background-color: rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
}
.scrollable::-webkit-scrollbar-thumb {
.scrollable_auto::-webkit-scrollbar-thumb, .scrollable::-webkit-scrollbar-thumb {
border-radius: 20px;
width: 8px;
background-color: rgba(0, 0, 0, 0.3);
Step/wwwroot/assets/styles/style.css
+9 -3
View File
@@ -2064,11 +2064,12 @@ footer .container button.big:before {
}
.head-std header span.process {
color: #002680;
width: 48px;
width: 35px;
font-size: 14px;
height: 21px;
height: 20px;
flex-grow: 0;
line-height: 21px;
line-height: 20px;
margin-top: 1px;
text-transform: uppercase;
text-align: center;
border: 1px solid #002680;
@@ -2218,12 +2219,17 @@ footer .container button.big:before {
.scrollable {
overflow-y: scroll;
}
.scrollable_auto {
overflow-y: auto;
}
.scrollable_auto::-webkit-scrollbar,
.scrollable::-webkit-scrollbar {
border-radius: 15px;
width: 16px;
background-color: rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.5);
}
.scrollable_auto::-webkit-scrollbar-thumb,
.scrollable::-webkit-scrollbar-thumb {
border-radius: 20px;
width: 8px;
Step/wwwroot/src/modules/mheads.vue
+1 -1
View File
@@ -1,5 +1,5 @@
<template>
<div class="heads-container scrollable">
<div class="heads-container scrollable_auto">
<head-std :title="h.name" v-for="h in heads" :key="h.id"
:rpm="getHeadsProperty(h.id).ActualSpeed"
:tool="getHeadsProperty(h.id).MountedTool"