From bd565dab653a0e10e083d5b1a2898d00a1f6a4da Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 23 Sep 2020 19:02:16 +0200 Subject: =?UTF-8?q?skril=20today=20button=20in=20popravil=20barvo=20today?= =?UTF-8?q?=20dneva=20na=20\!important=20na=C4=8Din?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/styles.css | 3 +-- assets/js/meals.js | 2 +- dist/cache_name.txt | 2 +- dist/css/styles.css | 3 +-- dist/js/app.js | 2 +- dist/js/meals.js | 2 +- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index a363449..06da571 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -134,9 +134,8 @@ a.collection-item { } .fc-unthemed td.fc-today { - background: var(--color-primary-transparent); + background: var(--color-primary-transparent) !important; } - .fc-icon { color: var(--color-text); } diff --git a/assets/js/meals.js b/assets/js/meals.js index bf9a48e..d614153 100644 --- a/assets/js/meals.js +++ b/assets/js/meals.js @@ -391,7 +391,7 @@ document.addEventListener("DOMContentLoaded", async () => { edge: 'left', draggable: false }); - + document.getElementsByClassName("fc-today-button")[0].style = "display:none !important"; // počasi bomo rabili nestane important stavke // ne vem, kaj je to spodaj ˇˇˇ var elemsx = document.querySelectorAll('select'); M.FormSelect.init(elemsx); diff --git a/dist/cache_name.txt b/dist/cache_name.txt index 25c79f1..fbcbaab 100755 --- a/dist/cache_name.txt +++ b/dist/cache_name.txt @@ -2,4 +2,4 @@ -///site-static-1.0.15.0-beta-616c225||| +///site-static-1.0.15.0-beta-5578035||| diff --git a/dist/css/styles.css b/dist/css/styles.css index a363449..06da571 100755 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -134,9 +134,8 @@ a.collection-item { } .fc-unthemed td.fc-today { - background: var(--color-primary-transparent); + background: var(--color-primary-transparent) !important; } - .fc-icon { color: var(--color-text); } diff --git a/dist/js/app.js b/dist/js/app.js index b355c41..d143339 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.15.0-beta"; -const previous_commit = "616c225661687b05ab82160f5b7d6dcb4d39b8e6"; +const previous_commit = "557803555ed7a4ae4c620c0a50405db049b627df"; const BEZIAPP_UPDATE_INTERVAL = 300; // update vsakih 300 sekund if ("serviceWorker" in navigator) { diff --git a/dist/js/meals.js b/dist/js/meals.js index 514f040..2d502e8 100755 --- a/dist/js/meals.js +++ b/dist/js/meals.js @@ -27,4 +27,4 @@ document.getElementById("meal-options").innerHTML="";for(const[option_index,opti menu_option_a_el.style="waves-effect";menu_option_a_el.id="menu_index_"+option_index;if(!(meal_object.readonly)){menu_option_a_el.onclick=()=>{setMenu(meal_date,option_object.value);menu_option_a_el.className="to-be-selected-meal";let sidenav_element=document.getElementById("meal-info");let sidenav_instance=M.Sidenav.getInstance(sidenav_element);sidenav_instance.close();};} menu_option_li_el.appendChild(menu_option_a_el);document.getElementById("meal-options").appendChild(menu_option_li_el);} let sidenav_element=document.getElementById("meal-info");let sidenav_instance=M.Sidenav.getInstance(sidenav_element);sidenav_instance.open();} -document.addEventListener("DOMContentLoaded",async()=>{checkLogin();var calendarEl=document.getElementById("meals-calendar");meals_calendar_obj=new FullCalendar.Calendar(calendarEl,{firstDay:1,plugins:["dayGrid"],defaultDate:getDateString(),navLinks:false,editable:false,events:[],eventClick:mealClickHandler,height:"parent"});meals_calendar_obj.render();setupEventListeners();$("#refresh-icon").click(function(){refreshMeals();});const menus=document.querySelectorAll('.side-menu');M.Sidenav.init(menus,{edge:'right',draggable:true});const modals=document.querySelectorAll('.side-modal');M.Sidenav.init(modals,{edge:'left',draggable:false});var elemsx=document.querySelectorAll('select');M.FormSelect.init(elemsx);var datepickerelems=document.querySelectorAll('.datepicker');var today=new Date();M.Datepicker.init(datepickerelems,{firstDay:1,minDate:today,showDaysInNextAndPreviousMonths:true,showClearBtn:true,format:"dddd, dd. mmmm yyyy"});refreshMeals();}); \ No newline at end of file +document.addEventListener("DOMContentLoaded",async()=>{checkLogin();var calendarEl=document.getElementById("meals-calendar");meals_calendar_obj=new FullCalendar.Calendar(calendarEl,{firstDay:1,plugins:["dayGrid"],defaultDate:getDateString(),navLinks:false,editable:false,events:[],eventClick:mealClickHandler,height:"parent"});meals_calendar_obj.render();setupEventListeners();$("#refresh-icon").click(function(){refreshMeals();});const menus=document.querySelectorAll('.side-menu');M.Sidenav.init(menus,{edge:'right',draggable:true});const modals=document.querySelectorAll('.side-modal');M.Sidenav.init(modals,{edge:'left',draggable:false});document.getElementsByClassName("fc-today-button")[0].style="display:none !important";var elemsx=document.querySelectorAll('select');M.FormSelect.init(elemsx);var datepickerelems=document.querySelectorAll('.datepicker');var today=new Date();M.Datepicker.init(datepickerelems,{firstDay:1,minDate:today,showDaysInNextAndPreviousMonths:true,showClearBtn:true,format:"dddd, dd. mmmm yyyy"});refreshMeals();}); \ No newline at end of file diff --git a/dist/pages/about.html b/dist/pages/about.html index bfba41d..85721e8 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -160,7 +160,7 @@

- ^HEAD 616c225661687b05ab82160f5b7d6dcb4d39b8e6 + ^HEAD 557803555ed7a4ae4c620c0a50405db049b627df

diff --git a/dist/sw.js b/dist/sw.js index 4efc71c..6d97ea1 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.15.0-beta-616c225"; -// commit before the latest is 616c225661687b05ab82160f5b7d6dcb4d39b8e6 +const static_cache_name = "site-static-1.0.15.0-beta-5578035"; +// commit before the latest is 557803555ed7a4ae4c620c0a50405db049b627df // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3