Skip to content

Commit

Permalink
replaced font awesome icons with custom images
Browse files Browse the repository at this point in the history
  • Loading branch information
Linch1 committed Oct 10, 2020
1 parent 768ffad commit 539cd64
Show file tree
Hide file tree
Showing 24 changed files with 63 additions and 33 deletions.
17 changes: 17 additions & 0 deletions public/css/alert.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@
font-size: 15px;
color: black;
cursor: pointer;
width: 15px;
height: 15px;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
background-image: url("../img/cross.png");
}

.alert .form{
Expand All @@ -103,6 +109,17 @@
justify-content: space-around;
}

.alert .form #warning_input_send{
cursor: pointer;
margin-left: 1rem;
width: 60px;
height: 35px;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
background-image: url("../img/send.png");
}

.alert .form input[type="number"]{
background-color: white;
}
Expand Down
7 changes: 7 additions & 0 deletions public/css/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,17 @@ img {
z-index: 99;
font-size: 30px;
color: blue;
width: 25px;
height: 25px;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
}
.slick-prev{
left: 20px;
background-image: url("../img/arrow-left.png");
}
.slick-next{
right: 20px;
background-image: url("../img/arrow-right.png");
}
10 changes: 9 additions & 1 deletion public/css/menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@

.title-bar .left-off-canvas-toggle{
font-size: 25px;
padding-left: 1rem;
margin-left: 1rem;

width: 20px;
height: 20px;
display: block;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
background-image: url("../img/menu.png");
}
.title-bar .dragger{
width: 100vw;
Expand Down
Binary file added public/img/arrow-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/arrow-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/send.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 5 additions & 7 deletions public/js/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ window.addEventListener('load', start);
function build_popup(settings){
let popup = $(`
<div class="alert">
<div class="remove">
<i class="fas fa-times"></i>
</div>
<div class="remove"></div>
<div class="body">
<div class="profile">${settings.profile}</div>
Expand All @@ -27,7 +25,7 @@ function build_popup(settings){
let input = $(`
<div class="form">
<input type="number" id="warning_input" >
<i id="warning_input_send" class="fas fa-share"></i>
<div id="warning_input_send"></div>
</div>
`);
body.append(input);
Expand Down Expand Up @@ -118,8 +116,8 @@ function start(){
// quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
// consequat. $/link/https://google.com$/link/`);

// show_popup_input('wiinsta', 'test title', '../../public/img/avatars/8.png', `Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
// tempor incididunt ut labore et dolore magna aliqua. $/link/https://google.com$/link/`);
show_popup_input('wiinsta', 'test title', '../../public/img/avatars/8.png', `Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. $/link/https://google.com$/link/`);

// show_popup('wiinsta', 'test title', '../../public/img/avatars/8.png', `Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
// tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
Expand All @@ -140,7 +138,7 @@ function start(){

let target = $(e.target);
// Close the alert from the right-upper cross
if (target.parent().is(".alert .remove")){
if (target.is(".alert .remove")){
let parent = $(e.target).closest('.alert');
close_popup(parent);
}
Expand Down
8 changes: 4 additions & 4 deletions public/js/custom-functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ function draw_stats(){
}
}

console.log(datas)
//console.log(datas)
// populate the 'days' array and the 'datas' object with the 'global_stats' informations
for ([day, stats] of Object.entries(global_stats)){
days.push(day);
Expand All @@ -1135,10 +1135,10 @@ function draw_stats(){
if(NO_RENDER_GRAPHS.includes(stat)) continue;
if(!datas[stat]) datas[stat] = [];
datas[stat].push(value);
console.log(stat, datas[stat])
// console.log(stat, datas[stat])
}
}
console.log(datas)
// console.log(datas)

// if there are more than 4 days it removes the default values
if(keys.length >= 4){
Expand Down Expand Up @@ -1248,7 +1248,7 @@ function clear_logs(){

function random_avatar(){
let avatars = get_files_and_folders(app.getAppPath() + '/' + AVATARS_FOLDER); // get_files() return errors. without app.getAppPath() it gives also errors.
let randomAvatar = String(randomRange(1, avatars.length)) + '.png';
let randomAvatar = String(randomRange(1, 9)) + '.png';
return randomAvatar;
}

Expand Down
2 changes: 1 addition & 1 deletion public/js/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ var SETTINGS;
Load selectors from external url
*/
SETTINGS = JSON.parse(SETTINGS);
console.log("SETTINGS: ", SETTINGS)

INSTAGRAM_LOGIN = SETTINGS["selectors"]["INSTAGRAM_LOGIN"];
INSTAGRAM_BASE = SETTINGS["selectors"]["INSTAGRAM_BASE"];

Expand Down
4 changes: 2 additions & 2 deletions views/index/dashboard.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
pauseOnHover: false,
swipe: true,
arrows: true,
prevArrow: '<a class="slick-prev"><i class="fas fa-chevron-left"></i></a>',
nextArrow: '<a class="slick-next"><i class="fas fa-chevron-right"></i></a>',
prevArrow: '<a class="slick-prev"></a>',
nextArrow: '<a class="slick-next"></a>',
fade: true,
});
});
Expand Down
4 changes: 2 additions & 2 deletions views/index/images.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
pauseOnHover: false,
swipe: true,
arrows: true,
prevArrow: '<a class="slick-prev"><i class="fas fa-chevron-left"></i></a>',
nextArrow: '<a class="slick-next"><i class="fas fa-chevron-right"></i></a>',
prevArrow: '<a class="slick-prev"></a>',
nextArrow: '<a class="slick-next"></a>',
fade: true,
});
});
Expand Down
4 changes: 2 additions & 2 deletions views/index/logs.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
pauseOnHover: false,
swipe: true,
arrows: true,
prevArrow: '<a class="slick-prev"><i class="fas fa-chevron-left"></i></a>',
nextArrow: '<a class="slick-next"><i class="fas fa-chevron-right"></i></a>',
prevArrow: '<a class="slick-prev"></a>',
nextArrow: '<a class="slick-next"></a>',
fade: true,
});
});
Expand Down
4 changes: 2 additions & 2 deletions views/index/posts.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
pauseOnHover: false,
swipe: true,
arrows: true,
prevArrow: '<a class="slick-prev"><i class="fas fa-chevron-left"></i></a>',
nextArrow: '<a class="slick-next"><i class="fas fa-chevron-right"></i></a>',
prevArrow: '<a class="slick-prev"></a>',
nextArrow: '<a class="slick-next"></a>',
fade: true,
});
});
Expand Down
4 changes: 2 additions & 2 deletions views/index/profiles.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
pauseOnHover: false,
swipe: true,
arrows: true,
prevArrow: '<a class="slick-prev"><i class="fas fa-chevron-left"></i></a>',
nextArrow: '<a class="slick-next"><i class="fas fa-chevron-right"></i></a>',
prevArrow: '<a class="slick-prev"></a>',
nextArrow: '<a class="slick-next"></a>',
fade: true,
});
});
Expand Down
4 changes: 2 additions & 2 deletions views/index/stats.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
pauseOnHover: false,
swipe: true,
arrows: true,
prevArrow: '<a class="slick-prev"><i class="fas fa-chevron-left"></i></a>',
nextArrow: '<a class="slick-next"><i class="fas fa-chevron-right"></i></a>',
prevArrow: '<a class="slick-prev"></a>',
nextArrow: '<a class="slick-next"></a>',
fade: true,
});
});
Expand Down
4 changes: 2 additions & 2 deletions views/index/stories.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
pauseOnHover: false,
swipe: true,
arrows: true,
prevArrow: '<a class="slick-prev"><i class="fas fa-chevron-left"></i></a>',
nextArrow: '<a class="slick-next"><i class="fas fa-chevron-right"></i></a>',
prevArrow: '<a class="slick-prev"></a>',
nextArrow: '<a class="slick-next"></a>',
fade: true,
});
});
Expand Down
2 changes: 1 addition & 1 deletion views/partials/header.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<!-- Insert this line above script imports -->
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>

