RuhNetConsulting
/
Adminator-admin-dashboard
mirror of https://github.com/puikinsh/Adminator-admin-dashboard
1
0
Fork 0
Code Issues 0 Projects 0 Releases 16 Wiki Activity
Browse Source

Merge pull request #63 from krzysiekpiasecki/issue-#61 

Rename blank page to Blank and fix navbar height
pull/66/head
Aigars Silkalns 8 years ago
committed by GitHub
parent
2c46a299d3 b7e98ac123
commit
0e6d733f14
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      src/assets/styles/spec/components/topbar.scss
  2. +1
    -1
      src/blank.html

+ 2
- 1
src/assets/styles/spec/components/topbar.scss View File

@ -12,7 +12,6 @@
background-color: $default-white; background-color: $default-white;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
display: block; display: block;
height: $header-height;
margin-bottom: 0; margin-bottom: 0;
padding: 0; padding: 0;
position: fixed; position: fixed;
@ -31,6 +30,8 @@
.header-container { .header-container {
@include clearfix; @include clearfix;
height: $header-height;
.nav-left, .nav-left,
.nav-right { .nav-right {
list-style: none; list-style: none;


+ 1
- 1
src/blank.html View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Chat</title>
<title>Blank</title>
<style> <style>
#loader { #loader {
transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out;


Write Preview
Loading…
Cancel
Save