refactor(sass): change styles paths

pull/3/head
Vladimir Lugovsky 2015-12-15 21:06:42 +03:00
parent 8497c8e07e
commit a96f81557e
23 changed files with 35 additions and 30 deletions

View File

@ -26,13 +26,13 @@ var buildStyles = function() {
};
var injectFiles = gulp.src([
path.join(conf.paths.src, '/sass/**/_*.scss')
path.join(conf.paths.src, '/sass/**/_*.scss'),
'!' + path.join(conf.paths.src, '/sass/theme/conf/**/*.scss')
], { read: false });
var injectOptions = {
transform: function(filePath) {
filePath = filePath.replace(conf.paths.src + '/sass/', '');
console.log(filePath);
return '@import "' + filePath + '";';
},
starttag: '// injector',

2
src/sass/common.scss Normal file
View File

@ -0,0 +1,2 @@
@import 'theme/conf/variables';
@import 'theme/conf/mixins';

View File

@ -1,2 +1,4 @@
@import 'common';
// injector
// endinjector

View File

@ -50,4 +50,33 @@
&:-ms-input-placeholder {
color: $color;
}
}
@mixin overrideColors($color) {
color: $color;
p,.pie-charts,.panel-heading>.dropdown .dropdown-toggle, .panel-title, .panel-title>.small, .panel-title>.small>a, .panel-title>a, .panel-title>small, .panel-title>small>a,.traffic-text span, .form-group label {
color: $color;
}
.traffic-text {
color: $warning;
}
.feed-message .message-time, .text-muted {
color: darken($color, 20);
}
}
@mixin overridePanelBg($color, $borderColor, $dropdownColor) {
.panel, .panel:hover {
border-color: $borderColor;
background-color: $color;
}
.progress {
background: $color;
}
.dropdown-menu {
background-color: $dropdownColor;
}
}

View File

@ -1,28 +0,0 @@
@mixin overrideColors($color) {
color: $color;
p,.pie-charts,.panel-heading>.dropdown .dropdown-toggle, .panel-title, .panel-title>.small, .panel-title>.small>a, .panel-title>a, .panel-title>small, .panel-title>small>a,.traffic-text span, .form-group label {
color: $color;
}
.traffic-text {
color: $warning;
}
.feed-message .message-time, .text-muted {
color: darken($color, 20);
}
}
@mixin overridePanelBg($color, $borderColor, $dropdownColor) {
.panel, .panel:hover {
border-color: $borderColor;
background-color: $color;
}
.progress {
background: $color;
}
.dropdown-menu {
background-color: $dropdownColor;
}
}