Merge pull request #671 from steindornatorinn/dev
Major improvement of navbar css (Ready for merge)
Cette révision appartient à :
révision
b8958fc481
|
@ -77,6 +77,8 @@
|
|||
left: 2%;
|
||||
}
|
||||
|
||||
/* This used to avoid usage of Javascript for switching images. */
|
||||
|
||||
body {
|
||||
background-color: #ececec;
|
||||
color: #111111;
|
||||
|
@ -250,44 +252,69 @@ div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:last-of-typ
|
|||
max-height: 80vh;
|
||||
}
|
||||
|
||||
/* Navbar */
|
||||
/*
|
||||
* === Navbar ===
|
||||
*/
|
||||
|
||||
.navbar {
|
||||
border-radius: 0px;
|
||||
/* Padding around the navbar, effectively determines it's size */
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
.navbar-logo {
|
||||
padding-right: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
:target {
|
||||
/* Highlight menu items on hover */
|
||||
background-color: #e5eecc;
|
||||
}
|
||||
|
||||
/* Navbar search */
|
||||
|
||||
#mainmenu button .search_text {
|
||||
/* Hides the text on the search button */
|
||||
display: none;
|
||||
}
|
||||
|
||||
#mainmenu .navbar-form select.form-control {
|
||||
/* Slight height adjustment to make the menues in line with text */
|
||||
margin-top: 2px;
|
||||
/* Limit the size of the dropdown menus */
|
||||
width: 12rem;
|
||||
}
|
||||
|
||||
#mainmenu .navbar-form select.form-control#max {
|
||||
/* Further limit the size of the results per page menu */
|
||||
width: 6rem;
|
||||
}
|
||||
|
||||
/* Navbar member section */
|
||||
|
||||
.special-img {
|
||||
position: relative;
|
||||
top: -7px;
|
||||
float: left;
|
||||
left: -5px;
|
||||
/* Limit the avatar size */
|
||||
height: 40px;
|
||||
width: 40px;
|
||||
/* Add a bit of extra vertical space so it won't look bad */
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
#mainmenu .badgemenu .profile-image {
|
||||
line-height: 35px;
|
||||
.navbar-nav > li > .profile-image {
|
||||
/* Overwrite bootstrap rules to get a sensible layout for our avatar */
|
||||
padding-top: 0px;
|
||||
padding-bottom: 0px;
|
||||
/* Force the element to always be as large as when it contains a avatar */
|
||||
height: 50px;
|
||||
}
|
||||
|
||||
#mainmenu .navbar-header,
|
||||
#mainmenu .navbar-nav,
|
||||
#mainmenu .navbar-form {
|
||||
padding-top: 8px;
|
||||
}
|
||||
|
||||
#mainmenu .badgemenu {
|
||||
padding-top: 0;
|
||||
/* Any order columns */
|
||||
margin-right: -50px;
|
||||
.badgemenu > li > a > span {
|
||||
/* Ensure the member name is always centered */
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
/* PROFILE PAGE */
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
</ul>
|
||||
{{ else }}
|
||||
<a href="#" class="dropdown-toggle profile-image" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
<span class="glyphicon glyphicon-user hidden-md hidden-lg"></span> {{ call $.T "member" }} <span class="caret"></span>
|
||||
<span>{{ call $.T "member" }}</span><span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="{{ genRoute "user_login" }}"><i class="fa fa-sign-out"></i> {{ call $.T "sign_in"}}</a></li>
|
||||
|
|
Référencer dans un nouveau ticket