From 01d51fa0a4900e48fa34f30b1f766411c7ae69bb Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Thu, 8 Nov 2018 11:34:49 +0100
Subject: [PATCH] Review Checkbox CSS
---
src/module_vmap/module/css/vmap.less | 4 --
.../externs/studio/less/studio.less | 46 +++++++------------
src/vitis/client/less/main.less | 17 +++++++
3 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/module_vmap/module/css/vmap.less b/src/module_vmap/module/css/vmap.less
index b4f322e8..cc42f401 100644
--- a/src/module_vmap/module/css/vmap.less
+++ b/src/module_vmap/module/css/vmap.less
@@ -2438,7 +2438,3 @@ div.vmap-select-scale-alert{
min-height: 55px;
padding-top: 15px !important;
}
-
-.checkbox-inline label::before, .checkbox-inline label::after{
- top: 3px;
-}
diff --git a/src/vitis/client/javascript/externs/studio/less/studio.less b/src/vitis/client/javascript/externs/studio/less/studio.less
index 39431d7e..25844881 100755
--- a/src/vitis/client/javascript/externs/studio/less/studio.less
+++ b/src/vitis/client/javascript/externs/studio/less/studio.less
@@ -3,7 +3,7 @@ To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
-/*
+/*
Created on : 5 janv. 2016, 12:08:09
Author : a_borghi
*/
@@ -23,7 +23,7 @@ and open the template in the editor.
//@import (less) '../css/lib/bootstrap/css/bootstrap.css';
-//définit la taille de la fenêtre
+//définit la taille de la fenêtre
.app_window{
/*Skin scrollBar*/
::-webkit-scrollbar {
@@ -39,11 +39,11 @@ and open the template in the editor.
::-webkit-scrollbar-thumb {
-webkit-border-radius: 10px;
border-radius: 10px;
- background: @studio-color-purple;
- -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
+ background: @studio-color-purple;
+ -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
}
::-webkit-scrollbar-thumb:window-inactive {
- background: @studio-color-purple;
+ background: @studio-color-purple;
}
input[type=number]::-webkit-outer-spin-button,
@@ -61,7 +61,7 @@ and open the template in the editor.
/*Laisse une marge sous un composant*/
.element-margin {
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
//align un div sur la droite avec une petite marge
@@ -199,19 +199,14 @@ and open the template in the editor.
}
// rend un élément non selectable
-.unselectable {
- -moz-user-select: none;
- -khtml-user-select: none;
- -webkit-user-select: none;
- -o-user-select: none;
-}
-
-// décalage pour les checkbox et radio
-.checkbox_margin {
- margin-left: 30px;
+.unselectable {
+ -moz-user-select: none;
+ -khtml-user-select: none;
+ -webkit-user-select: none;
+ -o-user-select: none;
}
-// Permet à code Mirror de prendre toute la place dans la div
+// Permet à code Mirror de prendre toute la place dans la div
.CodeMirror {
border: 1px solid #eee;
height: auto;
@@ -241,7 +236,7 @@ and open the template in the editor.
}
.invalid_input{
- background-color: rgba(255,0,0,0.5);
+ background-color: rgba(255,0,0,0.5);
}
/*th, td{
@@ -343,15 +338,6 @@ and open the template in the editor.
font-size:11px
}
-.checkbox label::before, .checkbox label::after{
- width:13px;
- height: 13px;
-}
-
-.checkbox {
- padding-left: 12px;
-}
-
.collapser-form-wab-modal{
font-size: 40px;
padding-top: 10px;
@@ -359,8 +345,8 @@ and open the template in the editor.
}
.transition-form-wab-collapser{
- transition: width 0.5s;
- //transition: display 1s;
+ transition: width 0.5s;
+ //transition: display 1s;
}
.form-tools-tree-container{
overflow-y: auto;
@@ -381,4 +367,4 @@ and open the template in the editor.
background-color: initial;
top: initial;
//border: initial;
-}
\ No newline at end of file
+}
diff --git a/src/vitis/client/less/main.less b/src/vitis/client/less/main.less
index d567b91f..004b5ed4 100644
--- a/src/vitis/client/less/main.less
+++ b/src/vitis/client/less/main.less
@@ -1046,3 +1046,20 @@ div[data-app-html-form]>div[app-form-reader]>.modal>.modal-dialog{
/*@supports (-ms-accelerator:true) and (not (color:unset)) {
.selector { property:value; }
}*/
+
+.checkbox {
+ padding-left: 12px;
+}
+
+.checkbox_margin {
+ margin-left: 30px;
+}
+
+.checkbox-inline label::before, .checkbox-inline label::after{
+ top: 3px;
+}
+
+.checkbox label::before, .checkbox label::after{
+ width:13px;
+ height: 13px;
+}
--
GitLab