diff --git a/assets/font-arial.sass b/assets/font-arial.sass index ed5e68a..f345eb0 100644 --- a/assets/font-arial.sass +++ b/assets/font-arial.sass @@ -1,3 +1,8 @@ /* Шрифт: Arial */ +:root + --font-main: 'Arial', sans-serif + --font-alt: var(--font-main) + --font-alt-text-letter-spacing: normal + body, input, select, button, textarea - font-family: 'Arial', sans-serif + font-family: var(--font-main) diff --git a/assets/font-roboto.sass b/assets/font-roboto.sass index 3fca9c5..3029ad5 100644 --- a/assets/font-roboto.sass +++ b/assets/font-roboto.sass @@ -35,5 +35,10 @@ src: local('Roboto Medium'), local('Roboto-Medium'), url(https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmEU9fBBc4.woff2) format('woff2') unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD +:root + --font-main: 'Roboto', sans-serif + --font-alt: var(--font-main) + --font-alt-text-letter-spacing: normal + body, input, select, button, textarea - font-family: 'Roboto', sans-serif + font-family: var(--font-main) diff --git a/assets/font-roboto_condensed.sass b/assets/font-roboto_condensed.sass index 1ee786e..a140ee3 100644 --- a/assets/font-roboto_condensed.sass +++ b/assets/font-roboto_condensed.sass @@ -31,5 +31,10 @@ src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'), url(https://fonts.gstatic.com/s/robotocondensed/v16/ieVi2ZhZI2eCN5jzbjEETS9weq8-32meGCQYbw.woff2) format('woff2') unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD +:root + --font-main: 'Roboto Condensed', sans-serif + --font-alt: var(--font-main) + --font-alt-text-letter-spacing: normal + body, input, select, button, textarea - font-family: 'Roboto Condensed', sans-serif + font-family: var(--font-main) diff --git a/assets/tests/td-tabs.sass b/assets/tests/td-tabs.sass index 7cd83bc..c32807b 100644 --- a/assets/tests/td-tabs.sass +++ b/assets/tests/td-tabs.sass @@ -3,7 +3,7 @@ */ $break_vertical: 960px -.b-tabs +.u-tabs // Контейнер &.--vertical @media (min-width: $break_vertical) @@ -12,7 +12,7 @@ $break_vertical: 960px border-radius: $border-rounded // Список переключателей - .b-tabs_list + & > div:not([data-tab]) flex-direction: column flex-shrink: 0 width: 200px @@ -20,7 +20,7 @@ $break_vertical: 960px border-right: 1px solid $color-border // Переключатель - .b-tabs_switch + [data-tab-switch] padding: 8px 16px margin: 0 border: 0 @@ -28,19 +28,19 @@ $break_vertical: 960px text-align: left // Содержимое вкладки - .b-tabs_panel + [data-tab] flex-grow: 1 padding: 18px 24px // Список переключателей - .b-tabs_list + & > div:not([data-tab]) display: flex flex-direction: row flex-wrap: nowrap overflow-y: auto // Переключатель - .b-tabs_switch + [data-tab-switch] display: block flex-shrink: 0 min-width: 148px @@ -70,12 +70,12 @@ $break_vertical: 960px cursor: default // Содержимое вкладки - .b-tabs_panel + [data-tab] padding: 12px 8px // Анимация переключения &.--ripple - .b-tabs_switch + [data-tab-switch] position: relative overflow: hidden -webkit-tap-highlight-color: rgba(0,0,0,0) diff --git a/config/theme_files.json b/config/theme_files.json index cb75b11..428aed8 100644 --- a/config/theme_files.json +++ b/config/theme_files.json @@ -20,12 +20,12 @@ { "url": "font-arial.sass", "cat": "font", - "checked": true + "checked": false }, { "url": "font-roboto.sass", "cat": "font", - "checked": false + "checked": true }, { "url": "font-roboto_condensed.sass",