Browse Source

Merge branch 'dev' of https://github.com/artf/grapesjs into dev

pull/2732/head
Artur Arseniev 6 years ago
parent
commit
a6cef8d37d
  1. 2
      dist/css/grapes.min.css
  2. 3
      src/styles/scss/_gjs_variables.scss
  3. 19
      src/styles/scss/main.scss
  4. 16
      src/utils/Sorter.js

2
dist/css/grapes.min.css

File diff suppressed because one or more lines are too long

3
src/styles/scss/_gjs_variables.scss

@ -76,3 +76,6 @@ $fontName: 'main-fonts' !default;
$fontSize: 0.7rem !default;
$fontSizeS: 0.75rem !default;
$fontV: 20 !default;//random(1000)
/* Tools */
$placeholderColor: $colorGreen !default;

19
src/styles/scss/main.scss

@ -304,17 +304,32 @@ $colorsAll: (one, $primaryColor),
.#{$app-prefix}placeholder,
.#{$nv-prefix}placeholder {
border-style: solid !important;
border-color: $colorGreen;
outline: none;
box-sizing: border-box;
transition: top $animSpeed, left $animSpeed,
width $animSpeed, height $animSpeed;
}
.#{$app-prefix}placeholder.horizontal,
.#{$com-prefix}placeholder.horizontal,
.#{$nv-prefix}placeholder.horizontal {
border-color: transparent $placeholderColor;
border-width: 3px 5px;
margin: -3px 0 0;
}
.#{$app-prefix}placeholder.vertical,
.#{$com-prefix}placeholder.vertical,
.#{$nv-prefix}placeholder.vertical {
border-color: $placeholderColor transparent;
border-width: 5px 3px;
margin: 0 0 0 -3px;
}
.#{$app-prefix}placeholder-int,
.#{$com-prefix}placeholder-int,
.#{$nv-prefix}placeholder-int {
background-color: $colorGreen;
background-color: $placeholderColor;
box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);
height: 100%; width: 100%;
pointer-events: none;

16
src/utils/Sorter.js

@ -966,13 +966,13 @@ export default Backbone.View.extend({
h = 0,
un = 'px',
margI = 5,
brdCol = '#62c462',
brd = 3,
method = pos.method;
var elDim = dims[pos.index];
plh.style.borderColor = 'transparent ' + brdCol;
plh.style.borderWidth = brd + un + ' ' + (brd + 2) + un;
plh.style.margin = '-' + brd + 'px 0 0';
// Placeholder orientation
plh.classList.remove('vertical');
plh.classList.add('horizontal');
if (elDim) {
// If it's not in flow (like 'float' element)
if (!elDim[4]) {
@ -980,9 +980,9 @@ export default Backbone.View.extend({
h = elDim[2] - marg * 2 + un;
t = elDim[0] + marg;
l = method == 'before' ? elDim[1] - marg : elDim[1] + elDim[3] - marg;
plh.style.borderColor = brdCol + ' transparent';
plh.style.borderWidth = brd + 2 + un + ' ' + brd + un;
plh.style.margin = '0 0 0 -' + brd + 'px';
plh.classList.remove('horizontal');
plh.classList.add('vertical');
} else {
w = elDim[3] + un;
h = 'auto';

Loading…
Cancel
Save