oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Nav close button alignment and nav boxes improved

Browse source
This commit is contained in:
Simounet 2017-12-28 22:54:42 +01:00 • committed by Nicolas Lœuillet
parent 63771b9ae3
commit 2831e77cce
8 changed files with 71 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

58
app/Resources/static/themes/material/css/nav.scss
View file

@ -2,8 +2,7 @@
/* ==========================================================================
Nav
========================================================================== */
nav,
.nav-wrapper {
nav {
height: auto;
line-height: initial;
}
@ -18,25 +17,25 @@ nav {
}
}
.nav-wrapper {
.nav-panel-item .button-collapse {
margin-left: 0;
margin-right: 0.5rem;
padding: 0 0.5rem;
height: auto;
line-height: 1;
background-color: transparent;
border: none;
}
.nav-panel-item {
display: flex;
padding: 0.6rem 0.4rem 0.6rem 0.75rem;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
.button-collapse {
margin-left: 0;
margin-right: 0.5rem;
padding: 0 0.5rem;
height: auto;
line-height: 1;
background-color: transparent;
border: none;
}
}
nav .nav-wrapper i {
.nav-panel-item .material-icons {
height: 46px;
line-height: 46px;
}
@ -51,8 +50,8 @@ nav .nav-wrapper i {
justify-content: flex-end;
}
.nav-panel-add .add,
.nav-panel-search .search,
.nav-panel-item .add,
.nav-panel-item .search,
.nav-panels .close {
color: #444 !important;
}
@ -68,7 +67,6 @@ nav .nav-wrapper i {
.input-field input {
display: block;
line-height: inherit;
width: calc(100% - 8rem);
height: 3rem;
}
@ -86,39 +84,32 @@ nav .nav-wrapper i {
}
.input-field {
&.nav-panel-add label,
&.nav-panel-search label {
&.nav-panel-item label {
left: 1rem;
}
&.nav-panel-add .close,
&.nav-panel-search .close {
position: absolute;
top: 0;
right: 1rem;
&.nav-panel-item .close {
color: transparent;
cursor: pointer;
font-size: 2rem;
transition: 0.3s color;
}
&.nav-panel-add,
&.nav-panel-add form,
&.nav-panel-search,
&.nav-panel-search form {
&.nav-panel-item {
display: flex;
flex: 1;
flex-wrap: nowrap;
align-items: center;
}
&.nav-panel-add form.disabled,
&.nav-panel-add form.disabled input {
&.nav-panel-add.disabled,
&.nav-panel-add.disabled input {
background-color: whitesmoke;
}
}
.nav-form-button {
padding: 0 1rem;
padding: 0;
background-color: transparent;
border: none;
@ -127,6 +118,11 @@ nav .nav-wrapper i {
}
}
.nav-form-button,
.nav-panel-item .close {
margin: 0 1%;
}
#button_filters {
display: none;
}

14
app/Resources/static/themes/material/index.js
View file

@ -42,24 +42,20 @@ $(document).ready(() => {
return false;
});
$('#nav-btn-add').on('click', () => {
$('.nav-panel-buttom').hide(100);
$('.nav-panel-actions').hide(100);
$('.nav-panel-add').show(100);
$('.nav-panels .action').hide(100);
$('.nav-panel-menu').addClass('hidden');
$('.nav-panels').css('background', 'white');
$('#entry_url').focus();
return false;
});
const materialAddForm = $('.nav-panel-add form[name=entry]');
const materialAddForm = $('.nav-panel-add');
materialAddForm.on('submit', () => {
materialAddForm.addClass('disabled');
$('input#entry_url', materialAddForm).prop('readonly', true).trigger('blur');
});
$('#nav-btn-search').on('click', () => {
$('.nav-panel-buttom').hide(100);
$('.nav-panel-actions').hide(100);
$('.nav-panel-search').show(100);
$('.nav-panels .action').hide(100);
$('.nav-panel-menu').addClass('hidden');
$('.nav-panels').css('background', 'white');
$('#search_entry_term').focus();
return false;
@ -67,9 +63,7 @@ $(document).ready(() => {
$('.close').on('click', () => {
$('.nav-panel-add').hide(100);
$('.nav-panel-search').hide(100);
$('.nav-panel-buttom').show(100);
$('.nav-panels .action').show(100);
$('.nav-panel-menu').removeClass('hidden');
$('.nav-panel-actions').show(100);
$('.nav-panels').css('background', 'transparent');
return false;
});