<script src="https://kit.fontawesome.com/c03d8172f3.js"></script>


<script src='../../public/js/files.js'></script>
<script src='../../public/js/alert.js'></script>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/images_actions.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</div>
<script type="text/javascript">
$( document ).ready(function() {
console.log(jQuery())
jQuery('#images-menu').circle_menu({
angle_initial: -90,
angle_increment: -25.7,
Expand Down
2 changes: 1 addition & 1 deletion views/partials/posts_actions.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</div>
<script type="text/javascript">
$( document ).ready(function() {
console.log(jQuery())
jQuery('#posts-menu').circle_menu({
angle_initial: -90,
angle_increment: -36,
Expand Down
2 changes: 1 addition & 1 deletion views/partials/profiles_actions.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</div>
<script type="text/javascript">
$( document ).ready(function() {
console.log(jQuery())
jQuery('#profiles-menu').circle_menu({
angle_initial: -90,
angle_increment: -22.5,
Expand Down
2 changes: 1 addition & 1 deletion views/partials/stories_actions.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</div>
<script type="text/javascript">
$( document ).ready(function() {
console.log(jQuery())
jQuery('#stories-menu').circle_menu({
angle_initial: -90,
angle_increment: -36,
Expand Down
2 changes: 1 addition & 1 deletion views/partials/top_bar.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="title-bar">

<div class="title-bar-left">
<a class="left-off-canvas-toggle" href="#" ><i class="fas fa-ellipsis-h"></i></a>
<a class="left-off-canvas-toggle" href="#" ></a>

</div>
<div class="dragger"></div>
Expand Down

0 comments on commit 539cd64

Please sign in to comment.