Commit 2c98fff8 authored by Nikolay Gromov's avatar Nikolay Gromov

Доработал глобальные стили, типографику, представление кода

parent 46b119c9
...@@ -58,6 +58,7 @@ gulp.task('clean', function () { ...@@ -58,6 +58,7 @@ gulp.task('clean', function () {
gulp.task('style', function () { gulp.task('style', function () {
const sass = require('gulp-sass'); const sass = require('gulp-sass');
const sourcemaps = require('gulp-sourcemaps'); const sourcemaps = require('gulp-sourcemaps');
const wait = require('gulp-wait');
console.log('---------- Компиляция стилей'); console.log('---------- Компиляция стилей');
return gulp.src(dirs.srcPath + 'scss/style.scss') return gulp.src(dirs.srcPath + 'scss/style.scss')
.pipe(plumber({ .pipe(plumber({
...@@ -69,6 +70,7 @@ gulp.task('style', function () { ...@@ -69,6 +70,7 @@ gulp.task('style', function () {
this.emit('end'); this.emit('end');
} }
})) }))
.pipe(wait(100))
.pipe(gulpIf(isDev, sourcemaps.init())) .pipe(gulpIf(isDev, sourcemaps.init()))
.pipe(debug({title: "Style:"})) .pipe(debug({title: "Style:"}))
.pipe(sass()) .pipe(sass())
...@@ -90,6 +92,7 @@ gulp.task('style:single', function () { ...@@ -90,6 +92,7 @@ gulp.task('style:single', function () {
if(pjson.configProject.singleCompiled.length) { if(pjson.configProject.singleCompiled.length) {
const sass = require('gulp-sass'); const sass = require('gulp-sass');
const sourcemaps = require('gulp-sourcemaps'); const sourcemaps = require('gulp-sourcemaps');
const wait = require('gulp-wait');
console.log('---------- Компиляция добавочных стилей'); console.log('---------- Компиляция добавочных стилей');
return gulp.src(pjson.configProject.singleCompiled) return gulp.src(pjson.configProject.singleCompiled)
.pipe(plumber({ .pipe(plumber({
...@@ -101,6 +104,7 @@ gulp.task('style:single', function () { ...@@ -101,6 +104,7 @@ gulp.task('style:single', function () {
this.emit('end'); this.emit('end');
} }
})) }))
.pipe(wait(100))
.pipe(gulpIf(isDev, sourcemaps.init())) .pipe(gulpIf(isDev, sourcemaps.init()))
.pipe(debug({title: "Single style:"})) .pipe(debug({title: "Single style:"}))
.pipe(sass()) .pipe(sass())
......
This diff is collapsed.
...@@ -10,8 +10,8 @@ $border-radius: 3px !default; ...@@ -10,8 +10,8 @@ $border-radius: 3px !default;
display: block; display: block;
width: 100%; width: 100%;
max-height: 50rem; max-height: 50rem;
overflow-x: auto;
padding: 1em; padding: 1em;
overflow-x: auto;
background-color: $gray-lightest; background-color: $gray-lightest;
border-radius: $border-radius; border-radius: $border-radius;
border: 1px solid $gray-lighter; border: 1px solid $gray-lighter;
...@@ -22,5 +22,6 @@ $border-radius: 3px !default; ...@@ -22,5 +22,6 @@ $border-radius: 3px !default;
display: block; display: block;
padding: 0; padding: 0;
white-space: pre; white-space: pre;
background-color: transparent;
} }
} }
...@@ -51,3 +51,8 @@ select, ...@@ -51,3 +51,8 @@ select,
textarea { textarea {
touch-action: manipulation; touch-action: manipulation;
} }
img {
max-width: 100%;
height: auto;
}
...@@ -101,7 +101,7 @@ h6 { ...@@ -101,7 +101,7 @@ h6 {
margin-bottom: ($line-height / 2); margin-bottom: ($line-height / 2);
} }
.p, // .p,
p, p,
ul, ul,
ol, ol,
...@@ -121,7 +121,7 @@ address { ...@@ -121,7 +121,7 @@ address {
ul, ul,
ol { ol {
padding-left: 1.8em; padding-left: 1.2em;
} }
ol ol, ol ol,
...@@ -133,7 +133,7 @@ ul ol { ...@@ -133,7 +133,7 @@ ul ol {
} }
li { li {
line-height: $line-height; line-height: inherit;
} }
dt { dt {
...@@ -185,38 +185,9 @@ abbr[title] { ...@@ -185,38 +185,9 @@ abbr[title] {
} }
blockquote { blockquote {
padding: 0 0 0 0.5em; padding: 0;
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
border-left: 1px solid $border-color;
@media (min-width: $screen-sm) {
padding: 0 0 0 1.8em;
margin-left: 0;
border-left-width: 5px;
}
p,
ul,
ol {
&:first-child {
margin-top: 0;
}
&:last-child {
margin-bottom: 0;
}
}
footer {
text-align: right;
color: $gray;
// &:before {
// content: '— ';
// }
}
} }
code, code,
...@@ -227,9 +198,9 @@ samp { ...@@ -227,9 +198,9 @@ samp {
} }
code { code {
padding: 0.06em 0.3em;
color: $text-color; color: $text-color;
background-color: $gray-lightest; background-color: $gray-lightest;
padding: 0.06em 0.3em;
border-radius: $border-radius; border-radius: $border-radius;
} }
...@@ -249,8 +220,4 @@ pre { ...@@ -249,8 +220,4 @@ pre {
width: 100%; width: 100%;
overflow-x: auto; overflow-x: auto;
tab-size: 2; tab-size: 2;
code {
background-color: transparent;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment