merge master and fixed migration conflict
This commit is contained in:
commit
39d2697e30
17 changed files with 219 additions and 63 deletions
|
|
@ -280,7 +280,10 @@ fieldset[disabled] .btn-xl.active {
|
|||
}
|
||||
|
||||
.navbar-default .navbar-brand {
|
||||
padding: 8px;
|
||||
padding: 4px 8px 12px;
|
||||
}
|
||||
.navbar-default.navbar-shrink .navbar-brand {
|
||||
padding: 6px 8px 10px;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -440,6 +443,7 @@ section h3.section-subheading {
|
|||
max-width: 400px;
|
||||
text-align: center;
|
||||
background-color: #fff;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#portfolio .portfolio-item .portfolio-caption h4 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue