Conflicts:
	install/schema_mysql.sql
	mod/home.php
	mod/page.php
	view/nl/messages.po
	view/nl/strings.php
This commit is contained in:
redmatrix
2015-06-09 16:52:00 -07:00
17 changed files with 304 additions and 255 deletions
+12
View File
@@ -2053,6 +2053,18 @@ nav .badge.mail-update:hover {
padding: 7px 10px;
}
.nav-tabs.nav-justified > .active > a,
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs.nav-justified > .active > a:focus {
border-bottom-color: transparent;
}
.nav-tabs > li.active > a,
.nav-tabs > li.active > a:hover,
.nav-tabs > li.active > a:focus {
background-color: transparent;
}
#tabs-collapse-1 {
padding: 0px;
margin-bottom: 25px;