Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 141 additions & 0 deletions all-questions.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
.all-content{
margin:2%;
}
a{
color:black;
}
.page-header>h2{
display:inline;
position:relative;
margin-bottom:10px;
}

#stats-header{
color:grey;
font-size:12px;
float:right;
display:inline;
margin-bottom:0px;
text-align:right;
/*position:absolute;
top:18%;*/
right:2.5%;
}
#stats-header>span{
padding-top:12px;
margin-left:12px;
}

.question-item-overview{
padding-bottom:2%;
padding-top:2%;
border-bottom:1px solid lightgrey;
}
.all-content .container {
width:auto;
padding-left: 0px;
padding-right: 0px;
}

.side-info{
margin-top:7.5%;
/*margin-bottom: 20px;
margin-left:20px;*/
}
@media (max-width:767px){
.side-info{
margin-top:15%;
}
}
@media (max-width:455px){
#stats-header{
display:none;
}
}
@media (max-width:656px){
#stats-header{
top:11%;
}
.question-stats{
float:none!important;
}
}

input.form-control.search{
border:1px, solid;
border-radius:6px !important;
padding:6%;

}

.tag-list > span, .tags>span{
border-style:solid;
border-width:1px;
border-radius:5px;
color:grey;
font-family: 'Source Sans Pro', sans-serif;
padding-left:1.5%;
padding-right: 1.5%;
}
.tag-list >br{
margin-bottom:3%;
}

.input-group-btn{
position:relative;
left: -20px;
border:none;
}

.asker-details,.tags{
display:inline;
}
.relative-time,.tags{
color:grey;
margin-left:12px;
}
.tags>span{
margin-right:5px;
}

.question-stats{
float:right;
vertical-align:top;
margin-left:10px;
}

.votes,.answers,.views{
display:inline-block;
min-width: 38px;
text-align: center;
color:white;
font-family: 'Source Sans Pro', sans-serif;
margin-left: 5px;
background:lightgrey;
padding-top:12px;
padding-bottom:0px;
padding-left: 2px;
padding-right:2px;
border-radius:50%;
width:65px;
height:65px;
}
.desc{
font-size: 12px;
}
.views{
background:black;
}
.counts{
font-weight: bold;
font-size:16px;
}
.summary{
width:60%;
float:left;
}

.summary >h3{
margin-top:0px;
}

141 changes: 141 additions & 0 deletions css/all-questions.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
.all-content{
margin:2%;
}
a{
color:black;
}
.page-header>h2{
display:inline;
position:relative;
margin-bottom:10px;
}

#stats-header{
color:grey;
font-size:12px;
float:right;
display:inline;
margin-bottom:0px;
text-align:right;
/*position:absolute;
top:18%;*/
right:2.5%;
}
#stats-header>span{
padding-top:12px;
margin-left:12px;
}

.question-item-overview{
padding-bottom:2%;
padding-top:2%;
border-bottom:1px solid lightgrey;
}
.all-content .container {
width:auto;
padding-left: 0px;
padding-right: 0px;
}

.side-info{
margin-top:7.5%;
/*margin-bottom: 20px;
margin-left:20px;*/
}
@media (max-width:767px){
.side-info{
margin-top:15%;
}
}
@media (max-width:455px){
#stats-header{
display:none;
}
}
@media (max-width:656px){
#stats-header{
top:11%;
}
.question-stats{
float:none!important;
}
}

input.form-control.search{
border:1px, solid;
border-radius:6px !important;
padding:6%;

}

.tag-list > span, .tags>span{
border-style:solid;
border-width:1px;
border-radius:5px;
color:grey;
font-family: 'Source Sans Pro', sans-serif;
padding-left:1.5%;
padding-right: 1.5%;
}
.tag-list >br{
margin-bottom:3%;
}

.input-group-btn{
position:relative;
left: -20px;
border:none;
}

