diff --git a/css/main.css b/css/main.css
index 0689c61..4b4da37 100644
--- a/css/main.css
+++ b/css/main.css
@@ -358,7 +358,7 @@ ul {
#search_section {
position: relative;
display: grid;
- gap: 1rem;
+ gap: 0.5rem;
padding: 4rem 0;
justify-items: center;
}
@@ -371,6 +371,7 @@ ul {
.app-name {
font-weight: 500;
margin-bottom: 1rem;
+ font-size: 0.9rem;
color: rgba(var(--text-color), 0.7);
}
@@ -396,7 +397,6 @@ ul {
gap: 0 1rem;
align-items: center;
grid-template-columns: auto 1fr auto;
- grid-template-areas: "icon title button" "icon tags button";
cursor: pointer;
padding: 1rem;
border-radius: 0.3rem;
@@ -406,20 +406,16 @@ ul {
.torrent-card .torrent-type-icon {
padding: 0.8rem;
}
-.torrent-card__icon {
- grid-area: icon;
-}
.torrent-card__icon .icon {
height: 1.4rem;
width: 1.4rem;
}
.torrent-card__title {
font-weight: 600;
- grid-area: title;
font-size: 1.1rem;
+ margin-bottom: 0.5rem;
}
.torrent-card__tags, .torrent-card__uploader {
- grid-area: tags;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@@ -438,7 +434,6 @@ ul {
font-weight: 500;
}
.torrent-card__download-button {
- grid-area: button;
justify-self: flex-end;
align-self: flex-start;
background-color: rgba(var(--text-color), 0.1);
@@ -448,6 +443,34 @@ ul {
margin-right: 0.5rem;
}
+.progress-indicator {
+ justify-self: flex-end;
+ height: 2.3rem;
+ padding: 0 0.6rem;
+}
+
+.progress-percent {
+ font-size: 0.9rem;
+ font-weight: 500;
+ min-width: 6rem;
+ color: rgba(var(--text-color), 0.8);
+}
+
+.progress-loader {
+ height: 1.2rem;
+ width: 1.2rem;
+ fill: none;
+ padding: 0.1rem;
+ stroke-width: 12;
+ overflow: visible;
+ margin-right: 0.5rem;
+ stroke-dasharray: 201;
+ stroke-dashoffset: 201;
+ transform: rotate(-90deg);
+ stroke: var(--accent-color);
+ transition: stroke-dashoffset 0.3s;
+}
+
#torrent_popup {
--width: min(56rem, 100%);
}
@@ -544,23 +567,23 @@ ul {
.torrent-card {
grid-template-columns: auto 1fr;
- grid-template-areas: "icon title" "icon tags" "icon button";
}
.torrent-card__icon {
margin: 0;
}
.torrent-card__title {
- font-size: 1rem;
+ font-size: 0.9rem;
}
.torrent-card__tags, .torrent-card__uploader {
- margin-top: 0.5rem;
font-size: 0.8rem;
}
.torrent-card__description {
display: none;
}
- .torrent-card__download-button {
+ .torrent-card__download-button,
+.torrent-card .progress-indicator {
margin-top: 1rem;
+ grid-column: 2/3;
}
#torrent_type_icon {
diff --git a/css/main.min.css b/css/main.min.css
index 90ebbe1..e865fd4 100644
--- a/css/main.min.css
+++ b/css/main.min.css
@@ -1 +1 @@
-a:any-link,button{position:relative;display:inline-flex;background:0 0;outline:0;font-weight:500}a,a:any-link{color:inherit;text-decoration:none}.hide,.ripple{pointer-events:none}.app-name,a:any-link,button{font-weight:500}*{padding:0;margin:0;box-sizing:border-box;font-family:Inter,sans-serif}:root{font-size:clamp(1rem,1.2vmax,3rem)}body,html{height:100%;scroll-behavior:smooth}body{--accent-color:#304FFE;--light-shade:rgba(var(--text-color), 0.06);--text-color:17,17,17;--text-color-light:100,100,100;--foreground-color:255,255,255;--background-color:#F6f6f6;--error-color:red;--green:#00843b;color:rgba(var(--text-color),1);background:var(--background-color)}body[data-theme=dark]{--green:#13ff5a;--text-color:240,240,240;--text-color-light:170,170,170;--foreground-color:20,20,20;--background-color:#0a0a0a;--error-color:rgb(255, 106, 106)}.full-bleed{grid-column:1/4}.h1{font-size:2.5rem}.h2{font-size:2rem}.h3{font-size:1.4rem}.h4{font-size:1rem}.h5{font-size:.8rem}.uppercase{text-transform:uppercase}.capitalize{text-transform:capitalize}p{font-size:.8;max-width:60ch;line-height:1.5;color:rgba(var(--text-color),.8)}img{object-fit:cover}a:focus-visible{box-shadow:0 0 0 .1rem rgba(var(--text-color),1) inset}button{overflow:hidden;align-items:center;cursor:pointer;color:inherit;font-size:.9rem;border-radius:.2rem;padding:.5rem .6rem;-webkit-tap-highlight-color:transparent;border:none}.torrent-card,a:any-link{cursor:pointer;border-radius:.3rem;-webkit-tap-highlight-color:transparent}button:focus-visible{outline:solid rgba(var(--text-color),1)}a:any-link{align-items:center;font-size:.8rem;padding:.4rem .6rem;align-self:flex-start;border:1px solid}a:any-link:focus-visible{outline:solid rgba(var(--text-color),1)}sm-button{--border-radius:0.3rem}ul{list-style:none}.hide{opacity:0}.hide-completely{display:none!important}.no-transformations{transform:none!important}.overflow-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.breakable{overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.flex{display:flex}.grid{display:grid}.flow-column{grid-auto-flow:column}.gap-0-5{gap:.5rem}.gap-1{gap:1rem}.gap-1-5{gap:1.5rem}.gap-2{gap:2rem}.gap-3{gap:3rem}.text-align-right{text-align:right}.align-start{align-items:flex-start}.align-center{align-items:center}.text-center{text-align:center}.justify-start{justify-content:start}.justify-center{justify-content:center}.justify-right{margin-left:auto}.align-self-center{align-self:center}.justify-self-center{justify-self:center}.justify-self-start{justify-self:start}.direction-column{flex-direction:column}.space-between{justify-content:space-between}.ripple{position:absolute;border-radius:50%;transform:scale(0);background:rgba(var(--text-color),.16)}.interact{position:relative;overflow:hidden;cursor:pointer;-webkit-tap-highlight-color:transparent}.observe-empty-state:empty{display:none}.observe-empty-state:not(:empty)~.empty-state{display:none}.icon{width:1.5rem;height:1.5rem;fill:rgba(var(--text-color),.9)}.page-layout{position:relative;display:grid;grid-template-columns:1rem 1fr 1rem}.page-layout>*{grid-column:2/3}.popup__header{display:grid;gap:.5rem;width:100%;padding:1rem 1.5rem;align-items:center;grid-template-columns:auto 1fr}.popup__header__close{padding:.5rem;cursor:pointer}#error_page,#loading_page{position:relative;display:grid;height:100%;place-content:center;justify-items:center}#main_header{position:relative;display:flex;padding:1rem;align-items:center;justify-content:space-between;grid-template-columns:repeat(3,1fr)}#main_header__logo{height:1.8rem;width:1.8rem}.theme-switcher{position:relative;justify-self:flex-end;width:1.5rem;height:1.5rem;cursor:pointer;-webkit-tap-highlight-color:transparent}.theme-switcher .icon{position:absolute;transition:transform .6s}.theme-switcher__checkbox{display:none}.theme-switcher__checkbox:checked~.moon-icon{transform:scale(0) rotate(90deg)}.theme-switcher__checkbox:not(:checked)~.sun-icon{transform:scale(0) rotate(-90deg)}#search_section{position:relative;display:grid;gap:1rem;padding:4rem 0;justify-items:center}.app-icon{height:3rem;width:3rem}.app-name{margin-bottom:1rem;color:rgba(var(--text-color),.7)}#search_torrent{width:min(28rem,100%);--border-radius:2rem;--background:rgba(var(--text-color), 0.06)}#search_torrent .icon{height:1.2rem;fill:rgba(var(--text-color),.7)}#torrent_container{padding:1.5rem 0;display:grid;gap:.5rem;padding-bottom:4rem}.torrent-card{display:grid;gap:0 1rem;align-items:center;grid-template-columns:auto 1fr auto;grid-template-areas:"icon title button" "icon tags button";padding:1rem;background-color:rgba(var(--text-color),.06)}.torrent-card .torrent-type-icon{padding:.8rem}.torrent-card__icon{grid-area:icon}.torrent-card__icon .icon{height:1.4rem;width:1.4rem}.torrent-card__title{font-weight:600;grid-area:title;font-size:1.1rem}.torrent-card__tags,.torrent-card__uploader{grid-area:tags;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:.85rem;color:rgba(var(--text-color),.7)}.torrent-card__description{font-size:.9rem;overflow:hidden;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;color:rgba(var(--text-color),.8)}.torrent-card__size{font-weight:500}.torrent-card__download-button{grid-area:button;justify-self:flex-end;align-self:flex-start;background-color:rgba(var(--text-color),.1)}.torrent-card__download-button .icon{height:1.4rem;margin-right:.5rem}#torrent_popup{--width:min(56rem, 100%)}.torrent-preview{display:grid}.torrent-preview__info-section{display:flex;flex-direction:column;align-content:flex-start}.torrent-type-icon{display:flex;padding:1rem;border-radius:50%;align-items:center;justify-content:center;align-self:flex-start;aspect-ratio:1/1;flex-shrink:0;background-color:var(--accent-color)}#main_footer,#torrent_type_icon{background-color:rgba(var(--text-color),.06)}.torrent-type-icon .icon{fill:#fff}#torrent_type_icon{align-self:center;justify-self:center;padding:2rem}#torrent_type_icon .icon{height:3rem;width:3rem;fill:rgba(var(--text-color),.3)}#torrent_tags,#torrent_uploader{display:flex;width:100%;font-size:.85rem;margin-bottom:.3rem;color:rgba(var(--text-color),.8)}#torrent_name{font-size:1.5rem;margin-bottom:1rem}#torrent__description{font-size:.9rem;color:rgba(var(--text-color),.8)}#torrent_uploader{font-weight:500;line-height:1.7;margin-top:1rem;width:auto;border-radius:1.5rem;padding:.3rem .8rem;align-self:flex-start;background-color:rgba(var(--text-color),.1)}#torrent_download_button{color:#fff;width:100%;flex-shrink:0;padding:.7rem;margin-top:2rem;justify-content:center;background-color:var(--accent-color)}#torrent_download_button .icon{fill:#fff}#main_footer{padding:3rem 0}@media only screen and (max-width:640px){.popup__header{padding:0 1.5rem 0 .5rem}.torrent-card{grid-template-columns:auto 1fr;grid-template-areas:"icon title" "icon tags" "icon button"}.torrent-card__icon{margin:0}.torrent-card__title{font-size:1rem}.torrent-card__tags,.torrent-card__uploader{margin-top:.5rem;font-size:.8rem}.torrent-card__description{display:none}.torrent-card__download-button{margin-top:1rem}#torrent_type_icon{margin-bottom:3rem}#torrent_tags{font-size:.8rem}}@media only screen and (min-width:640px){.popup__header{padding:1.5rem 1.5rem 0}.page-layout{grid-template-columns:1fr 90vw 1fr}#main_header,.torrent-card{padding:1.5rem}#torrent_popup{--min-height:80vh}.torrent-preview{gap:3rem;grid-template-columns:22rem 1fr}}@media only screen and (min-width:1280px){.page-layout{grid-template-columns:1fr 80vw 1fr}.multi-form{grid-template-columns:1fr 1fr}}@media (any-hover:hover){::-webkit-scrollbar{width:.5rem;height:.5rem}::-webkit-scrollbar-thumb{background:rgba(var(--text-color),.3);border-radius:1rem}::-webkit-scrollbar-thumb:hover{background:rgba(var(--text-color),.5)}}
\ No newline at end of file
+a:any-link,button{position:relative;display:inline-flex;background:0 0;outline:0}a,a:any-link{color:inherit;text-decoration:none}.hide,.ripple{pointer-events:none}.interact,.theme-switcher,.torrent-card,a:any-link,button{cursor:pointer;-webkit-tap-highlight-color:transparent}*{padding:0;margin:0;box-sizing:border-box;font-family:Inter,sans-serif}:root{font-size:clamp(1rem,1.2vmax,3rem)}body,html{height:100%;scroll-behavior:smooth}body{--accent-color:#304FFE;--light-shade:rgba(var(--text-color), 0.06);--text-color:17,17,17;--text-color-light:100,100,100;--foreground-color:255,255,255;--background-color:#F6f6f6;--error-color:red;--green:#00843b;color:rgba(var(--text-color),1);background:var(--background-color)}body[data-theme=dark]{--green:#13ff5a;--text-color:240,240,240;--text-color-light:170,170,170;--foreground-color:20,20,20;--background-color:#0a0a0a;--error-color:rgb(255, 106, 106)}.full-bleed{grid-column:1/4}.h1{font-size:2.5rem}.h2{font-size:2rem}.h3{font-size:1.4rem}.h4{font-size:1rem}.h5{font-size:.8rem}.uppercase{text-transform:uppercase}.capitalize{text-transform:capitalize}p{font-size:.8;max-width:60ch;line-height:1.5;color:rgba(var(--text-color),.8)}.app-name,button{font-weight:500;font-size:.9rem}img{object-fit:cover}a:focus-visible{box-shadow:0 0 0 .1rem rgba(var(--text-color),1) inset}button{overflow:hidden;align-items:center;color:inherit;border-radius:.2rem;padding:.5rem .6rem;border:none}button:focus-visible{outline:solid rgba(var(--text-color),1)}a:any-link{align-items:center;font-weight:500;font-size:.8rem;border-radius:.3rem;padding:.4rem .6rem;align-self:flex-start;border:1px solid}a:any-link:focus-visible{outline:solid rgba(var(--text-color),1)}sm-button{--border-radius:0.3rem}ul{list-style:none}.hide{opacity:0}.hide-completely{display:none!important}.no-transformations{transform:none!important}.overflow-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.breakable{overflow-wrap:break-word;word-wrap:break-word;-ms-word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.flex{display:flex}.grid{display:grid}.flow-column{grid-auto-flow:column}.gap-0-5{gap:.5rem}.gap-1{gap:1rem}.gap-1-5{gap:1.5rem}.gap-2{gap:2rem}.gap-3{gap:3rem}.text-align-right{text-align:right}.align-start{align-items:flex-start}.align-center{align-items:center}.text-center{text-align:center}.justify-start{justify-content:start}.justify-center{justify-content:center}.justify-right{margin-left:auto}.align-self-center{align-self:center}.justify-self-center{justify-self:center}.justify-self-start{justify-self:start}.direction-column{flex-direction:column}.space-between{justify-content:space-between}.ripple{position:absolute;border-radius:50%;transform:scale(0);background:rgba(var(--text-color),.16)}.interact{position:relative;overflow:hidden}.observe-empty-state:empty{display:none}.observe-empty-state:not(:empty)~.empty-state{display:none}.icon{width:1.5rem;height:1.5rem;fill:rgba(var(--text-color),.9)}.page-layout{position:relative;display:grid;grid-template-columns:1rem 1fr 1rem}.page-layout>*{grid-column:2/3}.popup__header{display:grid;gap:.5rem;width:100%;padding:1rem 1.5rem;align-items:center;grid-template-columns:auto 1fr}.popup__header__close{padding:.5rem;cursor:pointer}#error_page,#loading_page{position:relative;display:grid;height:100%;place-content:center;justify-items:center}#main_header{position:relative;display:flex;padding:1rem;align-items:center;justify-content:space-between;grid-template-columns:repeat(3,1fr)}#main_header__logo{height:1.8rem;width:1.8rem}.theme-switcher{position:relative;justify-self:flex-end;width:1.5rem;height:1.5rem}.theme-switcher .icon{position:absolute;transition:transform .6s}.theme-switcher__checkbox{display:none}.theme-switcher__checkbox:checked~.moon-icon{transform:scale(0) rotate(90deg)}.theme-switcher__checkbox:not(:checked)~.sun-icon{transform:scale(0) rotate(-90deg)}#search_section{position:relative;display:grid;gap:.5rem;padding:4rem 0;justify-items:center}.app-icon{height:3rem;width:3rem}.app-name{margin-bottom:1rem;color:rgba(var(--text-color),.7)}#search_torrent{width:min(28rem,100%);--border-radius:2rem;--background:rgba(var(--text-color), 0.06)}#search_torrent .icon{height:1.2rem;fill:rgba(var(--text-color),.7)}#torrent_container{padding:1.5rem 0;display:grid;gap:.5rem;padding-bottom:4rem}.torrent-card{display:grid;gap:0 1rem;align-items:center;grid-template-columns:auto 1fr auto;padding:1rem;border-radius:.3rem;background-color:rgba(var(--text-color),.06)}.torrent-card .torrent-type-icon{padding:.8rem}.torrent-card__icon .icon{height:1.4rem;width:1.4rem}.torrent-card__title{font-weight:600;font-size:1.1rem;margin-bottom:.5rem}.torrent-card__tags,.torrent-card__uploader{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-size:.85rem;color:rgba(var(--text-color),.7)}#torrent__description,#torrent_tags,#torrent_uploader,.progress-percent,.torrent-card__description{color:rgba(var(--text-color),.8)}.torrent-card__description{font-size:.9rem;overflow:hidden;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical}.torrent-card__size{font-weight:500}.torrent-card__download-button{justify-self:flex-end;align-self:flex-start;background-color:rgba(var(--text-color),.1)}.torrent-card__download-button .icon{height:1.4rem;margin-right:.5rem}.progress-indicator{justify-self:flex-end;height:2.3rem;padding:0 .6rem}.progress-percent{font-size:.9rem;font-weight:500;min-width:6rem}.progress-loader{height:1.2rem;width:1.2rem;fill:none;padding:.1rem;stroke-width:12;overflow:visible;margin-right:.5rem;stroke-dasharray:201;stroke-dashoffset:201;transform:rotate(-90deg);stroke:var(--accent-color);transition:stroke-dashoffset .3s}#torrent_popup{--width:min(56rem, 100%)}.torrent-preview{display:grid}.torrent-preview__info-section{display:flex;flex-direction:column;align-content:flex-start}.torrent-type-icon{display:flex;padding:1rem;border-radius:50%;align-items:center;justify-content:center;align-self:flex-start;aspect-ratio:1/1;flex-shrink:0;background-color:var(--accent-color)}#main_footer,#torrent_type_icon{background-color:rgba(var(--text-color),.06)}.torrent-type-icon .icon{fill:#fff}#torrent_type_icon{align-self:center;justify-self:center;padding:2rem}#torrent_type_icon .icon{height:3rem;width:3rem;fill:rgba(var(--text-color),.3)}#torrent_tags,#torrent_uploader{display:flex;width:100%;font-size:.85rem;margin-bottom:.3rem}#torrent_name{font-size:1.5rem;margin-bottom:1rem}#torrent__description{font-size:.9rem}#torrent_uploader{font-weight:500;line-height:1.7;margin-top:1rem;width:auto;border-radius:1.5rem;padding:.3rem .8rem;align-self:flex-start;background-color:rgba(var(--text-color),.1)}#torrent_download_button{color:#fff;width:100%;flex-shrink:0;padding:.7rem;margin-top:2rem;justify-content:center;background-color:var(--accent-color)}#torrent_download_button .icon{fill:#fff}#main_footer{padding:3rem 0}@media only screen and (max-width:640px){.popup__header{padding:0 1.5rem 0 .5rem}.torrent-card{grid-template-columns:auto 1fr}.torrent-card__icon{margin:0}.torrent-card__title{font-size:.9rem}#torrent_tags,.torrent-card__tags,.torrent-card__uploader{font-size:.8rem}.torrent-card__description{display:none}.torrent-card .progress-indicator,.torrent-card__download-button{margin-top:1rem;grid-column:2/3}#torrent_type_icon{margin-bottom:3rem}}@media only screen and (min-width:640px){.popup__header{padding:1.5rem 1.5rem 0}.page-layout{grid-template-columns:1fr 90vw 1fr}#main_header,.torrent-card{padding:1.5rem}#torrent_popup{--min-height:80vh}.torrent-preview{gap:3rem;grid-template-columns:22rem 1fr}}@media only screen and (min-width:1280px){.page-layout{grid-template-columns:1fr 80vw 1fr}.multi-form{grid-template-columns:1fr 1fr}}@media (any-hover:hover){::-webkit-scrollbar{width:.5rem;height:.5rem}::-webkit-scrollbar-thumb{background:rgba(var(--text-color),.3);border-radius:1rem}::-webkit-scrollbar-thumb:hover{background:rgba(var(--text-color),.5)}}
\ No newline at end of file
diff --git a/css/main.scss b/css/main.scss
index 4c08040..809f3cd 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -307,7 +307,7 @@ ul{
#search_section{
position: relative;
display: grid;
- gap: 1rem;
+ gap: 0.5rem;
padding: 4rem 0;
justify-items: center;
}
@@ -318,6 +318,7 @@ ul{
.app-name{
font-weight: 500;
margin-bottom: 1rem;
+ font-size: 0.9rem;
color: rgba(var(--text-color), 0.7);
}
#search_torrent{
@@ -342,7 +343,6 @@ ul{
gap: 0 1rem;
align-items: center;
grid-template-columns: auto 1fr auto;
- grid-template-areas: 'icon title button' 'icon tags button';
cursor: pointer;
padding: 1rem;
border-radius: 0.3rem;
@@ -352,7 +352,6 @@ ul{
padding: 0.8rem;
}
&__icon{
- grid-area: icon;
.icon{
height: 1.4rem;
width: 1.4rem;
@@ -360,12 +359,11 @@ ul{
}
&__title{
font-weight: 600;
- grid-area: title;
font-size: 1.1rem;
+ margin-bottom: 0.5rem;
}
&__tags,
&__uploader{
- grid-area: tags;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@@ -384,7 +382,6 @@ ul{
font-weight: 500;
}
&__download-button{
- grid-area: button;
justify-self: flex-end;
align-self: flex-start;
background-color: rgba(var(--text-color), 0.1);
@@ -394,6 +391,31 @@ ul{
}
}
}
+.progress-indicator{
+ justify-self: flex-end;
+ height: 2.3rem;
+ padding: 0 0.6rem;
+}
+.progress-percent{
+ font-size: 0.9rem;
+ font-weight: 500;
+ min-width: 6rem;
+ color: rgba(var(--text-color), 0.8);
+}
+.progress-loader{
+ height: 1.2rem;
+ width: 1.2rem;
+ fill: none;
+ padding: 0.1rem;
+ stroke-width: 12;
+ overflow: visible;
+ margin-right: 0.5rem;
+ stroke-dasharray: 201;
+ stroke-dashoffset: 201;
+ transform: rotate(-90deg);
+ stroke: var(--accent-color);
+ transition: stroke-dashoffset 0.3s;
+}
#torrent_popup{
--width: min(56rem, 100%);
}
@@ -478,23 +500,23 @@ ul{
}
.torrent-card{
grid-template-columns: auto 1fr;
- grid-template-areas: 'icon title' 'icon tags' 'icon button';
&__icon{
margin: 0;
}
&__title{
- font-size: 1rem;
+ font-size: 0.9rem;
}
&__tags,
&__uploader{
- margin-top: 0.5rem;
font-size: 0.8rem;
}
&__description{
display: none;
}
- &__download-button{
+ &__download-button,
+ .progress-indicator{
margin-top: 1rem;
+ grid-column: 2/3;
}
}
#torrent_type_icon{
diff --git a/index.html b/index.html
index 4b96e16..baba44f 100644
--- a/index.html
+++ b/index.html
@@ -56,15 +56,15 @@
-
-
+
+
-
+
@@ -75,11 +75,10 @@
-
-
-
-
-
+
+
+
+