remotes/origin/mitri4
Dmitriy Shesterkin 9 years ago
parent 72e2fca7a9
commit 0f571d03cb
  1. 2
      batiskaf/templates/jinja2/base.jinja
  2. 27
      gulpfile.js
  3. 3
      package.json
  4. 8
      static/less/_.css
  5. 4
      static/less/_.less
  6. 6
      static/less/_.min.css

@ -17,7 +17,7 @@
<link href='/static/favicon.ico?v=1' type='image/x-icon' rel='shortcut icon'/> <link href='/static/favicon.ico?v=1' type='image/x-icon' rel='shortcut icon'/>
<link href="/static/bower_components/Bootflat/css/bootstrap.min.css" rel="stylesheet"> <link href="/static/bower_components/Bootflat/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/bower_components/Bootflat/bootflat/css/bootflat.min.css" rel="stylesheet"> <link href="/static/bower_components/Bootflat/bootflat/css/bootflat.min.css" rel="stylesheet">
<link href="/static/less/_.css?v=14" rel="stylesheet"> <link href="/static/less/_.min.css?v=1" rel="stylesheet">
<link href="/static/css/select2.min.css" rel="stylesheet"> <link href="/static/css/select2.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="/static/bower_components/sweetalert/lib/sweet-alert.css"> <link rel="stylesheet" type="text/css" href="/static/bower_components/sweetalert/lib/sweet-alert.css">
<link rel="stylesheet" href="/static/js/mp/dist/magnific-popup.css"> <link rel="stylesheet" href="/static/js/mp/dist/magnific-popup.css">

@ -3,18 +3,35 @@
const gulp = require('gulp'); const gulp = require('gulp');
// All of your plugins // All of your plugins
const less = require('gulp-less'); const less = require('gulp-less'),
autoprefixer = require('gulp-autoprefixer'),
cleanCSS = require('gulp-clean-css'),
rename = require('gulp-rename');
// Compile css from less // Compile css from less
gulp.task('less', function () { gulp.task('less', () => {
return gulp.src('static/less/_.less') return gulp.src('static/less/_.less')
.pipe(less()) .pipe(less())
.pipe(autoprefixer({
browsers: ['last 2 versions']
}))
.pipe(gulp.dest('static/less/')); .pipe(gulp.dest('static/less/'));
}); });
// Watch files for changes gulp.task('minify-css',()=> {
gulp.task('watch', function () { return gulp.src('static/less/_.css')
gulp.watch('static/less/**/*.less', ['less']); .pipe(cleanCSS({
compatibility: 'ie8',
specialComments: false }))
.pipe(rename('_.min.css'))
.pipe(gulp.dest('static/less/'));
}); });
// Watch files for changes
gulp.task('watch', () => gulp.watch('static/less/**/*.less', ['less']));
gulp.task('default', () => gulp.run('less', 'minify-css','watch'));
gulp.task('build', () => gulp.run('less', 'minify-css'));

@ -15,7 +15,10 @@
"homepage": "https://bitbucket.org/spacenergy/batiskaf#readme", "homepage": "https://bitbucket.org/spacenergy/batiskaf#readme",
"devDependencies": { "devDependencies": {
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.1",
"gulp-clean-css": "^2.3.2",
"gulp-less": "^3.3.0", "gulp-less": "^3.3.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "^3.1.0" "gulp-sass": "^3.1.0"
} }
} }

@ -480,7 +480,6 @@ body,
color: #fff; color: #fff;
border-width: 0 1px 1px; border-width: 0 1px 1px;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
} }
.navbar .navbar-nav .open .dropdown-menu ul { .navbar .navbar-nav .open .dropdown-menu ul {
@ -532,7 +531,6 @@ a#order-call-link {
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
border: 0; border: 0;
-webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
} }
/* Copy-pasted from forms.less since we mixin the .form-inline styles. */ /* Copy-pasted from forms.less since we mixin the .form-inline styles. */
@ -601,7 +599,6 @@ a#order-call-link {
} }
.index-goods .thumbnail { .index-goods .thumbnail {
padding-bottom: 10px !important; padding-bottom: 10px !important;
-webkit-box-shadow: none;
box-shadow: none; box-shadow: none;
border: 0; border: 0;
} }
@ -683,8 +680,6 @@ body {
height: 360px !important; height: 360px !important;
} }
.navbar-inverse { .navbar-inverse {
background-image: -webkit-linear-gradient(top, #434a54 0%, #535b68 100%);
background-image: -o-linear-gradient(top, #434a54 0%, #535b68 100%);
background-image: linear-gradient(to bottom, #434a54 0%, #535b68 100%); background-image: linear-gradient(to bottom, #434a54 0%, #535b68 100%);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff434a54', endColorstr='#ff535b68', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff434a54', endColorstr='#ff535b68', GradientType=0);
@ -702,12 +697,9 @@ body {
} }
.navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a,
.navbar-inverse .navbar-nav > .active > a { .navbar-inverse .navbar-nav > .active > a {
background-image: -webkit-linear-gradient(top, #080808 0%, #0f0f0f 100%);
background-image: -o-linear-gradient(top, #080808 0%, #0f0f0f 100%);
background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%); background-image: linear-gradient(to bottom, #080808 0%, #0f0f0f 100%);
background-repeat: repeat-x; background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);
-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25); box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
} }
.navbar-inverse .navbar-brand, .navbar-inverse .navbar-brand,

@ -1,8 +1,8 @@
//@import "bootstrap.less"; //@import "bootstrap.less";
@import "../bower_components/bootstrap/less/variables.less"; @import "../bower_components/bootstrap/less/variables.less";
@import "../bower_components/bootstrap/less/mixins.less"; @import "../bower_components/bootstrap/less/mixins.less";
@import '../bower_components/colors/less/colors.less'; @import "../bower_components/colors/less/colors.less";
@import '../bower_components/yamm3/yamm/yamm.less'; @import "../bower_components/yamm3/yamm/yamm.less";
// include custom style // include custom style
@import "_brand"; @import "_brand";

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save