.asker-details,.tags{
display:inline;
}
.relative-time,.tags{
color:grey;
margin-left:12px;
}
.tags>span{
margin-right:5px;
}

.question-stats{
float:right;
vertical-align:top;
margin-left:10px;
}

.votes,.answers,.views{
display:inline-block;
min-width: 38px;
text-align: center;
color:white;
font-family: 'Source Sans Pro', sans-serif;
margin-left: 5px;
background:lightgrey;
padding-top:12px;
padding-bottom:0px;
padding-left: 2px;
padding-right:2px;
border-radius:50%;
width:65px;
height:65px;
}
.desc{
font-size: 12px;
}
.views{
background:black;
}
.counts{
font-weight: bold;
font-size:16px;
}
.summary{
width:60%;
float:left;
}

.summary >h3{
margin-top:0px;
}

37 changes: 36 additions & 1 deletion css/navbar_style.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,42 @@ width:100%;
}

#centre-shift{
padding: 0% 8% 0% 13%;
padding: 0% 5% 0% 0%;
}
#centre-shift > .navbar-right{
float:none;
padding-right: :6%;
}
#centre-shift > .navbar-left{
padding-left:5%;
}
@media (max-width:767px){
#smaller-nav *, #centre-shift *{
display:inline-block;
}

#smaller-nav,#centre-shift{
padding-left:8%;
}
#bigger-nav{
padding:0%;
}
.navbar-left, #centre-shift > .navbar-right{
float:left;
}
.navbar-right, #centre-shift > .navbar-right {
float:right;
}
#centre-shift{
padding: 0% 5% 0% 8%;

}

}
@media(max-width: 991px){
#centre-shift{
width:100%;
}
}
img{
float:left;
Expand Down
Binary file added images/search-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
<head>
<title ng-bind="title"></title>
<link rel="stylesheet" type="text/css" href="bower_components/bootstrap/dist/css/bootstrap.css">
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="css/navbar_style.css">
<link rel="stylesheet" type="text/css" href="css/all-questions.css">
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
Expand Down
17 changes: 8 additions & 9 deletions navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,24 @@
<div class= "row" id="smaller-nav">
<ul class="nav navbar-nav navbar-left">
<li ng-show="isLoggedIn()"><a href="#/profile">{{firstName()}}</a></li>
<!--<li><a href="#/questions">Browse Questions</a></li>
<li><a href="#/ask">Ask a Question</a></li>-->
</ul>
<ul class="nav navbar-nav navbar-right">
<li ng-show="isLoggedIn()"><a ng-click="logout()" href>Logout</a></li>
<li ng-show="isLoggedOut()"><a>LOGIN</a></li>
<li ng-show="isLoggedIn()"><a ng-click="logout()" href>LOGOUT</a></li>
<li ng-hide="isLoggedIn()"><a>LOGIN</a></li>
<li><a href="#/about">ABOUT</a></li>
<li><a href="#/faq">FAQ</a></li>
<!--<li><a href="http://www.sahiljain.ca" target="_blank">Contact</a></li>-->
</ul>
</div>
<div class="row navbar-inverse" id="bigger-nav">
<div class="container" id ="centre-shift">
<ul class= "nav navbar-nav" style="color:white">
<ul class= "nav navbar-nav navbar-left" style="color:white">
<li><img src ="images/WaterlooAnswersLogo.jpg" alt="Waterloo Answers logo"></li>
</ul>
<ul class="nav navbar-nav navbar-right" style="color:white">
<li><a href="#/questions">QUESTIONS</a></li>
<li><a href="#/tags">TAGS</a></li>
<li><a href="#/users">USERS</a></li>
<li><a href="#/unanswered">UNANSWERED</a></li>
<li><a href="#">TAGS</a></li>
<li><a href="#">USERS</a></li>
<li><a href="#">UNANSWERED</a></li>
<li><a href="#/ask"><font color="00ff33">ASK A QUESTION</font></a></li>
</ul>
</div>
Expand Down
Loading