Skip to content

Commit

Permalink
refactor(sass): change styles paths
Browse files Browse the repository at this point in the history
  • Loading branch information
lugovsky committed Dec 15, 2015
1 parent 8497c8e commit a96f815
Show file tree
Hide file tree
Showing 23 changed files with 35 additions and 30 deletions.
4 changes: 2 additions & 2 deletions gulp/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions src/sass/common.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'theme/conf/variables';
@import 'theme/conf/mixins';
2 changes: 2 additions & 0 deletions src/sass/main.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
@import 'common';

// injector
// endinjector
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
29 changes: 29 additions & 0 deletions src/sass/theme/_mixins.scss → src/sass/theme/conf/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 0 additions & 28 deletions src/sass/theme/skins/skins.scss

This file was deleted.

0 comments on commit a96f815

Please sign in to comment.