Skip to content

Commit

Permalink
fixed navbar vertical alignment
Browse files Browse the repository at this point in the history
  • Loading branch information
lucianot committed Sep 2, 2012
1 parent 5168352 commit 6f459f9
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 17 deletions.
17 changes: 11 additions & 6 deletions app/assets/stylesheets/bootstrap_and_overrides.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ html, body {
height: 100%;
}

.alert {
margin-top: 20px;
width: 50%;
}

.help-block {
color: #888;
font-size: 12px;
Expand Down Expand Up @@ -137,11 +142,12 @@ html, body {

.navbar .container {
.brand {
$elementHeight: 30px;
height: $elementHeight;
margin-bottom:4px;
height: 30px;
padding-top: 6px;
padding-bottom: 15px;
}
.nav {
padding-top: 4px;
.dropdown-menu {
z-index: 10000 !important;
}
Expand All @@ -163,7 +169,7 @@ html, body {
/* Subnav */
.subnav {
width: 100%;
height: 40px;
height: 38px;
top: 50px;
z-index: 1 !important;
background-color: #eeeeee; /* Old browsers */
Expand Down Expand Up @@ -192,7 +198,7 @@ html, body {
-moz-border-radius: 0;
border-radius: 0;
margin: 0;
padding-top: 16px;
padding-top: 14px;
padding-bottom: 10px;
}
.subnav .nav > .active > a,
Expand Down Expand Up @@ -220,7 +226,6 @@ html, body {
border-radius: 0;
}


/* Footer */
.footer {
background-color: #f5f5f5;
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

# ==> Configuration for :rememberable
# The time the user will be remembered without asking for credentials again.
# config.remember_for = 2.weeks
config.remember_for = 2.weeks

# If true, a valid remember token can be re-used between multiple browsers.
# config.remember_across_browsers = true
Expand Down

Large diffs are not rendered by default.

Binary file not shown.
Binary file modified public/assets/application-7bad7ad7f3f094171123ee6379161f83.js.gz
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
2 changes: 1 addition & 1 deletion public/assets/application.css

Large diffs are not rendered by default.

Binary file modified public/assets/application.css.gz
Binary file not shown.
Binary file modified public/assets/application.js.gz
Binary file not shown.
18 changes: 9 additions & 9 deletions public/assets/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
dealbook_logo.png: dealbook_logo-115442ccfed0496ee078d82cf5d337bd.png
glyphicons_030_pencil.png: glyphicons_030_pencil-e0628b46faa4108a5359794cec1905e2.png
glyphicons_290_skull.png: glyphicons_290_skull-e50f671ae3a44a23bb56597f1a5bb627.png
handmadepaper.png: handmadepaper-37db22d2a8fdeea423225c0d14da9c9c.png
application.js: application-7bad7ad7f3f094171123ee6379161f83.js
application.css: application-09fce2849332d666bdac3f9bdd1ce016.css
chosen-sprite.png: chosen-sprite-1593a190b0366a1905d06c361c20ea4a.png
glyphicons-halflings-white.png: glyphicons-halflings-white-13553a5bf21ae3cc374006592488ec64.png
glyphicons-halflings.png: glyphicons-halflings-f6675c325532ec11a984d58e172b8e2a.png
!binary "ZGVhbGJvb2tfbG9nby5wbmc=": dealbook_logo-115442ccfed0496ee078d82cf5d337bd.png
!binary "Z2x5cGhpY29uc18wMzBfcGVuY2lsLnBuZw==": glyphicons_030_pencil-e0628b46faa4108a5359794cec1905e2.png
!binary "Z2x5cGhpY29uc18yOTBfc2t1bGwucG5n": glyphicons_290_skull-e50f671ae3a44a23bb56597f1a5bb627.png
!binary "aGFuZG1hZGVwYXBlci5wbmc=": handmadepaper-37db22d2a8fdeea423225c0d14da9c9c.png
!binary "YXBwbGljYXRpb24uanM=": application-7bad7ad7f3f094171123ee6379161f83.js
!binary "YXBwbGljYXRpb24uY3Nz": application-2a27a7f0230d2b9e70632d8348e2de22.css
!binary "Y2hvc2VuLXNwcml0ZS5wbmc=": chosen-sprite-1593a190b0366a1905d06c361c20ea4a.png
!binary "Z2x5cGhpY29ucy1oYWxmbGluZ3Mtd2hpdGUucG5n": glyphicons-halflings-white-13553a5bf21ae3cc374006592488ec64.png
!binary "Z2x5cGhpY29ucy1oYWxmbGluZ3MucG5n": glyphicons-halflings-f6675c325532ec11a984d58e172b8e2a.png

0 comments on commit 6f459f9

Please sign in to comment.