fix för headerkomponent klar. (#236)

Vastra-Gotalandsregionen · Apr 5, 2018 · 69ce396 · 69ce396
1 parent da587dc
commit 69ce396
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/assets/partials/_components.page-header.scss b/src/assets/partials/_components.page-header.scss
@@ -14,15 +14,9 @@
   margin-top: $margin--fat;
 }
 
-.page-header__controls {
-  display: flex;
-  flex-direction: row;
-}
-
 .page-header__title {
-  position: relative;
+  float: right;
   margin-left: auto;
-  align-self: flex-start;
   h1 {
     font-size: 25px;
     text-transform: uppercase;

diff --git a/src/lib/controls/pageHeader/pageHeader.component.html b/src/lib/controls/pageHeader/pageHeader.component.html
@@ -1,11 +1,10 @@
 <div [ngClass]="{'page-header--actions-visible' : expanded, 'page-header--actions-hidden' : !expanded}">
   <div class="page-header__top-border"></div>
-  <div class="page-header__controls">
-    <ng-content></ng-content>
-
-    <div class="page-header__title control-with-heading">
+  <div>
+    <div class="page-header__title">
       <h1>{{title}}</h1>
       <vgr-save-cancel *ngIf="saveCancel" class="page-header__save-cancel" (onCancel)="disableActions()" (onSave)="disableActions()"></vgr-save-cancel>
     </div>
+    <ng-content></ng-content>
   </div>
 </div>