Skip to content

Commit

Permalink
Fixed navbar horizontal overflow problem
Browse files Browse the repository at this point in the history
  • Loading branch information
mnori committed Apr 1, 2017
1 parent c4af256 commit 70d70e3
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 25 deletions.
53 changes: 28 additions & 25 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,32 @@
@font-face {font-family: ubuntuMonoBold; src: url(/fonts/UbuntuMono-B.ttf);}
@font-face {font-family: ubuntuMonoBoldItalic; src: url(/fonts/UbuntuMono-BI.ttf);}

body {
font-family: ubuntuRegular, Helvetica, Arial, sans-serif;
font-size: 22px;
background-color: #fff;
color: #333;
margin: 0px;
min-width: 873px;

/* disable text selection */
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

.fixed_width {
width: 873px;
}

#navbar_wrapper {
min-width: 873px;
background-color: #333;
padding-left: 20px;
padding-right: 20px;
height: 70px;
box-shadow: 0px 0px 10px 3px #bbb;
border-bottom: 2px solid #000;
Expand All @@ -23,14 +47,10 @@
margin-left: auto;
margin-right: auto;
height: 50px;
padding: 10px;
padding: 10px 0px 10px 0px;
position: relative;
}

.fixed_width {
width: 873px;
}

#content {
padding: 20px 20px 20px 20px;
display: block;
Expand All @@ -53,14 +73,14 @@
position: absolute;
float: left;
top: 8px;
left: 10px;
left: 0px;
z-index: 2;
}

#logo_image {
position: absolute;
top: 12px;
left: 128px;
left: 118px;
width: 50px;
height: 50px;
z-index: 1;
Expand All @@ -69,7 +89,7 @@
#version_txt {
position: absolute;
top: 53px;
left: 13px;
left: 3px;
font-size: 12px;
z-index: 3;
color: #ccc;
Expand All @@ -92,23 +112,6 @@ a.logo:hover, a.logo:active {
text-decoration: none;
}

body {
font-family: ubuntuRegular, Helvetica, Arial, sans-serif;
font-size: 22px;
background-color: #fff;
color: #333;
margin: 0px;
width: 100%;

/* disable text selection */
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}

h1 {
font-weight: normal;
margin-top: 0px;
Expand Down
11 changes: 11 additions & 0 deletions public/js/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ function initSplash() {
});
});
configureNick();
setupResizeHandler();
}

function setupResizeHandler() {
$("body").resize(function() {
winHeight = parseInt($(window).height());
winWidth = parseInt($(window).width());

console.log("resize");
// $("#neo_home_container").css({"width":winWidth,"height":winHeight});
})
}

// Set up a modal asking about setting the nickname
Expand Down

0 comments on commit 70d70e3

Please sign in to comment.