Merge branch 'master' into staging

Victor Costa
2 parents 78f2dcff 6c67e997
Showing 4 changed files with 8 additions and 2 deletions Show diff stats
src/app/layout/blocks/block.component.ts
src/app/layout/blocks/block.html
src/app/layout/boxes/boxes.scss
themes/angular-participa-consulta/app/blocks.scss
@@ -23,6 +23,7 @@ export class BlockComponent {
     currentUser: noosfero.User;
     isHomepage = true;
     editionMode = false;
+    designMode = false;
  
     constructor(private $uibModal: any,
         private $scope: ng.IScope,
@@ -49,6 +50,7 @@ export class BlockComponent {
         });
         this.designModeService.onToggle.subscribe((designModeOn: boolean) => {
             this.editionMode = designModeOn;
+            this.designMode = designModeOn;
             this.$scope.$apply();
         });
     }
-<div ng-show="ctrl.canDisplay() || ctrl.editionMode" ng-class="{'invisible-block': !ctrl.canDisplay()}" class="noosfero-block" ng-mouseover="displayActions = true" ng-mouseleave="displayActions = false">
+<div ng-show="ctrl.canDisplay() || ctrl.editionMode || ctrl.designMode" ng-class="{'invisible-block': !ctrl.canDisplay()}" class="noosfero-block" ng-mouseover="displayActions = true" ng-mouseleave="displayActions = false">
   <div ng-show="displayActions" class="actions block-actions" permission="ctrl.block.permissions" permission-action="allow_edit">
     <button type="submit" class="btn btn-xs btn-default" ng-click="ctrl.openEdit()"><i class="fa fa-edit fa-fw"></i></button>
   </div>
 .col-md-2-5 {
   @extend .col-md-3;
-  @media (min-width: 920px) {
+  @media (min-width: 992px) {
     width: 20.83%;
   }
 }
@@ -13,6 +13,10 @@
   color: #4F9CAC;
 }
  
+.panel-title {
+  color: #4F9CAC;
+}
+
 .block-head-with-icon {
   padding: 15px 15px 15px 55px;
 }
...	...	@@ -23,6 +23,7 @@ export class BlockComponent {
23	23	currentUser: noosfero.User;
24	24	isHomepage = true;
25	25	editionMode = false;
	26	+ designMode = false;
26	27
27	28	constructor(private $uibModal: any,
28	29	private $scope: ng.IScope,
...	...	@@ -49,6 +50,7 @@ export class BlockComponent {
49	50	});
50	51	this.designModeService.onToggle.subscribe((designModeOn: boolean) => {
51	52	this.editionMode = designModeOn;
	53	+ this.designMode = designModeOn;
52	54	this.$scope.$apply();
53	55	});
54	56	}
...	...
1		-<div ng-show="ctrl.canDisplay() \|\| ctrl.editionMode" ng-class="{'invisible-block': !ctrl.canDisplay()}" class="noosfero-block" ng-mouseover="displayActions = true" ng-mouseleave="displayActions = false">
	1	+<div ng-show="ctrl.canDisplay() \|\| ctrl.editionMode \|\| ctrl.designMode" ng-class="{'invisible-block': !ctrl.canDisplay()}" class="noosfero-block" ng-mouseover="displayActions = true" ng-mouseleave="displayActions = false">
2	2	<div ng-show="displayActions" class="actions block-actions" permission="ctrl.block.permissions" permission-action="allow_edit">
3	3	<button type="submit" class="btn btn-xs btn-default" ng-click="ctrl.openEdit()"><i class="fa fa-edit fa-fw"></i></button>
4	4	</div>
...	...
1	1	.col-md-2-5 {
2	2	@extend .col-md-3;
3		- @media (min-width: 920px) {
	3	+ @media (min-width: 992px) {
4	4	width: 20.83%;
5	5	}
6	6	}
...	...
...	...	@@ -13,6 +13,10 @@
13	13	color: #4F9CAC;
14	14	}
15	15
	16	+.panel-title {
	17	+ color: #4F9CAC;
	18	+}
	19	+
16	20	.block-head-with-icon {
17	21	padding: 15px 15px 15px 55px;
18	22	}
...	...