harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source 
Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php
This commit is contained in:
redmatrix
2015-05-14 18:02:29 -07:00
parent b467dc4f00 51b89f0ed8
commit a6cb90c81c
187 changed files with 10011 additions and 9772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
view/css/bootstrap-red.css vendored
View File

@@ -26,12 +26,12 @@ nav i {
}
nav ul li {
max-height: 49px;
max-height: 50px;
}
nav img {
height: 48px;
width: 48px;
height: 49px;
width: 49px;
margin-top: 1px;
}
@@ -56,6 +56,11 @@ nav .navbar-toggle {
/* nav overrides end */
aside .nav-pills > li > a {
padding: 6px 10px;
}
.dropdown-menu img {
float: left;
width: 32px;

4
view/css/widgets.css
View File

@@ -7,10 +7,6 @@
margin-top: 0px;
}
.widget .nav-pills > li > a {
padding: 6px 10px;
}
.widget-input {
width: 100%;
border-top-right-radius: 0px;