-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature_angular_material'
* feature_angular_material: update gulp, remove extra css files use debug module update social buttons user package with material design added footer material for system package adds angular-material support
- Loading branch information
Showing
20 changed files
with
326 additions
and
1,097 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,6 @@ | ||
.page-header { | ||
padding-bottom: 0 !important; | ||
margin: 0 !important; | ||
border-bottom: 0 !important; | ||
.MEAN-logo { | ||
content: url('/meanStarter/assets/img/logo.png'); | ||
height: 100%; | ||
width: 2.5%; | ||
margin-right: 0.5em; | ||
} | ||
.page-header .navbar-nav { | ||
float: right; | ||
} | ||
.page-header > div > div, .page-header > div > ul { | ||
display: inline-block; | ||
} | ||
.text-edit { | ||
float: right; | ||
margin-top: 12px; | ||
} | ||
.account { | ||
text-align:right; | ||
} | ||
.account > div, .account > ul { | ||
text-align: left; | ||
} | ||
.navbar .nav > li > a.brand { | ||
padding-left: 20px; | ||
margin-left: 0 | ||
} | ||
.content { | ||
margin-top: 70px; | ||
width: 100% | ||
} | ||
footer { | ||
position: fixed; | ||
left: 0; | ||
bottom: 0; | ||
height: 30px; | ||
width: 100%; | ||
background: #ddd; | ||
-webkit-box-shadow: 0 8px 6px 6px black; | ||
-moz-box-shadow: 0 8px 6px 6px black; | ||
box-shadow: 0 8px 6px 6px black | ||
} | ||
footer p { | ||
padding: 5px 0 12px 10px | ||
} | ||
|
||
.featuredpic img{ | ||
width:510px; | ||
} |
Oops, something went wrong.