Skip to content

Commit

Permalink
Merge pull request #515 from Cadasta/bugfix/css-pagecontent
Browse files Browse the repository at this point in the history
Page content css bug fix
  • Loading branch information
ian-ross authored Jul 27, 2016
2 parents 93be3e5 + e5193a7 commit e207c10
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 11 deletions.
20 changes: 14 additions & 6 deletions cadasta/core/static/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions cadasta/core/static/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,18 @@ header {
/* =Page Content
-------------------------------------------------------------- */

#page-content { // for page content default for index pages without subnav that overlap page-header
#page-content { // for page content
z-index: 800;
position: relative;
padding-top: 30px;
padding-bottom: 20px;
}

#projects #page-content,
#organizations #page-content,
#users #page-content { // index pages without subnav that overlap page-header
max-width: 1220px;
margin: -190px auto 10px;
padding-top: 30px;
background: #fff;
-webkit-box-shadow: 0 0 6px rgba(0,0,0,.3);
-moz-box-shadow: 0 0 6px rgba(0,0,0,.3);
Expand Down
10 changes: 7 additions & 3 deletions cadasta/core/static/css/reg.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ body.tinted-bg { // photo for login and register forms
margin: 0 auto;
max-width: 500px;
background: #fff;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border: 1px solid #ddd;
padding: 30px 40px;
margin-top: 30px;
z-index: 100;
position: relative;
-moz-box-shadow: 0 1px 1px rgba(0,0,0,.05);
-webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);
box-shadow: 0 1px 1px rgba(0,0,0,.05);
h1 {
text-align: center;
margin: 4px auto 24px;
Expand Down

0 comments on commit e207c10

Please sign in to comment.