From d41c0aa7df64dfe3c518e8fca0d3481e804cad3d Mon Sep 17 00:00:00 2001 From: = <=> Date: Mon, 10 May 2021 18:07:40 +0500 Subject: [PATCH] changes --- prepros.config | 917 ++++++++++++++++++ .../css/components/2-layout/responsive.scss | 3 + .../css/components/2-layout/footer.scss | 52 +- .../css/components/2-layout/newsSlider.scss | 147 +-- .../css/components/2-layout/subheader.scss | 4 +- .../assets/css/components/3-page/home.scss | 2 +- .../assets/css/components/3-page/news.scss | 153 +-- themes/modern2/assets/css/main.css | 29 +- 8 files changed, 1120 insertions(+), 187 deletions(-) create mode 100644 prepros.config diff --git a/prepros.config b/prepros.config new file mode 100644 index 000000000..c8fc11553 --- /dev/null +++ b/prepros.config @@ -0,0 +1,917 @@ +{ + "version": "7", + "about": "This is a Prepros (https://prepros.io) configuration file. You can commit this file to a git repo to backup and sync project configurations.", + "config": { + "proxy": { + "enable": false, + "target": "", + "useLocalAssets": false + }, + "reload": { + "enable": true, + "delay": 0, + "animate": true, + "afterUpload": false + }, + "sync": { + "enable": false, + "mouse": true, + "keyboard": true, + "form": true, + "scroll": true + }, + "watcher": { + "enable": true, + "maxFiles": 2000, + "usePolling": false, + "pollingInterval": 500, + "extensions": [ + ".html", + ".htm", + ".php" + ], + "ignore": { + "patterns": [ + ".*", + "wp-admin", + "wp-includes", + "node_modules", + "Prepros Export", + "bower_components" + ], + "exceptions": [] + } + }, + "exporter": { + "ignore": { + "patterns": [ + ".*", + "desktop.ini", + "prepros.cfg", + "node_modules", + "Prepros Export", + "prepros.config", + "prepros-6.config", + "*-original.jpg", + "*-original.jpeg", + "*-original.png", + "*-original.svg", + "*.scss", + "*.sass", + "*.less", + "*.pug", + "*.jade", + "*.styl", + "*.haml", + "*.slim", + "*.coffee", + "*.kit", + "*.turf", + "*.ts" + ], + "exceptions": [] + } + }, + "uploader": { + "remotePath": "", + "timeout": 20000, + "autoUpload": false, + "reuseConnection": true, + "connectionType": "ftp", + "history": [] + }, + "packages": { + "createPackageLock": true + }, + "images": { + "preserveOriginal": true + }, + "tasks": { + "autoprefixer": { + "cascade": true, + "add": true, + "remove": true, + "supports": true, + "flexbox": true, + "grid": "autoplace", + "browsers": [ + "last 2 versions" + ], + "sourceMap": false + }, + "babel": { + "sourceMap": false, + "presets": { + "@babel/preset-env": { + "enable": true, + "options": { + "targets": [ + "last 2 versions" + ], + "preserveImports": false, + "polyfills": false + } + }, + "@babel/preset-react": true, + "@babel/preset-flow": false + }, + "plugins": { + "@babel/plugin-proposal-class-static-block": false, + "@babel/plugin-proposal-class-properties": false, + "@babel/plugin-proposal-decorators": { + "enable": false, + "options": { + "decoratorsBeforeExport": true + } + }, + "@babel/plugin-proposal-export-namespace-from": false, + "@babel/plugin-proposal-function-sent": false, + "@babel/plugin-proposal-logical-assignment-operators": false, + "@babel/plugin-proposal-nullish-coalescing-operator": false, + "@babel/plugin-proposal-numeric-separator": false, + "@babel/plugin-proposal-optional-chaining": false, + "@babel/plugin-proposal-private-methods": false, + "@babel/plugin-proposal-throw-expressions": false + }, + "customPresets": [], + "customPlugins": [] + }, + "bundle-js": { + "sourceMap": false, + "exclude": [ + "node_modules", + "bower_components" + ], + "devMode": true, + "globals": [], + "externals": [], + "babel": { + "enable": true, + "options": { + "sourceMap": false, + "presets": { + "@babel/preset-env": { + "enable": true, + "options": { + "targets": [ + "last 2 versions" + ], + "preserveImports": false, + "polyfills": false + } + }, + "@babel/preset-react": true, + "@babel/preset-flow": false + }, + "plugins": { + "@babel/plugin-proposal-class-static-block": false, + "@babel/plugin-proposal-class-properties": false, + "@babel/plugin-proposal-decorators": { + "enable": false, + "options": { + "decoratorsBeforeExport": true + } + }, + "@babel/plugin-proposal-export-namespace-from": false, + "@babel/plugin-proposal-function-sent": false, + "@babel/plugin-proposal-logical-assignment-operators": false, + "@babel/plugin-proposal-nullish-coalescing-operator": false, + "@babel/plugin-proposal-numeric-separator": false, + "@babel/plugin-proposal-optional-chaining": false, + "@babel/plugin-proposal-private-methods": false, + "@babel/plugin-proposal-throw-expressions": false + }, + "customPresets": [], + "customPlugins": [] + } + }, + "css": { + "enable": true + }, + "fonts": { + "enable": true + } + }, + "coffeescript": { + "header": false, + "bare": false, + "sourceMap": false + }, + "command": { + "command": "", + "rootDir": "" + }, + "concat-js": { + "sourceMap": false, + "rootDir": "" + }, + "copy": { + "sourceMap": false + }, + "dart-sass": { + "indentType": "space", + "allowWildcardImports": false, + "indentWidth": 2, + "linefeed": "lf", + "sourceMap": false + }, + "haml": { + "doubleQuoteAttributes": true + }, + "jpg": { + "quality": 90 + }, + "less": { + "javascriptEnabled": false, + "strictImports": false, + "insecure": false, + "math": "always", + "strictUnits": false, + "dumpLineNumbers": false, + "sourceMap": false + }, + "markdown": { + "githubFlavored": true, + "wrapWithHtml": false + }, + "minify-css": { + "sourceMap": false + }, + "minify-html": { + "caseSensitive": false, + "collapseBooleanAttributes": true, + "collapseInlineTagWhitespace": false, + "collapseWhitespace": true, + "conservativeCollapse": false, + "decodeEntities": false, + "html5": true, + "includeAutoGeneratedTags": true, + "keepClosingSlash": false, + "minifyCSS": true, + "minifyJS": true, + "preserveLineBreaks": false, + "preventAttributesEscaping": false, + "processConditionalComments": false, + "removeAttributeQuotes": false, + "removeComments": true, + "removeEmptyAttributes": false, + "removeEmptyElement": false, + "removeOptionalTags": false, + "removeRedundantAttributes": false, + "removeScriptTypeAttributes": false, + "removeStyleLinkTypeAttributes": false, + "removeTagWhitespace": false, + "sortAttributes": false, + "sortClassName": false, + "useShortDoctype": true + }, + "minify-js": { + "parse": { + "bare_returns": false + }, + "compress": { + "arrows": true, + "arguments": false, + "booleans": true, + "booleans_as_integers": false, + "collapse_vars": true, + "comparisons": true, + "computed_props": true, + "conditionals": true, + "dead_code": true, + "directives": true, + "drop_console": false, + "drop_debugger": true, + "evaluate": true, + "expression": false, + "global_defs": [], + "hoist_funs": false, + "hoist_props": true, + "hoist_vars": false, + "if_return": true, + "inline": 3, + "join_vars": true, + "keep_fargs": true, + "keep_infinity": false, + "loops": true, + "negate_iife": true, + "properties": true, + "pure_funcs": [], + "pure_getters": false, + "reduce_funcs": true, + "reduce_vars": true, + "sequences": true, + "side_effects": true, + "switches": true, + "top_retain": [], + "typeofs": true, + "unsafe": false, + "unsafe_arrows": false, + "unsafe_comps": false, + "unsafe_Function": false, + "unsafe_math": false, + "unsafe_proto": false, + "unsafe_regexp": false, + "unsafe_undefined": false, + "unused": true + }, + "mangle": { + "eval": false, + "reserved": [] + }, + "output": { + "ascii_only": false, + "braces": false, + "comments": "none", + "inline_script": true, + "keep_numbers": false, + "keep_quoted_props": false, + "preamble": null, + "quote_keys": false, + "quote_style": 0, + "semicolons": true, + "shebang": true, + "webkit": false, + "wrap_iife": false, + "wrap_func_args": true + }, + "sourceMap": false, + "toplevel": false, + "ie8": false, + "keep_classnames": false, + "keep_fnames": false, + "safari10": false + }, + "node-sass": { + "indentType": "space", + "allowWildcardImports": false, + "indentWidth": 2, + "linefeed": "lf", + "outputStyle": "expanded", + "precision": 10, + "sourceMap": false, + "sourceComments": false + }, + "png": { + "quality": 90 + }, + "postcss-import": { + "ignoreKeywords": [], + "sourceMap": false + }, + "postcss-preset-env": { + "stage": 2, + "browsers": [ + "last 2 versions" + ], + "sourceMap": false + }, + "pug": { + "pretty": true + }, + "slim": { + "indent": "space", + "indentSize": 2, + "pretty": true + }, + "stylus": { + "useNib": true, + "sourceMap": false, + "linenos": false + }, + "svg": { + "cleanupAttrs": true, + "removeDoctype": true, + "removeXMLProcInst": true, + "removeComments": true, + "removeMetadata": true, + "removeTitle": true, + "removeDesc": true, + "removeUselessDefs": true, + "removeEditorsNSData": true, + "removeEmptyAttrs": true, + "removeHiddenElems": true, + "removeEmptyText": true, + "removeEmptyContainers": true, + "removeViewBox": false, + "cleanupEnableBackground": true, + "convertStyleToAttrs": true, + "convertColors": true, + "convertPathData": true, + "convertTransform": true, + "removeUnknownsAndDefaults": true, + "removeNonInheritableGroupAttrs": true, + "removeUselessStrokeAndFill": true, + "removeUnusedNS": true, + "cleanupIDs": true, + "cleanupNumericValues": true, + "moveElemsAttrsToGroup": true, + "moveGroupAttrsToElems": true, + "collapseGroups": true, + "removeRasterImages": false, + "mergePaths": true, + "convertShapeToPath": true, + "sortAttrs": true, + "removeDimensions": true + }, + "turf": { + "rootDir": "" + }, + "typescript": { + "allowJs": false, + "allowSyntheticDefaultImports": true, + "allowUmdGlobalAccess": false, + "allowUnreachableCode": false, + "allowUnusedLabels": false, + "alwaysStrict": false, + "charset": "utf8", + "checkJs": false, + "declaration": false, + "disableSizeLimit": false, + "downlevelIteration": false, + "emitBOM": false, + "emitDecoratorMetadata": false, + "experimentalDecorators": false, + "forceConsistentCasingInFileNames": false, + "importHelpers": false, + "jsx": "React", + "keyofStringsOnly": false, + "lib": [], + "maxNodeModuleJsDepth": 0, + "module": "ES2015", + "moduleResolution": "NodeJs", + "newLine": "LineFeed", + "noFallthroughCasesInSwitch": false, + "noImplicitAny": false, + "noImplicitReturns": false, + "noImplicitThis": false, + "noStrictGenericChecks": false, + "noUnusedLocals": false, + "noUnusedParameters": false, + "noImplicitUseStrict": false, + "noLib": false, + "noResolve": false, + "preserveConstEnums": false, + "jsxFactory": "React.createElement", + "removeComments": false, + "skipLibCheck": false, + "sourceMap": false, + "strict": false, + "strictFunctionTypes": false, + "strictBindCallApply": false, + "strictNullChecks": false, + "strictPropertyInitialization": false, + "suppressExcessPropertyErrors": false, + "suppressImplicitAnyIndexErrors": false, + "target": "ES3", + "resolveJsonModule": false, + "esModuleInterop": false, + "useDefineForClassFields": false + } + }, + "fileTypes": { + "sass": { + "extensions": [ + ".scss", + ".sass" + ], + "autoCompile": true, + "sourceMap": false, + "tasks": [ + { + "task": "dart-sass", + "enable": true + }, + { + "task": "autoprefixer", + "enable": true + }, + { + "task": "minify-css", + "enable": false + } + ], + "output": { + "extension": ".css", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "scss", + "replaceWith": "css" + }, + { + "segment": "sass", + "replaceWith": "css" + } + ] + } + }, + "less": { + "extensions": [ + ".less" + ], + "autoCompile": true, + "sourceMap": false, + "tasks": [ + { + "task": "less", + "enable": true + }, + { + "task": "autoprefixer", + "enable": true + }, + { + "task": "minify-css", + "enable": false + } + ], + "output": { + "extension": ".css", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "less", + "replaceWith": "css" + } + ] + } + }, + "pug": { + "extensions": [ + ".pug", + ".jade" + ], + "autoCompile": true, + "tasks": [ + { + "task": "pug", + "enable": true + }, + { + "task": "minify-html", + "enable": false + } + ], + "output": { + "extension": ".html", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "pug", + "replaceWith": "html" + } + ] + } + }, + "css": { + "extensions": [ + ".css" + ], + "autoCompile": false, + "sourceMap": false, + "tasks": [ + { + "task": "copy", + "enable": true + }, + { + "task": "postcss-import", + "enable": false + }, + { + "task": "postcss-preset-env", + "enable": false + }, + { + "task": "autoprefixer", + "enable": true + }, + { + "task": "minify-css", + "enable": true + } + ], + "output": { + "extension": ".css", + "type": "SOURCE_RELATIVE", + "relativePath": "", + "suffix": "-dist", + "alwaysSuffix": false + } + }, + "javascript": { + "extensions": [ + ".js", + ".jsx" + ], + "autoCompile": false, + "sourceMap": false, + "tasks": [ + { + "task": "copy", + "enable": true + }, + { + "task": "concat-js", + "enable": false + }, + { + "task": "babel", + "enable": false + }, + { + "task": "bundle-js", + "enable": false + }, + { + "task": "minify-js", + "enable": true + } + ], + "output": { + "extension": ".js", + "type": "SOURCE_RELATIVE", + "relativePath": "", + "suffix": "-dist", + "alwaysSuffix": false + } + }, + "stylus": { + "extensions": [ + ".styl" + ], + "autoCompile": true, + "sourceMap": false, + "tasks": [ + { + "task": "stylus", + "enable": true + }, + { + "task": "autoprefixer", + "enable": true + }, + { + "task": "minify-css", + "enable": false + } + ], + "output": { + "extension": ".css", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "stylus", + "replaceWith": "css" + }, + { + "segment": "styl", + "replaceWith": "css" + } + ] + } + }, + "markdown": { + "extensions": [ + ".md", + ".markdown", + ".mkd" + ], + "autoCompile": false, + "tasks": [ + { + "task": "markdown", + "enable": true + }, + { + "task": "minify-html", + "enable": false + } + ], + "output": { + "extension": ".html", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "markdown", + "replaceWith": "html" + } + ] + } + }, + "haml": { + "extensions": [ + ".haml" + ], + "autoCompile": true, + "tasks": [ + { + "task": "haml", + "enable": true + }, + { + "task": "minify-html", + "enable": false + } + ], + "output": { + "extension": ".html", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "haml", + "replaceWith": "html" + } + ] + } + }, + "slim": { + "extensions": [ + ".slim" + ], + "autoCompile": true, + "tasks": [ + { + "task": "slim", + "enable": true + }, + { + "task": "minify-html", + "enable": false + } + ], + "output": { + "extension": ".html", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "slim", + "replaceWith": "html" + } + ] + } + }, + "coffeescript": { + "extensions": [ + ".coffee" + ], + "autoCompile": true, + "sourceMap": false, + "tasks": [ + { + "task": "coffeescript", + "enable": true + }, + { + "task": "babel", + "enable": false + }, + { + "task": "bundle-js", + "enable": false + }, + { + "task": "minify-js", + "enable": false + } + ], + "output": { + "extension": ".js", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "coffee-script", + "replaceWith": "js" + }, + { + "segment": "coffeescript", + "replaceWith": "js" + }, + { + "segment": "coffee", + "replaceWith": "js" + } + ] + } + }, + "turf": { + "extensions": [ + ".turf", + ".kit" + ], + "autoCompile": true, + "tasks": [ + { + "task": "turf", + "enable": true + }, + { + "task": "minify-html", + "enable": false + } + ], + "output": { + "extension": ".html", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "turf", + "replaceWith": "html" + } + ] + } + }, + "typescript": { + "extensions": [ + ".ts", + ".tsx" + ], + "autoCompile": true, + "sourceMap": false, + "tasks": [ + { + "task": "typescript", + "enable": true + }, + { + "task": "babel", + "enable": false + }, + { + "task": "bundle-js", + "enable": false + }, + { + "task": "minify-js", + "enable": false + } + ], + "output": { + "extension": ".js", + "type": "REPLACE_SEGMENTS", + "segments": [ + { + "segment": "typescript", + "replaceWith": "js" + }, + { + "segment": "ts", + "replaceWith": "js" + } + ] + } + }, + "jpg": { + "extensions": [ + ".jpg", + ".jpeg" + ], + "tasks": [ + { + "task": "jpg", + "enable": true + } + ], + "output": { + "extension": ".jpg", + "type": "SOURCE_RELATIVE", + "relativePath": "" + } + }, + "png": { + "extensions": [ + ".png" + ], + "tasks": [ + { + "task": "png", + "enable": true + } + ], + "output": { + "extension": ".png", + "type": "SOURCE_RELATIVE", + "relativePath": "" + } + }, + "svg": { + "extensions": [ + ".svg" + ], + "tasks": [ + { + "task": "svg", + "enable": true + } + ], + "output": { + "extension": ".svg", + "type": "SOURCE_RELATIVE", + "relativePath": "" + } + } + }, + "files": [] + } +} diff --git a/themes/modern/assets/css/components/2-layout/responsive.scss b/themes/modern/assets/css/components/2-layout/responsive.scss index bb153f31a..3c2a4236a 100755 --- a/themes/modern/assets/css/components/2-layout/responsive.scss +++ b/themes/modern/assets/css/components/2-layout/responsive.scss @@ -129,6 +129,9 @@ width: calc(60% - 15px); &-header { margin-bottom: 15px; + &__slogan { + + } } &-body { &-para { diff --git a/themes/modern2/assets/css/components/2-layout/footer.scss b/themes/modern2/assets/css/components/2-layout/footer.scss index 30e53700c..702a7c83b 100755 --- a/themes/modern2/assets/css/components/2-layout/footer.scss +++ b/themes/modern2/assets/css/components/2-layout/footer.scss @@ -1,27 +1,31 @@ .footer { - background: $text-light-black; - padding: 30px 0; - &__inner { - display: flex; - align-items: center; - justify-content: space-between; - } - &__copyright { - font-size: $h5-size; - line-height: $h5-height; - font-weight: 400; - color: $text-color-white; - } - &__social { - display: flex; - align-items: center; - &-link { - fill: $text-color-white; - margin: 0 10px; - @include transition; - &:hover { - fill: $main-color; - } + background: $text-light-black; + padding: 30px 0; + &__inner { + display: flex; + align-items: center; + justify-content: space-between; + } + &__copyright { + font-size: $h5-size; + line-height: $h5-height; + font-weight: 400; + color: $text-color-white; + a { + color: $text-color-white; + margin-left: 10px; + } + } + &__social { + display: flex; + align-items: center; + &-link { + fill: $text-color-white; + margin: 0 10px; + @include transition; + &:hover { + fill: $main-color; + } + } } - } } diff --git a/themes/modern2/assets/css/components/2-layout/newsSlider.scss b/themes/modern2/assets/css/components/2-layout/newsSlider.scss index 55ff83b60..6a9c8727a 100755 --- a/themes/modern2/assets/css/components/2-layout/newsSlider.scss +++ b/themes/modern2/assets/css/components/2-layout/newsSlider.scss @@ -1,77 +1,78 @@ .newsSlider { - &__outer { - position: relative; - margin: 0 -5px; - overflow: hidden; - .p2 { - cursor: pointer; - position: absolute; - top: 50%; - left: 5px; - @include transformY; - width: 30px; - height: 40px; - background: rgba($color: #000000, $alpha: 0.5); - display: flex; - align-items: center; - justify-content: center; - z-index: 1; - } - .n2 { - cursor: pointer; - position: absolute; - z-index: 1; - top: 50%; - right: 5px; - @include transformY; - width: 30px; - height: 40px; - background: rgba($color: #000000, $alpha: 0.5); - display: flex; - align-items: center; - justify-content: center; - } - } - .newsSlider__item { - position: relative; - padding: 5px 5px; - img { - @include fullImage; - } - &-content { - position: absolute; - left: 20px; - bottom: 20px; - width: calc(100% - 40px); - &-date { - display: flex; - align-items: center; - justify-content: center; - padding: 8px 12px; - background: $main-color; - font-size: 14px; - line-height: 18px; - font-weight: 400; - max-width: 145px; - color: $text-color-white; - margin-bottom: 10px; - svg { - margin: 0 4px; - width: 4px; - height: 4px; - fill: $text-color-white; - } - } - &-link { - color: $text-color-white; - font-size: 16px; - line-height: 30px; - height: 60px; + &__outer { + position: relative; + margin: 0 -5px; overflow: hidden; - text-overflow: ellipsis; - font-weight: 700; - display: block; - } + .p2 { + cursor: pointer; + position: absolute; + top: 50%; + left: 5px; + @include transformY; + width: 30px; + height: 40px; + background: rgba($color: #000000, $alpha: 0.5); + display: flex; + align-items: center; + justify-content: center; + z-index: 1; + } + .n2 { + cursor: pointer; + position: absolute; + z-index: 1; + top: 50%; + right: 5px; + @include transformY; + width: 30px; + height: 40px; + background: rgba($color: #000000, $alpha: 0.5); + display: flex; + align-items: center; + justify-content: center; + } + } + .newsSlider__item { + position: relative; + padding: 5px 5px; + height: 320px; + img { + @include fullImage; + } + &-content { + position: absolute; + left: 20px; + bottom: 20px; + width: calc(100% - 40px); + &-date { + display: flex; + align-items: center; + justify-content: center; + padding: 8px 12px; + background: $main-color; + font-size: 14px; + line-height: 18px; + font-weight: 400; + max-width: 145px; + color: $text-color-white; + margin-bottom: 10px; + svg { + margin: 0 4px; + width: 4px; + height: 4px; + fill: $text-color-white; + } + } + &-link { + color: $text-color-white; + font-size: 16px; + line-height: 30px; + height: 60px; + overflow: hidden; + text-overflow: ellipsis; + font-weight: 700; + display: block; + } + } } - } } diff --git a/themes/modern2/assets/css/components/2-layout/subheader.scss b/themes/modern2/assets/css/components/2-layout/subheader.scss index 074404a12..655d76a0d 100755 --- a/themes/modern2/assets/css/components/2-layout/subheader.scss +++ b/themes/modern2/assets/css/components/2-layout/subheader.scss @@ -43,6 +43,7 @@ width: 200px; max-height: 0; overflow: auto; + z-index: 2; background: $text-color-white; &__link { display: block; @@ -60,9 +61,6 @@ &:hover .dropDown { max-height: 2000px; } - &:hover::before { - width: 200px; - } } } } diff --git a/themes/modern2/assets/css/components/3-page/home.scss b/themes/modern2/assets/css/components/3-page/home.scss index affb4531f..7397eccf7 100755 --- a/themes/modern2/assets/css/components/3-page/home.scss +++ b/themes/modern2/assets/css/components/3-page/home.scss @@ -53,7 +53,7 @@ height: 30px; position: absolute; overflow: hidden; - animation: marquee 10s linear infinite; + animation: marquee 25s linear infinite; } .marquee span { diff --git a/themes/modern2/assets/css/components/3-page/news.scss b/themes/modern2/assets/css/components/3-page/news.scss index 32945836b..79bbbc6a3 100755 --- a/themes/modern2/assets/css/components/3-page/news.scss +++ b/themes/modern2/assets/css/components/3-page/news.scss @@ -1,83 +1,90 @@ .news { - &__inner { - display: flex; - align-items: stretch; - padding: 80px 0; - } - &__sidebar { - margin-left: 25px; - width: calc(30% - 25px); - &-title { - font-size: $h4-size; - line-height: $h4-height; - font-weight: 700; - text-transform: uppercase; - margin-bottom: 20px; - color: $text-light-black; + &__inner { + display: flex; + align-items: stretch; + padding: 80px 0; } - .card { - padding: 30px 0; - border-bottom: 1px solid #dcdcdc; + &__sidebar { + margin-left: 25px; + width: calc(30% - 25px); + &-title { + font-size: $h4-size; + line-height: $h4-height; + font-weight: 700; + text-transform: uppercase; + margin-bottom: 20px; + color: $text-light-black; + } + .card { + padding: 30px 0; + border-bottom: 1px solid #dcdcdc; + } } - } - &__content { - width: calc(70% - 25px); - margin-right: 25px; - } - &__title { - color: $text-black; - font-weight: 700; - font-size: $h2-size; - line-height: $h2-height; - } - &__date { - display: flex; - align-items: center; - font-size: $h3-size; - line-height: $h3-height; - color: $text-color-grey; - font-weight: 400; - margin-bottom: 20px; - svg { - margin: 0 5px; + &__content { + width: calc(70% - 25px); + margin-right: 25px; + &-header { + display: flex; + align-items: center; + justify-content: space-between; + } } - } - &__image { - width: 100%; - margin: 50px 0; - img { - width: 100%; - height: auto; + &__title { + color: $text-black; + font-weight: 700; + font-size: $h2-size; + line-height: $h2-height; } - } - &__body { - p { - font-size: $p-size; - line-height: $p-height; - margin-bottom: 30px; + &__date { + display: flex; + align-items: center; + font-size: $h3-size; + line-height: $h3-height; + color: $text-color-grey; + font-weight: 400; + margin-bottom: 20px; + svg { + margin: 0 5px; + } } - img.aligncenter { - margin: 100px auto; - display: block; + &__image { + width: 100%; + margin: 50px 0; + display: block; + img { + width: 100%; + height: auto; + } } - } - &__footer { - display: flex; - align-items: center; - justify-content: space-between; - &-social { - display: flex; - align-items: center; - &-link { - margin-right: 20px; - fill: $main-color; - } + &__body { + p { + font-size: $p-size; + line-height: $p-height; + margin-bottom: 30px; + img { + width: 70%; + margin: 30px auto; + display: block; + } + } } - &-name { - font-size: $h2-size; - line-height: $h2-height; - font-weight: 700; - color: $text-light-black; + &__footer { + display: flex; + align-items: center; + justify-content: space-between; + &-social { + display: flex; + align-items: center; + &-link { + margin-right: 20px; + fill: $main-color; + } + } + &-name { + font-size: $h2-size; + line-height: $h2-height; + font-weight: 700; + color: $text-light-black; + } } - } } diff --git a/themes/modern2/assets/css/main.css b/themes/modern2/assets/css/main.css index 6d1fb7b5f..003262a3d 100755 --- a/themes/modern2/assets/css/main.css +++ b/themes/modern2/assets/css/main.css @@ -202,6 +202,10 @@ li { font-weight: 400; color: #ffffff; } +.footer__copyright a { + color: #ffffff; + margin-left: 10px; +} .footer__social { display: flex; align-items: center; @@ -264,6 +268,7 @@ li { width: 200px; max-height: 0; overflow: auto; + z-index: 2; background: #ffffff; } .subheader .nav__inner-link .dropDown__link { @@ -282,9 +287,6 @@ li { .subheader .nav__inner-link:hover .dropDown { max-height: 2000px; } -.subheader .nav__inner-link:hover::before { - width: 200px; -} .subheader .language { display: flex; align-items: center; @@ -386,13 +388,6 @@ li { } /* Icons */ -@font-face { - font-family: "slick"; - src: url("./fonts/slick.eot"); - src: url("./fonts/slick.eot?#iefix") format("embedded-opentype"), url("./fonts/slick.woff") format("woff"), url("./fonts/slick.ttf") format("truetype"), url("./fonts/slick.svg#slick") format("svg"); - font-weight: normal; - font-style: normal; -} /* Arrows */ .slick-prev, .slick-next { @@ -976,6 +971,7 @@ li { .newsSlider .newsSlider__item { position: relative; padding: 5px 5px; + height: 320px; } .newsSlider .newsSlider__item img { width: 100%; @@ -1221,7 +1217,7 @@ li { height: 30px; position: absolute; overflow: hidden; - animation: marquee 10s linear infinite; + animation: marquee 25s linear infinite; } .marquee span { @@ -1832,6 +1828,11 @@ li { width: calc(70% - 25px); margin-right: 25px; } +.news__content-header { + display: flex; + align-items: center; + justify-content: space-between; +} .news__title { color: #000; font-weight: 700; @@ -1853,6 +1854,7 @@ li { .news__image { width: 100%; margin: 50px 0; + display: block; } .news__image img { width: 100%; @@ -1863,8 +1865,9 @@ li { line-height: 30px; margin-bottom: 30px; } -.news__body img.aligncenter { - margin: 100px auto; +.news__body p img { + width: 70%; + margin: 30px auto; display: block; } .news__footer {