Skip to content
This repository has been archived by the owner on Nov 22, 2018. It is now read-only.

Commit

Permalink
fixed alignment issues with navbar.
Browse files Browse the repository at this point in the history
  • Loading branch information
sdiemert committed Jul 30, 2015
1 parent 0a9b0bd commit a21b7fc
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
7 changes: 5 additions & 2 deletions assets/css/auxilary.css
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,13 @@ h1, h2, h3, h4, h5, h6 {
.wrapper {
margin-left: auto;
margin-right: auto;
min-width: 900px;
margin-top: 10px;
}

.container{
min-width: 960px;
}

.welcome-message {

font-size: 36px;
Expand Down Expand Up @@ -173,6 +176,6 @@ h1, h2, h3, h4, h5, h6 {
}

svg {
text-algin: center
text-align: center;
}

2 changes: 2 additions & 0 deletions views/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@

<div class="row">
<div class="col-xs-12">

{{> projects}}

</div>
</div>
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion views/partials/navbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="wrapper">

<div class="row navbar-outer">
<div class="row navbar-outer"style="margin-left:0px; margin-right:0px;">

<a href="/attachment">
<div class="col-xs-2 navbar-box">
Expand Down
2 changes: 1 addition & 1 deletion views/partials/rightbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<div class="col-sm-12">
<a href="#">
<a href="mailto:[email protected]"><h2><button class="btn btn-primary">Send Feedback to PDC</button><h2></a>
<a style="text-align:right;" href="mailto:[email protected]"><h2><button class="btn btn-primary">Send Feedback</button><h2></a>

</a>
</div>
Expand Down
9 changes: 8 additions & 1 deletion views/partials/topbar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,26 @@
<div class="wrapper">

<div class="row">

<div class="col-sm-10">
<a href="/"><img src="/assets/images/PDC-LogoLeft.png" class="left-logo"/></a>
</div>

<div class="col-sm-2">

<div class="dropdown user-dropdown text-center">
<button class="btn btn-default dropdown-toggle" type="button" id='userDropdown' data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">

<button class="btn btn-default dropdown-toggle" type="button" id='userDropdown'
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
{{user.username}} <span class="caret pull-right" style="margin-top:-10px;"></span>
</button>

<ul class="dropdown-menu user-dropdown-item" aria-labelledby="userDropdown">

<li><a href="/logout">Logout</a></li>

</ul>

</div>

</div>
Expand Down

0 comments on commit a21b7fc

Please sign in to comment.