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
439ec0ba
Commit
439ec0ba
authored
Dec 08, 2017
by
yPhil
Browse files
Merge branch 'dev'
parents
a0268d1d
73ee973d
Changes
4
Hide whitespace changes
Inline
Side-by-side
bin/www
View file @
439ec0ba
...
...
@@ -12,7 +12,7 @@ var http = require('http');
* Get port from environment and store in Express.
*/
var
port
=
normalizePort
(
process
.
env
.
PORT
||
'
3000
'
);
var
port
=
normalizePort
(
process
.
env
.
PORT
||
'
8666
'
);
app
.
set
(
'
port
'
,
port
);
/**
...
...
public/css/mob-ui.css
View file @
439ec0ba
...
...
@@ -208,6 +208,10 @@ button#donate {
animation
:
fadeIn
ease
6s
;
}
#newTabButton
:hover
{
color
:
#FFDC00
!important
;
}
@keyframes
fadeIn
{
0
%
{
opacity
:
0
;
...
...
public/lib/js/menu.js
View file @
439ec0ba
...
...
@@ -62,7 +62,7 @@ $('<div id="menu">').appendTo($('body')).load('/static/templates/menu.html', fun
});
$saveButton
.
click
(
function
()
{
MOB
.
prefs
.
exportConfig
(
MOB
.
tab
.
all
(),
'
moby
lette.json
'
);
MOB
.
prefs
.
exportConfig
(
MOB
.
tab
.
all
(),
'
petro
lette.json
'
);
return
false
;
});
...
...
@@ -194,7 +194,7 @@ $('<div id="menu">').appendTo($('body')).load('/static/templates/menu.html', fun
// console.log('p Is array: %s', isOk(p));
if
(
p
&&
isOk
(
p
)
===
true
){
$
.
notify
(
MOB
.
tr
(
'
Loaded
moby
lette.json OK
'
),
'
success
'
);
$
.
notify
(
MOB
.
tr
(
'
Loaded
petro
lette.json OK
'
),
'
success
'
);
MOB
.
tab
.
populate
(
p
,
true
);
}
else
{
$
.
notify
(
MOB
.
tr
(
'
This file is bad
'
),
'
error
'
);
...
...
views/index.html
View file @
439ec0ba
...
...
@@ -3,7 +3,7 @@
<head>
<meta
charset=
"UTF-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
Moby
lette
</title>
<title>
Petro
lette
</title>
<link
rel=
"icon"
type=
"image/png"
href=
"/static/images/mobylette.png"
/>
...
...
@@ -66,7 +66,7 @@
var
$activeTab
=
$tabs
.
find
(
'
.ui-tabs-active
'
);
$
(
document
).
prop
(
'
title
'
,
$activeTab
.
text
()
+
'
|
Moby
lette
'
);
$
(
document
).
prop
(
'
title
'
,
$activeTab
.
text
()
+
'
|
Petro
lette
'
);
$
(
'
.tabCloser
'
).
hide
();
...
...
Write
Preview
Supports
Markdown
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