Conjure/site-2015
6
0
Fork 0
mirror of https://github.com/ConjureETS/site-2015.git synced 2026-03-24 04:21:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from ConjureETS/navbar_fix

Browse Source 
Fixed navbar
This commit is contained in:
tyl3n 2015-07-22 12:18:34 -04:00
commit 97c64e5207
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/css/freelancer.css
View File

@ -126,7 +126,7 @@ header .intro-text .skills {
} }
} }
section { section {
padding: 100px 0; padding: 50px 0;
} }
section h2 { section h2 {
@ -327,4 +327,4 @@ form .row:first-child .floating-label-form-group {
.scroll-top .btn:focus { .scroll-top .btn:focus {
outline: 0; outline: 0;
} }

25
static/css/style.css
View File

@ -4,20 +4,37 @@ html {
} }
body { body {
margin-bottom: 0px; margin-bottom: 0px;
padding-top:10px;
padding-bottom: 0px; padding-bottom: 0px;
color: #fff; color: #fff;
background-color:#1A7AC5; background-color:#1A7AC5;
/*background: rgba(24,188,156,.9);*/ /*background: rgba(24,188,156,.9);*/
} }
.navbar-wrapper {
height:52px;
}
.navbar-wrapper .container {
width:100%;
}
.navbar-wrapper .navbar-brand {
padding:5px 10px;
}
.navbar-wrapper .navbar-brand img {
height:40px;
}
/*
#conjure #conjure
{ {
background-image: url("../img/conjure_logo.png"); background-image: url("../img/conjure_logo.png");
width:200px; width:228.3px;
height:50px; height:52px;
background-size: 200px 25px; background-size: 200px 25px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
*/
#projet #projet
{ {
background-color:#1A7AC5; background-color:#1A7AC5;

4
templates/template.html
View File

@ -22,8 +22,6 @@
<link href="http://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"> <link href="http://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css"> <link href="http://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic" rel="stylesheet" type="text/css">
<!-- Custom styles for this template -->
<link href="{% static 'css/carousel.css'%}" rel="stylesheet">
</head> </head>
<body> <body>
@ -39,7 +37,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="#"><div id="conjure"></div></a> <a class="navbar-brand" href="#"><img src="{% static 'img/conjure_logo.png' %}" height="40px"></a>
</div> </div>
<div id="navbar" class="navbar-collapse collapse"> <div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">