1
0
mirror of https://github.com/moparisthebest/mail synced 2025-02-16 23:20:09 -05:00

render logo and navigation correctly

This commit is contained in:
Tankred Hase 2013-09-18 16:03:51 +02:00
parent 45f9b07bb0
commit 3f9c3f7e48
9 changed files with 39 additions and 13 deletions

BIN
src/font/mensch-bold.ttf Normal file

Binary file not shown.

BIN
src/font/mensch-thin.ttf Normal file

Binary file not shown.

BIN
src/font/mensch.ttf Normal file

Binary file not shown.

View File

@ -35,7 +35,7 @@ require([
controller: NavigationCtrl controller: NavigationCtrl
}); });
$routeProvider.otherwise({ $routeProvider.otherwise({
redirectTo: '/login' redirectTo: '/desktop'
}); });
}); });

View File

@ -14,6 +14,22 @@
src: local('PT Sans Bold'), local('PTSans-Bold'), url('../font/pt-sans-bold.woff') format('woff'); src: local('PT Sans Bold'), local('PTSans-Bold'), url('../font/pt-sans-bold.woff') format('woff');
} }
// Mensch fonts
// -------------------------
@font-face {
font-family: 'Mensch';
font-style: normal;
font-weight: normal;
src: local('Mensch'), local('Mensch-Regular'), url('../font/mensch.ttf') format('truetype');
}
@font-face {
font-family: 'Mensch Thin';
font-style: normal;
font-weight: normal;
src: local('Mensch Thin'), local('Mensch-Thin'), url('../font/mensch-thin.ttf') format('truetype');
}
// Icon fonts // Icon fonts
// ------------------------- // -------------------------

View File

@ -36,7 +36,3 @@ textarea {
.main-app-view { .main-app-view {
height: 100%; height: 100%;
} }
.column {
}

View File

@ -19,6 +19,7 @@ $color-black: #000;
$color-white: #fff; $color-white: #fff;
$color-grey: #666; $color-grey: #666;
$color-grey-dark: #333; $color-grey-dark: #333;
$color-grey-medium: #aaa;
$color-grey-light: #ccc; $color-grey-light: #ccc;
$color-grey-lighter: #ddd; $color-grey-lighter: #ddd;
$color-grey-lightest: #f9f9f9; $color-grey-lightest: #f9f9f9;
@ -35,7 +36,7 @@ $content-nav-width: 344px;
$nav-max-width: 347px; $nav-max-width: 347px;
$nav-width: 80%; $nav-width: 80%;
$nav-padding: 10px; $nav-padding: 15px;
$lightbox-padding: 15px; $lightbox-padding: 15px;
$lightbox-max-width: 662px; $lightbox-max-width: 662px;

View File

@ -1,20 +1,32 @@
.nav-menu { .nav-menu {
border: 1px;
border-right-style: solid;
border-color: $color-grey-medium;
.content { .content {
a {
h1, a {
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
text-shadow: 0 -1px 1px $color-grey-medium;
} }
header { header {
padding: 0 $nav-padding; padding: 0 $nav-padding;
height: 84px; height: 84px;
h1 { h1 {
//@include hide-text(); font-family: 'Mensch';
// TODO: replace with svg background image
margin: 0px;
padding: 0px;
color: #fff;
font-weight: normal; font-weight: normal;
height: 100px;
width: 300px;
margin: 0px;
padding-top: 10px;
color: #fff;
span {
font-family: 'Mensch Thin';
}
} }
} }
@ -50,6 +62,7 @@
span.label { span.label {
line-height: 1.3em; line-height: 1.3em;
vertical-align: middle; vertical-align: middle;
text-shadow: none;
} }
&:hover, &:focus { &:hover, &:focus {
background-color: mix($color-blue, $color-white, 80%); background-color: mix($color-blue, $color-white, 80%);

View File

@ -4,7 +4,7 @@
<nav class="nav-menu nav-effect"> <nav class="nav-menu nav-effect">
<div class="content"> <div class="content">
<header> <header>
<h1>WHITEOUT.IO</h1> <h1>WHITEOUT<span>.IO</span></h1>
</header> </header>
<ul class="nav-primary"> <ul class="nav-primary">
<li> <li>