Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

This commit is contained in:
Paolo Possanzini
2018-03-26 14:42:54 +02:00
3 changed files with 26 additions and 6 deletions
+11 -2
View File
@@ -186,7 +186,7 @@
display: flex;
font-size: 18px;
color: @color-darkish-blue;
padding: 0 8px;
padding: 0 4px;
height: 24px;
line-height: 24px;
flex-shrink: 0;
@@ -196,8 +196,10 @@
span.title{
flex-grow: 1;
width: 100%;
overflow: hidden;
margin-right: 4px;
}
span.process {
span.process, span.isRunning {
color: @color-darkish-blue;
// width: 25px;
width: 32px;
@@ -213,6 +215,9 @@
line-height: 20px;
}
}
span.isRunning{
margin-right: 4px;
}
}
section {
width: calc(~"100% - 56px");
@@ -342,6 +347,10 @@
border-color: #fff !important;
color: #fff;
}
span.isRunning {
border-color: #fff !important;
color: #fff;
}
}
}
}
+14 -3
View File
@@ -2132,7 +2132,7 @@ footer .container button.big:before {
display: flex;
font-size: 18px;
color: #002680;
padding: 0 8px;
padding: 0 4px;
height: 24px;
line-height: 24px;
flex-shrink: 0;
@@ -2143,8 +2143,11 @@ footer .container button.big:before {
.head-std header span.title {
flex-grow: 1;
width: 100%;
overflow: hidden;
margin-right: 4px;
}
.head-std header span.process {
.head-std header span.process,
.head-std header span.isRunning {
color: #002680;
width: 32px;
font-size: 14px;
@@ -2156,9 +2159,13 @@ footer .container button.big:before {
text-align: center;
border: 1px solid #002680;
}
.head-std header span.process i {
.head-std header span.process i,
.head-std header span.isRunning i {
line-height: 20px;
}
.head-std header span.isRunning {
margin-right: 4px;
}
.head-std section {
width: calc(100% - 56px);
display: flex;
@@ -2287,6 +2294,10 @@ footer .container button.big:before {
border-color: #fff !important;
color: #fff;
}
.head-std.selected header span.isRunning {
border-color: #fff !important;
color: #fff;
}
.heads-container {
position: absolute;
top: -6px;
+1 -1
View File
@@ -3,7 +3,7 @@
<section>
<header>
<span class="title">{{title}}</span>
<span class="process">
<span class="isRunning">
<i class="fa fa-refresh fa-spin" v-if="isActive"></i>
</span>
<span class="process">