Skip to content

Commit

Permalink
WEB-63 - Add margin-top to the navbar ul
Browse files Browse the repository at this point in the history
  • Loading branch information
mgallego committed Feb 22, 2013
1 parent 7a082d3 commit a8da844
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 26 deletions.
15 changes: 15 additions & 0 deletions build.xml
Expand Up @@ -136,6 +136,21 @@
<exec command="phpunit --log-junit build/logs/junit.xml --coverage-clover build/logs/clover.xml -c app"/>
</target>

<target name="assets" description="Installs bundle assets in web directory">
<delete includeemptydirs="true">
<fileset dir="${basedir}/web/css" includes="**/*"/>
</delete>
<exec executable="php" failonerror="true">
<arg line="app/console assets:install web --symlink"/>
</exec>

<exec executable="php" failonerror="true">
<arg line="app/console assetic:dump"/>
</exec>

<antcall target="cache"/>
</target>

<target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
<exec executable="phpcb">
<arg value="--log" />
Expand Down
24 changes: 0 additions & 24 deletions src/SFM/PicmntBundle/Resources/public/less/header.less

This file was deleted.

11 changes: 9 additions & 2 deletions src/SFM/PicmntBundle/Resources/public/less/navbar.less
Expand Up @@ -16,6 +16,7 @@
*z-index: 2;
}


// Inner for background effects
// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
.navbar-inner {
Expand Down Expand Up @@ -50,7 +51,7 @@
float: left;
display: block;
// Vertically center the text given @navbarHeight
padding: ((@navbarHeight - @baseLineHeight) / 2) 20px ((@navbarHeight - @baseLineHeight) / 2);
padding: 0 20px ((@navbarHeight - @baseLineHeight) / 2);
margin-left: -20px; // negative indent to left-align the text down the page
font-size: 20px;
font-weight: 200;
Expand Down Expand Up @@ -230,6 +231,11 @@
float: left;
margin: 0 10px 0 0;
}

ul.nav {
margin-top: 10px !important;
}

.navbar .nav.pull-right {
float: right; // redeclare due to specificity
margin-right: 0; // remove margin on float right nav
Expand Down Expand Up @@ -500,7 +506,8 @@ header {
width: 100%;
background: @header-background-color;
.box-shadow(1px 1px 10px gray);
height: @headerHeight;
//height: @headerHeight;
height: @navbarHeight;
}

.picmnt-title {
Expand Down

0 comments on commit a8da844

Please sign in to comment.