From d020bb0d3ab7bc153cb84ee935a2b785cbdf3e12 Mon Sep 17 00:00:00 2001 From: devfake Date: Sun, 21 Jun 2015 21:47:39 +0200 Subject: [PATCH] styling and quick match button --- site/client/app/views/chat.html | 2 +- site/client/app/views/navigation.html | 2 ++ site/client/assets/sass/_base.scss | 1 + site/client/assets/sass/_chat.scss | 2 +- site/client/assets/sass/_nav.scss | 8 +++++++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/site/client/app/views/chat.html b/site/client/app/views/chat.html index 9c16323..c805c34 100644 --- a/site/client/app/views/chat.html +++ b/site/client/app/views/chat.html @@ -7,7 +7,7 @@
- + blaa blaa
\ No newline at end of file diff --git a/site/client/app/views/navigation.html b/site/client/app/views/navigation.html index 5d60f33..0ab4b7a 100644 --- a/site/client/app/views/navigation.html +++ b/site/client/app/views/navigation.html @@ -3,5 +3,7 @@
  • Lobby
  • Deck Builder
  • Highscore
  • + + diff --git a/site/client/assets/sass/_base.scss b/site/client/assets/sass/_base.scss index 0f3c2cd..00a0a73 100644 --- a/site/client/assets/sass/_base.scss +++ b/site/client/assets/sass/_base.scss @@ -10,6 +10,7 @@ body { body { width: 100%; + min-width: 1000px; font-family: 'Titillium Web', sans-serif; } diff --git a/site/client/assets/sass/_chat.scss b/site/client/assets/sass/_chat.scss index ac34279..efcae23 100644 --- a/site/client/assets/sass/_chat.scss +++ b/site/client/assets/sass/_chat.scss @@ -4,7 +4,7 @@ a { font-size: 14px; - padding: 15px 15px; + padding: 15px 18px; } } diff --git a/site/client/assets/sass/_nav.scss b/site/client/assets/sass/_nav.scss index 9b8bae2..dfeda0e 100644 --- a/site/client/assets/sass/_nav.scss +++ b/site/client/assets/sass/_nav.scss @@ -2,10 +2,12 @@ nav { float: left; margin: 30px 0 0 0; clear: both; + width: 100%; ul { float: left; margin: 0; + width: 100%; } li { @@ -18,7 +20,7 @@ nav { font-size: 19px; text-transform: uppercase; font-weight: 300; - padding: 12px 25px; + padding: 12px 30px; float: left; cursor: pointer; height: 55px; @@ -35,4 +37,8 @@ nav { background: #080d14; } } +} + +.sub-nav { + float: right; } \ No newline at end of file