Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yPhil
Pétrolette
Commits
11189b93
Commit
11189b93
authored
Feb 16, 2021
by
yPhil
Browse files
Conflict resolution, trying to restore menu edits
parent
b06e675b
Changes
3
Hide whitespace changes
Inline
Side-by-side
public/css/petrolette.css
View file @
11189b93
...
...
@@ -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
{
...
...
public/js/PTL.tab.js
View file @
11189b93
...
...
@@ -45,13 +45,13 @@ PTL.tab = {
$
(
window
).
scroll
(
function
()
{
if
(
$
(
this
).
scrollTop
()
>=
50
)
{
$
(
'
#back
t
op
'
).
fadeIn
(
200
);
$
(
'
#back
ToT
op
'
).
fadeIn
(
200
);
}
else
{
$
(
'
#back
t
op
'
).
fadeOut
(
200
);
$
(
'
#back
ToT
op
'
).
fadeOut
(
200
);
}
});
$
(
'
#back
t
op
'
).
click
(
function
()
{
$
(
'
#back
ToT
op
'
).
click
(
function
()
{
$
(
'
body,html
'
).
animate
({
scrollTop
:
0
},
500
);
...
...
views/index.html
View file @
11189b93
...
...
@@ -424,7 +424,7 @@
<div
id=
"dialogs"
></div>
<span
id=
"back
t
op"
>
<span
id=
"back
ToT
op"
>
<i
class=
"icon-up"
></i>
</span>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment