tweak status bar

mrellipse · Sep 3, 2017 · 57fc04d · 57fc04d
1 parent 4c0c70a
commit 57fc04d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/src/ui/app/components/forbidden/forbidden.html b/src/ui/app/components/forbidden/forbidden.html
@@ -1,4 +1,4 @@
-<main class="col">
+<main class="row">
     <h1 class="mb-2">{{$t('forbidden.title')}}</h1>
     <p v-html="$t('forbidden.content')"></p>
-</main>
+</main>
diff --git a/src/ui/app/components/login/login.html b/src/ui/app/components/login/login.html
@@ -1,6 +1,8 @@
-<main class="col">
+<main>
   <div class="row">
     <status-bar :clear-after="5" :locale-prefix="'validation.login'"></status-bar>
+  </div>
+  <div class="row">
     <div class="col-sm-6 login-provider">
       <div class="card">
         <div class="card-body">

diff --git a/src/ui/app/components/status-bar/status-bar.ts b/src/ui/app/components/status-bar/status-bar.ts
@@ -12,7 +12,7 @@ import './status-bar.scss';
   name: 'StatusBar',
   template: `
     <transition name="fade">
-      <div v-if="status.messageTypeId" @click.prevent="onStatusBarClick()" class="status-bar container" :class="alertClass" role="alert">
+      <div v-if="status.messageTypeId" @click.prevent="onStatusBarClick()" class="status-bar col" :class="alertClass" role="alert">
          <span class="status-title">{{statusTitle}}</span><span v-bind:data-has-title="hasTitle" class="status-text">{{statusText}}</span>
       </div>
     </transition>`,

diff --git a/src/ui/app/root/layout/layout.html b/src/ui/app/root/layout/layout.html
@@ -1,5 +1,9 @@
-<div class="row">
-  <status-bar :clear-after="5" locale-prefix="dict"></status-bar>
-  <area-sidebar></area-sidebar>
-  <router-view></router-view>
+<div>
+  <div class="row">
+    <status-bar :clear-after="5" locale-prefix="dict"></status-bar>
+  </div>
+  <div class="row">
+    <area-sidebar></area-sidebar>
+    <router-view></router-view>
+  </div>
 </div>
diff --git a/src/ui/app/root/signup/signup.html b/src/ui/app/root/signup/signup.html
@@ -1,5 +1,5 @@
-<main class="col">
-  <div class="col-sm-4 ml-auto">
+<main class="row">
+  <div class="col-sm-4">
 
     <h2>{{$t('signup.title')}}</h2>
     <p>{{$t('signup.instruction')}}</p>

diff --git a/src/ui/app/styles/_global.scss b/src/ui/app/styles/_global.scss
@@ -45,12 +45,9 @@ h1, h2, h3, h4, h5, h6 {
   margin-top: 0.3em;
 }
 
-legend,fieldset { 
+fieldset legend {
   font-family: $headings-font-family;
   color: theme-color("primary");
-}
-
-fieldset legend {
   font-variant: small-caps;
   letter-spacing: 1px;
   text-transform: capitalize;