diff --git a/src/content/mytinytodo.js b/src/content/mytinytodo.js index 3008d8f..324834a 100644 --- a/src/content/mytinytodo.js +++ b/src/content/mytinytodo.js @@ -170,7 +170,7 @@ var mytinytodo = window.mytinytodo = _mtt = { if(this.options.showdate) $('#page_tasks').addClass('show-inline-date'); // handlers - $('.mtt-tabs-add-button').click(function(){ + $('.mtt-tabs-new-button').click(function(){ addList(); }); @@ -519,7 +519,7 @@ var mytinytodo = window.mytinytodo = _mtt = { $("#lists ul").sortable({ delay: 150, update: listOrderChanged, - items: '> :not(.mtt-tabs-alltasks)', + items: '> :not(#list_all)', forcePlaceholderSize : true, placeholder: 'mtt-tab mtt-tab-sort-placeholder', cursor: 'grabbing' @@ -760,7 +760,7 @@ var mytinytodo = window.mytinytodo = _mtt = { } _mtt.options.openList = 0; - $('#lists .mtt-tabs-selected').removeClass('mtt-tabs-selected'); + $('#lists .mtt-tab-selected').removeClass('mtt-tab-selected'); $('#mtt_body').addClass('no-list-selected'); $('#lists ul').html(ti); $('#lists').show(); @@ -979,7 +979,7 @@ function renameCurList() var item = json.list[0]; curList = item; tabLists.replace(item); - $('#lists ul>.mtt-tabs-selected>a').attr('title', item.name).find('span').html(item.name); //FIXME: wft? + $('#lists ul>.mtt-tab-selected>a').attr('title', item.name).find('span').html(item.name); //FIXME: wft? mytinytodo.doAction('listRenamed', item); }); }); @@ -1055,10 +1055,10 @@ function prepareListHtml(list) { var opentag = ''; if (list.id == -1) { - opentag = '
  • '; + opentag = '
  • '; } else { - opentag = '
  • '; + opentag = '
  • '; } return opentag + '' + list.name + '' + @@ -1433,14 +1433,14 @@ function tabSelect(elementOrId) var prevList = curList; curList = tabLists.get(id); - $('#lists .mtt-tabs-selected').removeClass('mtt-tabs-selected'); + $('#lists .mtt-tab-selected').removeClass('mtt-tab-selected'); if(id == -1) { - $('#list_all').addClass('mtt-tabs-selected').removeClass('mtt-tabs-hidden'); + $('#list_all').addClass('mtt-tab-selected').removeClass('mtt-tab-hidden'); $('#listmenucontainer .mtt-need-real-list').addClass('mtt-item-hidden'); } else { - $('#list_'+id).addClass('mtt-tabs-selected').removeClass('mtt-tabs-hidden'); + $('#list_'+id).addClass('mtt-tab-selected').removeClass('mtt-tab-hidden'); $('#listmenucontainer .mtt-need-real-list').removeClass('mtt-item-hidden'); } @@ -2403,10 +2403,10 @@ function hideList(listId) } if(listId == -1) { - $('#list_all').addClass('mtt-tabs-hidden').removeClass('mtt-tabs-selected'); + $('#list_all').addClass('mtt-tab-hidden').removeClass('mtt-tab-selected'); } else { - $('#list_'+listId).addClass('mtt-tabs-hidden').removeClass('mtt-tabs-selected'); + $('#list_'+listId).addClass('mtt-tab-hidden').removeClass('mtt-tab-selected'); } tabLists.get(listId).hidden = true; diff --git a/src/content/theme/print.css b/src/content/theme/print.css index aca576d..3fbaadc 100644 --- a/src/content/theme/print.css +++ b/src/content/theme/print.css @@ -8,12 +8,12 @@ .topblock { display:none; } .mtt-tab { display:none; } - .mtt-tab.mtt-tabs-selected { display:block; border:none; background:none; margin:0; } - .mtt-tab.mtt-tabs-selected a { padding:0; display:inline-block; height:auto; } - .mtt-tab.mtt-tabs-selected .list-action { display:none; } + .mtt-tab.mtt-tab-selected { display:block; border:none; background:none; margin:0; } + .mtt-tab.mtt-tab-selected a { padding:0; display:inline-block; height:auto; } + .mtt-tab.mtt-tab-selected .list-action { display:none; } .mtt-tab a span { text-align:left; padding:0; max-width:none; font-size:1.3rem; color:#000; } - .mtt-tabs-add-button { display:none; } + .mtt-tabs-new-button { display:none; } #tabs_buttons { display:none; } #taskview { padding-left:0; font-weight:normal; } #taskview .arrdown { display:none; } diff --git a/src/content/theme/style.css b/src/content/theme/style.css index 1567d7a..85d4b6c 100644 --- a/src/content/theme/style.css +++ b/src/content/theme/style.css @@ -248,12 +248,12 @@ a { color: var(--color-link); cursor:pointer; text-decoration:underline; } .mtt-tab .mtt-img-button.mtt-menu-button-active > span { background-color: var(--color-btn-tab-hover); } -.mtt-tab.mtt-tabs-selected .list-action { display:block; } -.mtt-tab.mtt-tabs-selected { border-color: var(--color-tab-selected); background-color: var(--color-tab-selected); } -.mtt-tab:not(.mtt-tabs-selected):hover { background-color: var(--color-tab-hover); } -.mtt-tab.mtt-tabs-selected a { color: var(--color-text-default); } +.mtt-tab.mtt-tab-selected .list-action { display:block; } +.mtt-tab.mtt-tab-selected { border-color: var(--color-tab-selected); background-color: var(--color-tab-selected); } +.mtt-tab:not(.mtt-tab-selected):hover { background-color: var(--color-tab-hover); } +.mtt-tab.mtt-tab-selected a { color: var(--color-text-default); } -.mtt-tabs-hidden { display:none; } +.mtt-tab-hidden { display:none; } .mtt-tab-sort-placeholder { background-color: var(--color-placeholder); border-color: var(--color-placeholder-border); @@ -265,18 +265,18 @@ a { color: var(--color-link); cursor:pointer; text-decoration:underline; } margin-top:1px; } -.mtt-tabs-add-button { display:inline-block; margin-top:1px; border:1px solid var(--color-tab-border); border-bottom:none; border-top-right-radius: 8px; +.mtt-tabs-new-button { display:inline-block; margin-top:1px; border:1px solid var(--color-tab-border); border-bottom:none; border-top-right-radius: 8px; background-color: var(--color-tab); padding-left:3px; padding-right:3px; } -.mtt-tabs-add-button span { +.mtt-tabs-new-button span { display:block; width:16px; height:16px; mask: url(images/plus.svg) no-repeat; -webkit-mask: url(images/plus.svg) no-repeat; background-color: var(--color-tab-text); } -.mtt-tabs-add-button:hover { cursor:pointer; background-color: var(--color-tab-hover); } -#mtt_body.readonly .mtt-tabs-add-button { display:none; } +.mtt-tabs-new-button:hover { cursor:pointer; background-color: var(--color-tab-hover); } +#mtt_body.readonly .mtt-tabs-new-button { display:none; } .mtt-tabs-select-button > span { mask: url(images/selectlist2.svg) no-repeat; -webkit-mask: url(images/selectlist2.svg) no-repeat; @@ -934,11 +934,11 @@ li.mtt-item-hidden { display:none; } .mtt-menu-button { padding:4px; } h3.page-title a.mtt-back-button { width:2rem; } - .mtt-tabs-add-button { padding-left:0.4rem; padding-right:0.4rem; } /* make thiсker */ + .mtt-tabs-new-button { padding-left:0.4rem; padding-right:0.4rem; } /* make thiсker */ /* singletab */ - .mtt-tabs li { display:none; } - .mtt-tabs li.mtt-tabs-selected { display:block; } + li.mtt-tab { display:none; } + li.mtt-tab.mtt-tab-selected { display:block; } #task { padding:5px; padding-right:18px; margin-left:-22px; } #task_placeholder span { padding:6px; } diff --git a/src/content/theme/style_rtl.css b/src/content/theme/style_rtl.css index aad8162..6b1fb0e 100644 --- a/src/content/theme/style_rtl.css +++ b/src/content/theme/style_rtl.css @@ -1,9 +1,8 @@ body { direction:rtl; } h2 { padding-left:10px; padding-right:0px; } #loading { margin-left:6px; margin-right:0px; } -.mtt-tabs li { margin-left:3px; margin-right:0px; } -.mtt-tab { border-top-right-radius:0px; border-top-left-radius:8px; } -.mtt-tabs-add-button { border-top-right-radius:0px; border-top-left-radius:8px; } +.mtt-tab { margin-left:3px; margin-right:0px; border-top-right-radius:0px; border-top-left-radius:8px; } +.mtt-tabs-new-button { border-top-right-radius:0px; border-top-left-radius:8px; } .mtt-tabs-select-button>span { transform:rotateY(180deg); } #task { padding-left:20px; padding-right:4px; } diff --git a/src/includes/theme.php b/src/includes/theme.php index e696191..7156233 100644 --- a/src/includes/theme.php +++ b/src/includes/theme.php @@ -65,7 +65,7 @@ $().ready(function(){
      -
      +