Browse Source

Fix style clearing

pull/67/head
Artur Arseniev 9 years ago
parent
commit
f60fa73649
  1. 2
      bower.json
  2. 2
      dist/css/grapes.min.css
  3. 6
      dist/grapes.min.js
  4. 2
      package.json
  5. 4
      src/style_manager/view/SectorsView.js
  6. 11
      styles/css/main.css
  7. 13
      styles/scss/_gjs_canvas.scss
  8. 2
      styles/scss/main.scss

2
bower.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Open source Web Template Editor",
"version": "0.4.15",
"version": "0.4.17",
"author": "Artur Arseniev",
"homepage": "http://grapesjs.com",
"main": [

2
dist/css/grapes.min.css

File diff suppressed because one or more lines are too long

6
dist/grapes.min.js

File diff suppressed because one or more lines are too long

2
package.json

@ -1,7 +1,7 @@
{
"name": "grapesjs",
"description": "Open source Web Template Editor",
"version": "0.4.15",
"version": "0.4.17",
"author": "Artur Arseniev",
"license": "BSD-3-Clause",
"homepage": "http://grapesjs.com",

4
src/style_manager/view/SectorsView.js

@ -61,8 +61,8 @@ define(['backbone', './SectorView'],
el.set('style', {});
}else{
// Ensure to clean element
if(classes.length == 1)
el.set('style', {});
//if(classes.length == 1)
//el.set('style', {});
}
// If the state is not empty, there should be a helper rule in play

11
styles/css/main.css

@ -2849,7 +2849,8 @@ div.gjs-select {
border: 3px solid #3b97e3;
width: 10px;
height: 10px;
background-color: white; }
background-color: #fff;
margin: -5px; }
.gjs-resizer-h-tl {
top: 0;
@ -2863,20 +2864,20 @@ div.gjs-select {
.gjs-resizer-h-tc {
top: 0;
margin: 0 auto;
margin: -5px auto;
left: 0;
right: 0;
cursor: ns-resize; }
.gjs-resizer-h-cl {
left: 0;
margin: auto 0;
margin: auto -5px;
top: 0;
bottom: 0;
cursor: ew-resize; }
.gjs-resizer-h-cr {
margin: auto 0;
margin: auto -5px;
top: 0;
bottom: 0;
right: 0;
@ -2889,7 +2890,7 @@ div.gjs-select {
.gjs-resizer-h-bc {
bottom: 0;
margin: 0 auto;
margin: -5px auto;
left: 0;
right: 0;
cursor: ns-resize; }

13
styles/scss/_canvas.scss → styles/scss/_gjs_canvas.scss

@ -91,13 +91,16 @@
z-index: 9;
}
$hndlMargin: -5px;
.#{$app-prefix}resizer-h {
pointer-events: all;
position: absolute;
border: 3px solid $colorBlue;
width: 10px;
height: 10px;
background-color: white;
background-color: #fff;
margin: $hndlMargin;
}
.#{$app-prefix}resizer-h-tl {
@ -114,7 +117,7 @@
.#{$app-prefix}resizer-h-tc {
top: 0;
margin: 0 auto;
margin: $hndlMargin auto;
left: 0;
right: 0;
cursor: ns-resize;
@ -122,14 +125,14 @@
.#{$app-prefix}resizer-h-cl {
left: 0;
margin: auto 0;
margin: auto $hndlMargin;
top: 0;
bottom: 0;
cursor: ew-resize;
}
.#{$app-prefix}resizer-h-cr {
margin: auto 0;
margin: auto $hndlMargin;
top: 0;
bottom: 0;
right: 0;
@ -144,7 +147,7 @@
.#{$app-prefix}resizer-h-bc {
bottom: 0;
margin: 0 auto;
margin: $hndlMargin auto;
left: 0;
right: 0;
cursor: ns-resize;

2
styles/scss/main.scss

@ -292,7 +292,7 @@ div.#{$app-prefix}select {
/************* CANVAS ****************/
@import "canvas";
@import "gjs_canvas";
/************* RTE ****************/
#commands.panel {

Loading…
Cancel
Save