Download as
Browse Code »

Commit 21051e3a9dc8ffa7d89365d3fd68ef08d8bd39e9

Authored by Victor Costa
2 parents 78f2dcff 6c67e997
Exists in staging

Merge branch 'master' into staging

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