Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement/allow year removal #1248

Merged
merged 4 commits into from
Sep 3, 2019
Merged

Enhancement/allow year removal #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6220204
Fix actions design
skjnldsv Aug 30, 2019
88510f7
Better debug logs on parsing failure
skjnldsv Aug 30, 2019
5a1b111
Allow to toggle year
skjnldsv Aug 30, 2019
2851043
Use checkbox for omit year action
skjnldsv Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module.exports = {
'plugin:node/recommended',
'plugin:vue/essential',
'plugin:vue/recommended',
'plugin:nextcloud/recommended',
'standard'
],
settings: {
Expand Down Expand Up @@ -73,8 +74,14 @@ module.exports = {
// es6 import/export and require
'node/no-unpublished-require': ['off'],
'node/no-unsupported-features/es-syntax': ['off'],
// kebab case components for vuejs
// PascalCase components names for vuejs
// https://vuejs.org/v2/style-guide/#Single-file-component-filename-casing-strongly-recommended
'vue/component-name-in-template-casing': ['error', 'PascalCase'],
// force name
'vue/match-component-file-name': ['error', {
'extensions': ['jsx', 'vue', 'js'],
'shouldMatchCase': true
}],
// space before self-closing elements
'vue/html-closing-bracket-spacing': 'error',
// no ending html tag on a new line
Expand Down
51 changes: 25 additions & 26 deletions css/ContactDetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,43 @@
*/

#contact-details {

$grid-column-gap: 20px;
$grid-column-width: 350px;
// header
header {
height: 100px;
display: flex;
font-weight: bold;
align-items: center;
height: 100px;
font-weight: bold;

// ORG-TITLE-NAME
#contact-header-infos {
display: flex;
flex-direction: column;
flex: 1 1 auto; // shrink avatar before this one
flex-direction: column;
h2,
#details-org-container {
display: flex;
flex-wrap: wrap;
margin: 0;
}
input {
font-size: inherit;
color: #fff !important;
text-shadow: 0 0 2px var(--color-box-shadow);
background: transparent;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
border: none;
margin: 0;
padding: 4px 5px;
flex: 1 1;
min-width: 100px;
max-width: 100%;
margin: 0;
padding: 4px 5px;
white-space: nowrap;
text-overflow: ellipsis;
color: #fff !important;
border: none;
background: transparent;
text-shadow: 0 0 2px var(--color-box-shadow);
font-size: inherit;
&::placeholder {
color: #fff !important;
opacity: .8;
color: #fff !important;
}
}
#contact-org {
Expand All @@ -76,45 +77,43 @@
}
}
.header-icon {
height: 44px;
width: 44px;
height: 44px;
padding: 14px;
border-radius: 22px;
cursor: pointer;
background-size: 16px;
opacity: .7;
border-radius: 22px;
background-size: 16px;
&:hover,
&:focus {
opacity: 1;
}
&.header-icon--pulse {
margin: 8px;
width: 16px;
height: 16px;
margin: 8px;
}
}
}
}

$grid-column-gap: 20px;
$grid-column-width: 350px;

// contact details
section.contact-details {
display: grid;
min-height: 200px;
padding: 20px $grid-column-gap;
/* unquote is a strange hack to avoid removal of the comma by the scss compiler */
grid-template-columns: repeat(auto-fit, minmax(unquote('#{$grid-column-width}'), 1fr));
grid-column-gap: $grid-column-gap;
padding: 20px $grid-column-gap;
min-height: 200px;
}

// single column fix, better visual
@media only screen and (max-width: $navigation-width + $list-min-width + 2 * $grid-column-gap +$grid-column-width) {
section.contact-details {
padding: 10px;

grid-template-columns: 1fr;
grid-column-gap: 10px;
padding: 10px;
}
}
}
Expand All @@ -124,9 +123,9 @@
right: 22px;
bottom: 0;
height: 44px;
line-height: 44px;
color: var(--color-text-lighter);
opacity: .5;
color: var(--color-text-lighter);
line-height: 44px;
}

#qrcode-modal {
Expand Down
21 changes: 10 additions & 11 deletions css/ContactDetailsAvatar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,37 @@
margin-left: auto;
}
&__background {
opacity: .2;
z-index: 0;
left: 0;
top: 50px;
left: 0;
opacity: .2;
}
&__photo,
&__options {
overflow: hidden;
width: 100%;
height: 100%;
border-radius: 50%;
overflow: hidden;
}
&__photo {
z-index: 10;
background-size: cover;
cursor: pointer;
background-repeat: no-repeat;
background-position: center;
cursor: pointer;
background-size: cover;
}
&__options {
top: 0;
z-index: 2;
position: absolute;
background-color: rgba(0, 0, 0, 0.2);
z-index: 2;
top: 0;
background-color: rgba(0, 0, 0, .2);
}
.contact-avatar-options {
display: block;
width: 100%;
height: 100%;
display: block;
opacity: .5;
background-color: rgba(0, 0, 0, 0.2);
background-color: rgba(0, 0, 0, .2);
&:hover,
&:active,
&:focus {
Expand Down Expand Up @@ -103,4 +103,3 @@
}
}
}

16 changes: 8 additions & 8 deletions css/ContactsList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@

#app-details-toggle {
position: fixed;
display: inline-block;
z-index: 149;
left: 0;
display: inline-block;
width: 44px;
height: 44px;
z-index: 149;
background-color: var(--color-background-darker);
margin-top: 44px; // under the show navigation button
cursor: pointer;
opacity: 0.6;
transform: rotate(180deg);
margin-top: 44px; // under the show navigation button
opacity: .6;
background-color: var(--color-background-darker);
}


Expand All @@ -41,10 +41,10 @@
}

.vue-recycle-scroller__item-view {
// same as app-content-list-item
height: 68px;
// TODO: find better solution?
// https://github.com/Akryum/vue-virtual-scroller/issues/70
// hack to not show the transition
overflow: hidden;
}
// same as app-content-list-item
height: 68px;
}
6 changes: 3 additions & 3 deletions css/ContactsListItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
left: 0;
width: 100%;
}

&.delete-slide-left-enter,
&.delete-slide-left-leave-to {
left: 100%;
Expand All @@ -58,9 +58,9 @@
position: absolute;
top: 0;
left: 0;
height: inherit;
width: inherit;
background-size: cover;
height: inherit;
cursor: pointer;
background-size: cover;
}
}
2 changes: 1 addition & 1 deletion css/ImportScreen.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
*/

.import-screen {
margin: 50px;
width: auto;
min-width: 30vw;
margin: 50px;
&__header {
padding-top: 20px;
}
Expand Down
Loading