[common] Edit styles

This commit is contained in:
SergeyEzhin 2021-11-11 01:18:55 +04:00
parent e05f5216d1
commit 9ee2d88654
9 changed files with 64 additions and 50 deletions

View file

@ -1,4 +1,4 @@
@text-normal: #000; @text-normal: var(--text-normal);
// @common-image-about-path - defined in webpack config // @common-image-about-path - defined in webpack config
.about { .about {
@ -21,6 +21,7 @@
h3 { h3 {
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
color: @text-normal;
&.vendor { &.vendor {
color: @text-normal; color: @text-normal;
@ -30,6 +31,7 @@
} }
p > label { p > label {
color: @text-normal;
margin-right: 5px; margin-right: 5px;
} }

View file

@ -1,8 +1,8 @@
.page.page-users { .page.page-users {
background-color: @white; // background-color: @white;
.block-title { .block-title {
text-transform: none; text-transform: none;
color: @black; // color: @black;
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
font-size: 17px; font-size: 17px;
@ -15,7 +15,7 @@
text-align: center; text-align: center;
border-radius: 50px; border-radius: 50px;
line-height: 40px; line-height: 40px;
color: @white; color: @fill-white;
font-size: 18px; font-size: 18px;
} }
} }

View file

@ -12,6 +12,7 @@
--text-tertiary: fade(#FFF, 40%); --text-tertiary: fade(#FFF, 40%);
--text-link: #1976D2; --text-link: #1976D2;
--text-error: #FF453A; --text-error: #FF453A;
--text-on-brand: #000;
--fill-black: #000; --fill-black: #000;
--fill-white: #FFF; --fill-white: #FFF;

View file

@ -17,6 +17,7 @@
--text-tertiary: fade(#000, 40%); --text-tertiary: fade(#000, 40%);
--text-link: #007AFF; --text-link: #007AFF;
--text-error: #FF3B30; --text-error: #FF3B30;
--text-on-brand: #fff;
--fill-black: #000; --fill-black: #000;
--fill-white: #FFF; --fill-white: #FFF;

View file

@ -36,7 +36,7 @@
} }
.wrap-textarea { .wrap-textarea {
textarea { textarea {
color: @black; color: @fill-black;
width: 100%; width: 100%;
} }
} }
@ -75,14 +75,14 @@
.user-name { .user-name {
font-size: 16px; font-size: 16px;
line-height: 22px; line-height: 22px;
color: @black; color: @text-normal;
margin: 0; margin: 0;
font-weight: 700; font-weight: 700;
} }
.comment-date, .reply-date { .comment-date, .reply-date {
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
color: @comment-date; color: @text-secondary;
margin: 0; margin: 0;
} }
.comment-quote { .comment-quote {
@ -94,7 +94,7 @@
font-size: 14px; font-size: 14px;
} }
.comment-text, .reply-text { .comment-text, .reply-text {
color: @black; color: @text-normal;
font-size: 14px; font-size: 14px;
line-height: 25px; line-height: 25px;
margin: 0; margin: 0;
@ -130,11 +130,13 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
height: 40px; height: 40px;
background-color: @background-primary;
.icon-swipe { .icon-swipe {
margin-top: 8px; margin-top: 8px;
width: 40px; width: 40px;
height: 4px; height: 4px;
background: @swipe-icon; // background: @swipe-icon;
background: @background-menu-divider;
border-radius: 2px; border-radius: 2px;
} }
} }
@ -143,7 +145,7 @@
#view-comment-popover, #view-comment-sheet { #view-comment-popover, #view-comment-sheet {
.toolbar { .toolbar {
position: fixed; position: fixed;
background-color: @white; background-color: @background-primary;
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14); box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2), 0px 4px 5px rgba(0, 0, 0, 0.12), 0px 2px 4px rgba(0, 0, 0, 0.14);
.link { .link {
--f7-toolbar-link-color: @brandColor; --f7-toolbar-link-color: @brandColor;
@ -168,7 +170,7 @@
} }
#view-comment-popover { #view-comment-popover {
background-color: @white; background-color: @background-primary;
.pages { .pages {
position: absolute; position: absolute;
} }
@ -197,7 +199,8 @@
.page-current-comment { .page-current-comment {
position: relative; position: relative;
.page-content { .page-content {
background-color: @white; // background-color: @fill-white;
background-color: @background-primary;
} }
.comment-list { .comment-list {
ul { ul {
@ -227,7 +230,7 @@
.no-comments { .no-comments {
text-align: center; text-align: center;
margin-top: 35px; margin-top: 35px;
color: var(--text-normal); color: @text-normal;
} }
.actions-modal.modal-in { .actions-modal.modal-in {

View file

@ -5,6 +5,8 @@
@white: #fff; @white: #fff;
@darkGreen: #40865c; @darkGreen: #40865c;
@darkGrey: #757575; @darkGrey: #757575;
@text-normal: var(--text-normal);
@text-on-brand: var(--text-on-brand);
@touchColor: rgba(255,255,255,0.1); @touchColor: rgba(255,255,255,0.1);
@ -12,15 +14,11 @@
--f7-theme-color: @brandColor; --f7-theme-color: @brandColor;
--f7-navbar-bg-color: @toolbar-background; --f7-navbar-bg-color: @toolbar-background;
// --f7-navbar-link-color: @navBarIconColor;
// --f7-navbar-text-color: @navBarIconColor;
--f7-navbar-link-color: @fill-white; --f7-navbar-link-color: @fill-white;
--f7-navbar-text-color: @fill-white; --f7-navbar-text-color: @fill-white;
--f7-navbar-height: 56px; --f7-navbar-height: 56px;
--f7-subnavbar-bg-color: @toolbar-background; --f7-subnavbar-bg-color: @toolbar-background;
// --f7-subnavbar-link-color: @navBarIconColor;
// --f7-subnavbar-text-color: @navBarIconColor;
--f7-subnavbar-link-color: @fill-white; --f7-subnavbar-link-color: @fill-white;
--f7-subnavbar-text-color: @fill-white; --f7-subnavbar-text-color: @fill-white;
--f7-subnavbar-height: 56px; --f7-subnavbar-height: 56px;
@ -34,15 +32,6 @@
--f7-link-highlight-color: transparent; --f7-link-highlight-color: transparent;
--f7-link-touch-ripple-color: @touchColor; --f7-link-touch-ripple-color: @touchColor;
--f7-text-color: var(--text-normal);
--f7-list-item-title-text-color: var(--text-normal);
--f7-list-item-text-text-color: var(--text-normal);
--f7-block-title-text-color: @text-secondary;
--f7-label-text-color: var(--text-normal);
--f7-page-bg-color: @background-tertiary;
--f7-list-bg-color: @background-primary;
--f7-list-chevron-icon-color: @text-tertiary;
.button { .button {
--f7-touch-ripple-color: transparent; --f7-touch-ripple-color: transparent;
} }
@ -78,6 +67,20 @@
} }
} }
.page {
--f7-text-color: @text-normal;
--f7-list-item-title-text-color: @text-normal;
--f7-list-item-text-text-color: @text-normal;
--f7-block-title-text-color: @text-secondary;
--f7-input-placeholder-color: @text-secondary;
--f7-label-text-color: @text-normal;
--f7-page-bg-color: @background-tertiary;
--f7-list-bg-color: @background-primary;
--f7-list-item-border-color: @background-menu-divider;
--f7-list-chevron-icon-color: @text-tertiary;
--f7-toggle-inactive-color: @background-menu-divider;
}
.add-popup { .add-popup {
.view{ .view{
.block-title{ .block-title{
@ -107,7 +110,7 @@
height: 32px; height: 32px;
} }
label { label {
color: var(--text-normal); color: @text-normal;
margin: 0 5px; margin: 0 5px;
line-height: 32px; line-height: 32px;
} }
@ -142,7 +145,7 @@
} }
.button-fill { .button-fill {
color: @white; color: @text-on-brand;
// background-color: @brandColor; // background-color: @brandColor;
background-color: transparent; background-color: transparent;
} }
@ -152,18 +155,19 @@
} }
.button-red { .button-red {
color: @white; color: @text-on-brand;
background-color: @red; background-color: @text-error;
} }
.buttons-list { .buttons-list {
ul { ul {
background-color: @background-tertiary;
&::before, &::after { &::before, &::after {
display: none; display: none;
} }
li { li {
margin: 20px 16px; margin: 20px 16px;
color: @white; color: @fill-white;
border-radius: 2px; border-radius: 2px;
text-transform: uppercase; text-transform: uppercase;
height: 36px; height: 36px;
@ -180,7 +184,7 @@
} }
.button-fill .list-button { .button-fill .list-button {
background-color: @brandColor; background-color: @brandColor;
color: @white; color: @text-on-brand;
height: 36px; height: 36px;
text-align: center; text-align: center;
line-height: 36px; line-height: 36px;
@ -195,7 +199,7 @@
box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24); box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);
} }
.button-red .list-button { .button-red .list-button {
background-color: @red; background-color: @text-error;
} }
// Tabs // Tabs
.tab-buttons { .tab-buttons {
@ -219,9 +223,10 @@
opacity: 0.5; opacity: 0.5;
} }
&.tab-link-active { &.tab-link-active {
color: @white; color: @fill-white;
i.icon { i.icon {
opacity: 1; opacity: 1;
background-color: @fill-white;
} }
} }
} }
@ -237,7 +242,7 @@
// List // List
.list { .list {
.item-inner { .item-inner {
color: var(--text-normal); color: @text-normal;
} }
li.no-indicator { li.no-indicator {
.item-link { .item-link {
@ -252,7 +257,7 @@
.item-link { .item-link {
.item-inner { .item-inner {
.item-after { .item-after {
color: var(--text-normal); color: @text-normal;
} }
} }
} }
@ -295,10 +300,11 @@
margin-left: 0; margin-left: 0;
} }
&.active { &.active {
color: @white; color: @fill-white;
background-color: @brandColor; background-color: @brandColor;
// background-color: fade(@brandColor, 20%);
i.icon { i.icon {
background-color: @white; background-color: @fill-white;
} }
} }
} }
@ -365,7 +371,7 @@
.thumb { .thumb {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: @white; background-color: @fill-white;
background-size: cover; background-size: cover;
label { label {
@ -444,7 +450,7 @@
height: 18px; height: 18px;
margin-top: -8px; margin-top: -8px;
&:after { &:after {
color: @white; color: @fill-white;
font-size: 19px; font-size: 19px;
line-height: 19px; line-height: 19px;
} }
@ -452,7 +458,7 @@
.searchbar-icon { .searchbar-icon {
&:after { &:after {
color: @white; color: @fill-white;
font-size: 19px; font-size: 19px;
} }
} }
@ -465,11 +471,11 @@
appearance: none; appearance: none;
border-radius: 0; border-radius: 0;
font-family: inherit; font-family: inherit;
color: @white; color: @fill-white;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
padding: 0; padding: 0;
border-bottom: 1px solid @white; border-bottom: 1px solid @fill-white;
height: 100%; height: 100%;
padding: 0 36px 0 24px; padding: 0 36px 0 24px;
background-color: transparent; background-color: transparent;
@ -478,11 +484,11 @@
opacity: 1; opacity: 1;
background-size: 24px 24px; background-size: 24px 24px;
transition-duration: .3s; transition-duration: .3s;
.encoded-svg-background('<svg xmlns="http://www.w3.org/2000/svg" fill="@{white}" height="24" viewBox="0 0 24 24" width="24"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg>'); .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" fill="@{fill-white}" height="24" viewBox="0 0 24 24" width="24"><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z"/></svg>', @fill-white);
} }
.searchbar input[type=search]::placeholder { .searchbar input[type=search]::placeholder {
color: @white; color: @fill-white;
} }
.navbar { .navbar {
@ -510,7 +516,7 @@
height: 56px; height: 56px;
} }
.buttons-row-replace a { .buttons-row-replace a {
color: @white; color: @fill-white;
padding: 0; padding: 0;
} }
.searchbar .buttons-row { .searchbar .buttons-row {

View file

@ -149,7 +149,7 @@
.content-block { .content-block {
margin: 0 auto 15px; margin: 0 auto 15px;
a { a {
color: @black; color: @text-normal;
} }
} }
} }
@ -181,7 +181,7 @@
} }
.item-title { .item-title {
margin-left: 20px; margin-left: 20px;
color: var(--text-normal); color: @text-normal;
} }
} }
@ -224,7 +224,7 @@
bottom: 0; bottom: 0;
z-index: 1; z-index: 1;
background-repeat: no-repeat; background-repeat: no-repeat;
.encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 22 22" fill="@{brandColor}"><g><circle fill="#fff" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>'); .encoded-svg-mask('<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="0 0 22 22" fill="@{brandColor}"><g><circle fill="transparent" cx="11" cy="11" r="11"/><path d="M11,21A10,10,0,1,1,21,11,10,10,0,0,1,11,21h0ZM17.4,7.32L17.06,7a0.48,0.48,0,0,0-.67,0l-7,6.84L6.95,11.24a0.51,0.51,0,0,0-.59.08L6,11.66a0.58,0.58,0,0,0,0,.65l3.19,3.35a0.38,0.38,0,0,0,.39,0L17.4,8a0.48,0.48,0,0,0,0-.67h0Z"/></g></svg>');
} }
.active .item-inner:before { .active .item-inner:before {
opacity: 1; opacity: 1;

View file

@ -316,6 +316,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
height: 40px; height: 40px;
background-color: @background-primary;
.icon-swipe { .icon-swipe {
margin-top: 8px; margin-top: 8px;
width: 40px; width: 40px;

View file

@ -17,7 +17,7 @@
display: flex; display: flex;
.initials { .initials {
border-radius: 50px; border-radius: 50px;
color: @white; color: @fill-white;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;