manually restore from before merge
The merge in 7740886ff9ebf74d0365c9d69eb9b46c2876b077 accidentally overwrote changes that were important. This commit tries to restore them while also keeping the additions from feature_updateAll.
This commit is contained in:
onli
parent
7740886ff9
commit
e7502ef9bc
@ -350,7 +350,6 @@ progress div.progress-undefined {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
/* HELPER CLASSES */
|
||||
/* Hide visually, available for screenreaders */
|
||||
.visuallyhidden {
|
||||
@ -820,6 +819,7 @@ input[type="url"] {
|
||||
padding: 2px 3px;
|
||||
text-align: left;
|
||||
height: 1.8em;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
input[type="datetime-local"]::-webkit-clear-button {
|
||||
@ -968,8 +968,10 @@ input[type=checkbox],
|
||||
.filter_pane,
|
||||
#s9y_links > ul,
|
||||
#serendipity_category .inputs,
|
||||
#serendipity_customfields textarea,
|
||||
#adv_opts {
|
||||
.serendipity_customfields textarea,
|
||||
#adv_opts,
|
||||
.entryproperties > h3,
|
||||
.entryproperties_customfields > h4 {
|
||||
margin-top: .75em;
|
||||
margin-bottom: .75em;
|
||||
}
|
||||
@ -980,7 +982,9 @@ input[type=checkbox],
|
||||
|
||||
#serendipity_category .inputs .form_radio,
|
||||
.configuration_group fieldset > fieldset,
|
||||
.configuration_group div > fieldset,
|
||||
.theme_options .configuration_group > fieldset,
|
||||
.theme_options .configuration_group > div,
|
||||
.configuration_group .form_field,
|
||||
.configuration_group .form_area,
|
||||
.configuration_group .form_check,
|
||||
@ -998,14 +1002,17 @@ input[type=checkbox],
|
||||
}
|
||||
|
||||
.configuration_group fieldset > fieldset,
|
||||
.configuration_group div > fieldset,
|
||||
.theme_options .configuration_group > fieldset,
|
||||
.theme_options .configuration_group > div,
|
||||
.configure_plugin .configuration_group > fieldset,
|
||||
.configure_plugin .config_optiongroup .odd,
|
||||
.configure_plugin .config_optiongroup .even,
|
||||
.configuration_group .form_field,
|
||||
.configuration_group .form_area,
|
||||
.configuration_group .form_select,
|
||||
.configuration_group .form_multiselect {
|
||||
.configuration_group .form_multiselect,
|
||||
.configuration_group .custom_item {
|
||||
padding: .75em 0;
|
||||
}
|
||||
|
||||
@ -1016,6 +1023,7 @@ input[type=checkbox],
|
||||
.importer_data dd,
|
||||
.form_buttons > input,
|
||||
.js .media_choose label,
|
||||
.js .media_choose input,
|
||||
.quick_list ol > li,
|
||||
.serendipity_emoticon_bar {
|
||||
margin-bottom: .75em;
|
||||
@ -1109,6 +1117,8 @@ h4,
|
||||
|
||||
.toggle_headline,
|
||||
.taxonomy h3,
|
||||
.entryproperties > h3,
|
||||
.entryproperties_customfields > h4,
|
||||
h5,
|
||||
h6 {
|
||||
font-size: 1em;
|
||||
@ -1181,11 +1191,12 @@ summary {
|
||||
|
||||
#workspace,
|
||||
.plugin_data,
|
||||
.plugin_data summary,
|
||||
.serendipity_statistics > .wide_box {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#serendipity_customfields label {
|
||||
.serendipity_customfields label {
|
||||
margin-right: 1em;
|
||||
}
|
||||
|
||||
@ -1203,7 +1214,7 @@ summary {
|
||||
#entries_list .form_check,
|
||||
.pagination .prev,
|
||||
.pagination .next,
|
||||
#serendipity_customfields textarea,
|
||||
.serendipity_customfields textarea,
|
||||
#dashboard_header h2 {
|
||||
float: left;
|
||||
}
|
||||
@ -1452,15 +1463,21 @@ summary {
|
||||
.comments_pane .pagination,
|
||||
.media_pane .pagination,
|
||||
.entries_pane .pagination,
|
||||
.karma_pane .pagination {
|
||||
.karma_pane .pagination,
|
||||
.plugin_data {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#media_pane_filter #toggle_filters {
|
||||
#media_pane_filter #toggle_filters,
|
||||
.plugin_data .perm_name {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.plugin_data .perm_name {
|
||||
left: 1.25em;
|
||||
}
|
||||
|
||||
.ac_results {
|
||||
z-index: 2000;
|
||||
}
|
||||
@ -1651,8 +1668,7 @@ form > .button_link:first-of-type,
|
||||
|
||||
.filter_pane,
|
||||
#meta_data > div,
|
||||
#adv_opts > fieldset > div,
|
||||
#adv_opts > fieldset > fieldset,
|
||||
.adv_opts_box,
|
||||
#downloads {
|
||||
background: #eee;
|
||||
-webkit-box-sizing: border-box;
|
||||
@ -1663,8 +1679,7 @@ form > .button_link:first-of-type,
|
||||
}
|
||||
|
||||
#meta_data > div,
|
||||
#adv_opts > fieldset > div,
|
||||
#adv_opts > fieldset > fieldset {
|
||||
.adv_opts_box {
|
||||
margin-bottom: 1em;
|
||||
padding: .4em;
|
||||
}
|
||||
@ -2287,7 +2302,8 @@ label .perm_name,
|
||||
|
||||
.nojs-controls,
|
||||
.touch .pluginmanager_grablet,
|
||||
.toggle_info b {
|
||||
.toggle_info b,
|
||||
#edit_entry_metadata #toggle_cat_view {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
@ -2366,7 +2382,6 @@ label .perm_name,
|
||||
.no-js .show_config_option .icon-right-dir,
|
||||
.no-js #keyword_list,
|
||||
.no-js #category_filter,
|
||||
.no-js #updateAll,
|
||||
.js .additional_info,
|
||||
.js .installer .icon-info-circled,
|
||||
.hidden {
|
||||
@ -2411,6 +2426,51 @@ input[name="serendipity[filter][fileCategory]"] {
|
||||
margin: 1em 0 0;
|
||||
}
|
||||
|
||||
#overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0,0,0,0.9);
|
||||
z-index: 10000;
|
||||
}
|
||||
|
||||
#progressWidget {
|
||||
display: block;
|
||||
margin: auto;
|
||||
position: relative;
|
||||
top: 40%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#updateAll {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
#updateMessage {
|
||||
color: white;
|
||||
width: 20em;
|
||||
}
|
||||
|
||||
#updateProgress, #updateIndicator, #updateMessage {
|
||||
display: block;
|
||||
margin-bottom: 1em;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
@-webkit-keyframes loaderSprite { from { background-position: 0px; } to { background-position: -2500px; } }
|
||||
@-moz-keyframes loaderSprite { from { background-position: 0px; } to { background-position: -2500px; } }
|
||||
@keyframes loaderSprite { from { background-position: 0px; } to { background-position: -2500px; } }
|
||||
|
||||
#updateIndicator {
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
background-image: url('{TEMPLATE_PATH}img/activity.png');
|
||||
-webkit-animation: loaderSprite 1s steps(25, end) infinite;
|
||||
animation: loaderSprite 1s steps(25, end) infinite;
|
||||
}
|
||||
|
||||
/* TEMP fixes for tree view */
|
||||
#expandcontractdiv {
|
||||
font-size: 1em !important;
|
||||
@ -2431,51 +2491,6 @@ input[name="serendipity[filter][fileCategory]"] {
|
||||
}
|
||||
/* end TEMP fixes */
|
||||
|
||||
#overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(0,0,0,0.9);
|
||||
z-index: 10000;
|
||||
}
|
||||
|
||||
#progressWidget {
|
||||
display: block;
|
||||
margin: auto;
|
||||
position: relative;
|
||||
top: 40%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#updateAll {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
#updateMessage {
|
||||
color: white;
|
||||
width: 20em;
|
||||
}
|
||||
|
||||
#updateProgress, #updateIndicator, #updateMessage {
|
||||
display: block;
|
||||
margin-bottom: 1em;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
@-webkit-keyframes loaderSprite { from { background-position: 0px; } to { background-position: -2500px; } }
|
||||
@-moz-keyframes loaderSprite { from { background-position: 0px; } to { background-position: -2500px; } }
|
||||
@keyframes loaderSprite { from { background-position: 0px; } to { background-position: -2500px; } }
|
||||
|
||||
#updateIndicator {
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
background-image: url('{TEMPLATE_PATH}img/activity.png');
|
||||
-webkit-animation: loaderSprite 1s steps(25, end) infinite;
|
||||
animation: loaderSprite 1s steps(25, end) infinite;
|
||||
}
|
||||
|
||||
/* MAGNIFIC POPUP */
|
||||
.mfp-bg {
|
||||
top: 0;
|
||||
@ -3011,18 +3026,27 @@ img.mfp-img {
|
||||
#serendipityScaleForm,
|
||||
#serendipityScaleImg,
|
||||
.media_file,
|
||||
#dashboard > .quick_list,
|
||||
#dashboard > .dashboard_widget,
|
||||
#maintenance > .quick_list,
|
||||
.serendipity_statistics > section,
|
||||
#serendipity_category > div > div,
|
||||
#serendipity_category #preview,
|
||||
#serendipity_category > div > fieldset,
|
||||
#directory_permissions .form_multiselect {
|
||||
#directory_permissions .form_multiselect,
|
||||
.media_chooser {
|
||||
float: left;
|
||||
margin: 0 2% 1em 0;
|
||||
width: 48%;
|
||||
}
|
||||
|
||||
.media_chooser {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.media_chooser + .field_info {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.taxonomy ul {
|
||||
clear: none;
|
||||
float: right;
|
||||
@ -3032,15 +3056,11 @@ img.mfp-img {
|
||||
#template_select .current_backend_template,
|
||||
#template_select li:nth-child(even) article,
|
||||
.media_pane .even,
|
||||
#dashboard > .even {
|
||||
margin: 0 0 1em 2%;
|
||||
}
|
||||
|
||||
#dashboard > .dashboard_widget:nth-child(even),
|
||||
#maintenance > section:nth-of-type(even) {
|
||||
margin: 0 0 1em 2%;
|
||||
}
|
||||
|
||||
#dashboard > .odd,
|
||||
#maintenance > section {
|
||||
margin: 0 2% 1em 0;
|
||||
}
|
||||
@ -3084,6 +3104,7 @@ img.mfp-img {
|
||||
.configuration_group .form_field input,
|
||||
.configuration_group .form_area textarea,
|
||||
.configuration_group fieldset > fieldset legend,
|
||||
.configuration_group div > fieldset legend,
|
||||
#uploadform .form_select label,
|
||||
#uploadform .form_field label,
|
||||
#uploadform .form_select select,
|
||||
@ -3138,7 +3159,7 @@ img.mfp-img {
|
||||
|
||||
.js .configuration_group .media_choose input {
|
||||
margin-right: 1%;
|
||||
max-width: 41.5%;
|
||||
max-width: none;
|
||||
}
|
||||
|
||||
.info_expanded select,
|
||||
@ -3159,13 +3180,15 @@ img.mfp-img {
|
||||
.configuration_group .form_multiselect,
|
||||
.configuration_group .form_field,
|
||||
.configuration_group .form_area,
|
||||
.configuration_group .custom_item,
|
||||
.configuration_group fieldset > fieldset,
|
||||
.configuration_group div > fieldset,
|
||||
#template_select li:nth-child(odd),
|
||||
#template_select h2,
|
||||
.media_pane .odd,
|
||||
#dashboard > .odd,
|
||||
.plugins_installable > li:nth-child(odd),
|
||||
.serendipity_statistics > section:nth-child(odd) {
|
||||
.serendipity_statistics > section:nth-child(odd),
|
||||
.dashboard_widget:nth-child(odd) {
|
||||
clear: left;
|
||||
}
|
||||
|
||||
@ -3179,6 +3202,7 @@ img.mfp-img {
|
||||
|
||||
.configure_plugin fieldset .form_radio,
|
||||
.configuration_group fieldset > fieldset .form_radio,
|
||||
.configuration_group div > fieldset .form_radio,
|
||||
#serendipity_plugin_config > fieldset .form_radio,
|
||||
#template_options fieldset .form_radio {
|
||||
margin-top: 0;
|
||||
@ -3437,10 +3461,6 @@ img.mfp-img {
|
||||
|
||||
/* LARGER SCREENS */
|
||||
@media only screen and (min-width: 1280px) {
|
||||
.js .configuration_group .media_choose input {
|
||||
max-width: 42.5%;
|
||||
}
|
||||
|
||||
#edit_entry_metadata #categoryfilter {
|
||||
max-width: 22em;
|
||||
min-width: 0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user