Commit 11189b93 authored by yPhil's avatar yPhil
Browse files

Conflict resolution, trying to restore menu edits

parent b06e675b
......@@ -589,36 +589,26 @@ nav#sideMenu.expanded {
}
#console {
resize: vertical;
/* max-width:250px; */
border: 3px solid var(--color-ui-sep);
max-width: 250px;
border-radius: 3px;
background-color: var(--color-ui-console-bg);
color: var(--color-ui-console-fg);
/* cursor: s-resize; */
cursor: s-resize;
font-family: monospace;
min-height: 2.5em;
height: 2.5em;
overflow-wrap: break-word;
/* overflow-y: scroll; */
overflow: auto; /* something other than visible */
overflow-y: scroll;
padding: 0 0.2em;
/* position:relative; */
position: relative;
text-align: left;
/* transition: height .3s ease-in-out; */
border: 3px solid var(--color-ui-sep);
transition: height 0.3s ease-in-out;
}
/* #console.expanded { */
/* height: 120px; */
/* cursor: n-resize; */
/* } */
#console.expanded {
height: 120px;
cursor: n-resize;
}
/* fieldset.retracted { */
......@@ -895,19 +885,27 @@ label:last-child {
}
/* .bottom { */
/* margin-bottom: 0; */
/* } */
/* div.testFlex { */
/* display: flex; */
/* } */
/* #spinner { */
/* width: 2rem; */
/* } */
/* .noBottom { */
/* margin-bottom: 0; */
/* } */
#tabs {
......@@ -1041,8 +1039,11 @@ li.feed {
}
/* li.feed.selected { */
/* background: none !important; */
/* opacity: 0.8; */
/* } */
.feed-body {
......
......@@ -45,13 +45,13 @@ PTL.tab = {
$(window).scroll(function() {
if ($(this).scrollTop() >= 50) {
$('#backtop').fadeIn(200);
$('#backToTop').fadeIn(200);
} else {
$('#backtop').fadeOut(200);
$('#backToTop').fadeOut(200);
}
});
$('#backtop').click(function() {
$('#backToTop').click(function() {
$('body,html').animate({
scrollTop : 0
}, 500);
......
......@@ -424,7 +424,7 @@
<div id="dialogs"></div>
<span id="backtop">
<span id="backToTop">
<i class="icon-up"></i>
</span>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment