mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source 
Conflicts:
	templates/2k11/admin/entries.tpl
	templates/2k11/admin/serendipity_editor.js.tpl
	templates/2k11/admin/style.css
This commit is contained in:
Matthias Mees
2015-01-17 18:10:41 +01:00
parent 0dc96ec9b8 709253498a
commit 4ecc125adb
6 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
templates/2k11/admin/style.css
View File

@ -1076,7 +1076,7 @@ h4,
}
.toggle_headline,
.taxonomy h3,
#category_list h3,
h5,
h6 {
font-size: 1em;
@ -1783,8 +1783,8 @@ form > .button_link:first-of-type,
padding-bottom: .583335em;
}
.taxonomy h3,
.taxonomy li {
.taxonomy h3:hover,
.taxonomy li:hover {
cursor: pointer;
}
@ -1794,16 +1794,12 @@ form > .button_link:first-of-type,
margin: .375em 2em .375em 0;
}
.taxonomy ul {
clear: left;
#category_list ul {
margin: .375em 0;
line-height: 1.5em;
padding: 0;
text-align: left;
width: 100%;
}
.taxonomy li {
#category_list li {
display: inline-block;
margin: 0 1em 0 0;
}
@ -2309,7 +2305,7 @@ label .perm_name,
.no-js .customfieldMedia,
.no-js .toggle_links,
.no-js .toggle_info,
.no-js .taxonomy,
.no-js #category_list,
.no-js .comment_summary,
.no-js .show_config_option .icon-right-dir,
.no-js #keyword_list,
@ -2929,12 +2925,6 @@ img.mfp-img {
width: 48%;
}
.taxonomy ul {
clear: none;
float: right;
width: 84%;
}
#template_select .current_backend_template,
#template_select li:nth-child(even) article,
.media_pane .even,