Removed compass in favour of gulp

This commit is contained in:
micmania1 2016-06-02 16:00:28 +12:00 committed by Robbie Averill
parent f5974d80a2
commit 1e602a0ac1
7 changed files with 336 additions and 359 deletions

3
.gitignore vendored
View File

@ -1,5 +1,6 @@
.ssh/* .ssh/*
.bash* .bash*
.profile .profile
vendor/* /vendor/*
.sass-cache/* .sass-cache/*
/node_modules/

View File

@ -1,23 +0,0 @@
# Require any additional compass plugins here.
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "css"
sass_dir = "scss"
javascripts_dir = "javascript"
# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed
# To enable relative paths to assets via compass helper functions. Uncomment:
relative_assets = true
# To disable debugging comments that display the original location of your selectors. Uncomment:
line_comments = false
# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass scss scss && rm -rf sass && mv scss sass

View File

@ -1,58 +1,43 @@
.no-sidebar .content-container.size3of4 { .no-sidebar .content-container.size3of4 {
width: 75%; width: 75%; }
}
.blog-entry .post-image img { .blog-entry .post-image img {
width: 98.75%; width: 98.75%; }
}
.blog-sidebar .WidgetHolder ul { .blog-sidebar .WidgetHolder ul {
margin-left: 0; margin-left: 0; }
} .blog-sidebar .WidgetHolder ul li {
.blog-sidebar .WidgetHolder ul li { list-style-type: none; }
list-style-type: none;
}
ul.blogTagCloud { ul.blogTagCloud {
list-style-type: none; list-style-type: none;
clear: both; clear: both; }
} ul.blogTagCloud li {
ul.blogTagCloud li {
float: left;
display: inline;
padding-right: 8px;
}
ul.blogTagCloud li a span {
float: left; float: left;
line-height: 30px; text-align: center; display: inline;
padding: 0px; padding-right: 8px; }
} ul.blogTagCloud li a span {
ul.blogTagCloud .tagCount10 { float: left;
font-size: 26pt; line-height: 30px;
} text-align: center;
ul.blogTagCloud .tagCount9 { padding: 0px; }
font-size: 24pt; ul.blogTagCloud .tagCount10 {
} font-size: 26pt; }
ul.blogTagCloud .tagCount8 { ul.blogTagCloud .tagCount9 {
font-size: 22pt; font-size: 24pt; }
} ul.blogTagCloud .tagCount8 {
ul.blogTagCloud .tagCount7 { font-size: 22pt; }
font-size: 20pt; ul.blogTagCloud .tagCount7 {
} font-size: 20pt; }
ul.blogTagCloud .tagCount6 { ul.blogTagCloud .tagCount6 {
font-size: 18pt; font-size: 18pt; }
} ul.blogTagCloud .tagCount5 {
ul.blogTagCloud .tagCount5 { font-size: 16pt; }
font-size: 16pt; ul.blogTagCloud .tagCount4 {
} font-size: 14pt; }
ul.blogTagCloud .tagCount4 { ul.blogTagCloud .tagCount3 {
font-size: 14pt; font-size: 12pt; }
} ul.blogTagCloud .tagCount2 {
ul.blogTagCloud .tagCount3 { font-size: 10pt; }
font-size: 12pt; ul.blogTagCloud .tagCount1 {
} font-size: 8pt; }
ul.blogTagCloud .tagCount2 {
font-size: 10pt;
}
ul.blogTagCloud .tagCount1 {
font-size: 8pt;
}

View File

@ -7,19 +7,12 @@
/* /*
* Sprite maps & Icons * Sprite maps & Icons
*/ */
.blog-icon-sprite, .gridfield-icon .blog-icon-timer { .gridfield-icon.blog-icon-timer {
background-image: url('../images/blog-icon-s0a5ab5f851.png'); background: url("../images/blog-icon/timer.png") center no-repeat; }
background-repeat: no-repeat;
}
.gridfield-icon .blog-icon-timer {
background-position: 0 0;
}
#FeaturedImage .middleColumn { #FeaturedImage .middleColumn {
clear: none; clear: none;
float: left; float: left; }
}
.blog-admin-sidebar { .blog-admin-sidebar {
width: 280px; width: 280px;
@ -28,60 +21,46 @@
position: absolute; position: absolute;
right: 0px; right: 0px;
bottom: 0px; bottom: 0px;
height: 100%; height: 100%; }
} .blog-admin-sidebar .cms-panel-toggle a {
.blog-admin-sidebar .cms-panel-toggle a { text-align: left; }
text-align: left; .blog-admin-sidebar ~ .blog-admin-outer {
} width: 100%;
.blog-admin-sidebar ~ .blog-admin-outer { padding-right: 280px;
width: 100%; position: absolute;
padding-right: 280px; height: 100%;
position: absolute; overflow-y: hidden;
height: 100%; overflow-x: hidden;
overflow-y: hidden; box-sizing: border-box; }
overflow-x: hidden; .blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset {
box-sizing: border-box; position: relative;
} overflow: auto;
.blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset { height: 100%;
position: relative; width: 100%; }
overflow: auto; .blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset #Title label {
height: 100%; float: none; }
width: 100%; .blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset #Title .middleColumn, .blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset #Title input {
} width: 100%;
.blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset #Title label { max-width: 100%;
float: none; margin-left: 0; }
} .blog-admin-sidebar .cms-content-view > .field + .field {
.blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset #Title .middleColumn, .blog-admin-sidebar ~ .blog-admin-outer > .ss-tabset #Title input { margin-top: 10px; }
width: 100%; .blog-admin-sidebar .cms-content-view > .field.urlsegment .preview {
max-width: 100%; padding-top: 0;
margin-left: 0; line-height: 25px; }
} .blog-admin-sidebar .cms-content-view > .field.urlsegment .edit {
.blog-admin-sidebar .cms-content-view > .field + .field { float: right; }
margin-top: 10px; .blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn > .date {
} width: 60%; }
.blog-admin-sidebar .cms-content-view > .field.urlsegment .preview { .blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn > .time {
padding-top: 0; width: 36%;
line-height: 25px; float: right; }
} .blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn .middleColumn, .blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn input {
.blog-admin-sidebar .cms-content-view > .field.urlsegment .edit { width: 100%; }
float: right; .blog-admin-sidebar.collapsed ~ .blog-admin-outer {
} padding-right: 41px; }
.blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn > .date { .blog-admin-sidebar.cms-content-tools .cms-panel-content {
width: 60%; width: auto; }
}
.blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn > .time {
width: 36%;
float: right;
}
.blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn .middleColumn, .blog-admin-sidebar .cms-content-view > .field.datetime > .middleColumn input {
width: 100%;
}
.blog-admin-sidebar.collapsed ~ .blog-admin-outer {
padding-right: 41px;
}
.blog-admin-sidebar.cms-content-tools .cms-panel-content {
width: auto;
}
.toggle-description { .toggle-description {
text-indent: -1000000px; text-indent: -1000000px;
@ -89,63 +68,53 @@
background: url("../images/information.png") no-repeat center center; background: url("../images/information.png") no-repeat center center;
width: 20px; width: 20px;
height: 20px; height: 20px;
margin-left: 4px; margin-left: 4px; }
}
.middleColumn.toggle-description-correct-middle { .middleColumn.toggle-description-correct-middle {
margin-left: 0; margin-left: 0;
float: left; float: left;
width: 416px; width: 416px; }
}
label.right.toggle-description-correct-right { label.right.toggle-description-correct-right {
display: inline-block; display: inline-block;
margin-left: 0; margin-left: 0;
clear: none; clear: none;
float: left; float: left; }
}
.description.toggle-description-correct-description { .description.toggle-description-correct-description {
width: 416px; width: 416px;
padding: 12px 0; padding: 12px 0; }
}
.custom-summary .ui-accordion-content .field { .custom-summary .ui-accordion-content .field {
margin: 0; margin: 0; }
}
.custom-summary .ui-accordion-content, .custom-summary .ui-accordion-content,
.custom-summary .ui-accordion-content .field { .custom-summary .ui-accordion-content .field {
padding: 0; padding: 0; }
}
.custom-summary .ui-icon-triangle-1-e { .custom-summary .ui-icon-triangle-1-e {
background-position: -16px -128px; background-position: -16px -128px; }
}
.cms table.ss-gridfield-table tr td.MergeAction { .cms table.ss-gridfield-table tr td.MergeAction {
width: 225px; width: 225px; }
} .cms table.ss-gridfield-table tr td.MergeAction a {
.cms table.ss-gridfield-table tr td.MergeAction a { display: block;
display: block; height: 100%;
height: 100%; width: 100%; }
width: 100%; .cms table.ss-gridfield-table tr td.MergeAction select {
} width: 150px; }
.cms table.ss-gridfield-table tr td.MergeAction select {
width: 150px;
}
.cms-content-actions, .cms-content-actions,
.cms-preview-controls { .cms-preview-controls {
z-index: 999; z-index: 999; }
}
.blog-cms-categorisation .MergeActionReveal { .blog-cms-categorisation .MergeActionReveal {
margin-left: 10px; margin-left: 10px; }
}
.blog-cms-categorisation .MergeActionReveal:after { .blog-cms-categorisation .MergeActionReveal:after {
content: ''; content: '';
background: url("../images/move-icon.png"); background: url("../images/move-icon.png");
display: inline-block; display: inline-block;
height: 16px; height: 16px;
width: 16px; width: 16px;
margin-left: 4px; margin-left: 4px; }
}

17
gulpfile.js Normal file
View File

@ -0,0 +1,17 @@
var sass = require("gulp-sass");
var gulp = require("gulp");
var watch = require('gulp-watch');
gulp.task("scss", function () {
gulp.src("./scss/*.scss")
.pipe(sass().on('error', sass.logError))
.pipe(gulp.dest("./css"));
});
gulp.task('watch', ['scss'], function() {
gulp.watch('./scss/*.scss', ['scss']);
});
gulp.task('default', ['scss'], function() {
// noop
});

28
package.json Normal file
View File

@ -0,0 +1,28 @@
{
"name": "silverstripe-blog",
"version": "3.0.0",
"description": "Silverstripe blog module",
"main": "index.js",
"directories": {
"doc": "docs",
"test": "tests"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/silverstripe/silverstripe-blog.git"
},
"author": "",
"license": "BSD-3",
"bugs": {
"url": "https://github.com/silverstripe/silverstripe-blog/issues"
},
"homepage": "https://github.com/silverstripe/silverstripe-blog#readme",
"devDependencies": {
"gulp": "^3.9.1",
"gulp-sass": "^2.3.1",
"gulp-watch": "^4.3.6"
}
}

View File

@ -1,191 +1,191 @@
/** /**
* CMS Styles * CMS Styles
*/ */
/** /**
* Include Compass framework * Include Compass framework
*/ */
@import "compass"; // @import "compass";
/* /*
* Sprite maps & Icons * Sprite maps & Icons
*/ */
@import "compass/utilities/sprites/base"; // @import "compass/utilities/sprites/base";
@import "blog-icon/*.png"; // @import "blog-icon/*.png";
// buttons // buttons
.gridfield-icon { .gridfield-icon.blog-icon-timer {
@include all-blog-icon-sprites; background: url('../images/blog-icon/timer.png') center no-repeat;
} }
#FeaturedImage .middleColumn { #FeaturedImage .middleColumn {
clear: none; clear: none;
float: left; float: left;
} }
.blog-admin-sidebar { .blog-admin-sidebar {
width: 280px; width: 280px;
border-right: none; border-right: none;
border-left: 1px solid #C0C0C2; border-left: 1px solid #C0C0C2;
position: absolute; position: absolute;
right: 0px; right: 0px;
bottom: 0px; bottom: 0px;
height: 100%; height: 100%;
.cms-panel-toggle a { .cms-panel-toggle a {
text-align: left; text-align: left;
} }
~ .blog-admin-outer { ~ .blog-admin-outer {
width: 100%; width: 100%;
padding-right: 280px; padding-right: 280px;
position: absolute; position: absolute;
height: 100%; height: 100%;
overflow-y: hidden; overflow-y: hidden;
overflow-x: hidden; overflow-x: hidden;
box-sizing: border-box; box-sizing: border-box;
> .ss-tabset { > .ss-tabset {
position: relative; position: relative;
overflow: auto; overflow: auto;
height: 100%; height: 100%;
width: 100%; width: 100%;
#Title { #Title {
label { label {
float: none; float: none;
} }
.middleColumn, input { .middleColumn, input {
width: 100%; width: 100%;
max-width: 100%; max-width: 100%;
margin-left: 0; margin-left: 0;
} }
} }
} }
} }
.cms-content-view { .cms-content-view {
> .field { > .field {
+ .field { + .field {
margin-top: 10px; margin-top: 10px;
} }
&.urlsegment { &.urlsegment {
.preview { .preview {
padding-top: 0; padding-top: 0;
line-height: 25px; line-height: 25px;
} }
.edit { .edit {
float: right; float: right;
} }
} }
&.datetime { &.datetime {
> .middleColumn { > .middleColumn {
> .date { > .date {
width: 60%; width: 60%;
} }
> .time { > .time {
width: 36%; width: 36%;
float: right; float: right;
} }
.middleColumn, input { .middleColumn, input {
width: 100%; width: 100%;
} }
} }
} }
} }
} }
&.collapsed { &.collapsed {
~ .blog-admin-outer { ~ .blog-admin-outer {
padding-right: 41px; padding-right: 41px;
} }
} }
&.cms-content-tools { &.cms-content-tools {
.cms-panel-content { .cms-panel-content {
width: auto; width: auto;
} }
} }
} }
.toggle-description { .toggle-description {
text-indent: -1000000px; text-indent: -1000000px;
display: inline-block; display: inline-block;
background: url("../images/information.png") no-repeat center center; background: url("../images/information.png") no-repeat center center;
width: 20px; width: 20px;
height: 20px; height: 20px;
margin-left: 4px; margin-left: 4px;
} }
.middleColumn.toggle-description-correct-middle { .middleColumn.toggle-description-correct-middle {
margin-left: 0; margin-left: 0;
float: left; float: left;
width: 416px; width: 416px;
} }
label.right.toggle-description-correct-right { label.right.toggle-description-correct-right {
display: inline-block; display: inline-block;
margin-left: 0; margin-left: 0;
clear: none; clear: none;
float: left; float: left;
} }
.description.toggle-description-correct-description { .description.toggle-description-correct-description {
width: 416px; width: 416px;
padding: 12px 0; padding: 12px 0;
} }
.custom-summary { .custom-summary {
.ui-accordion-content .field { .ui-accordion-content .field {
margin: 0; margin: 0;
} }
.ui-accordion-content, .ui-accordion-content,
.ui-accordion-content .field { .ui-accordion-content .field {
padding: 0; padding: 0;
} }
.ui-icon-triangle-1-e { .ui-icon-triangle-1-e {
background-position: -16px -128px; background-position: -16px -128px;
} }
} }
.cms table.ss-gridfield-table { .cms table.ss-gridfield-table {
tr td.MergeAction { tr td.MergeAction {
width: 225px; width: 225px;
a { a {
display: block; display: block;
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
select { select {
width: 150px; width: 150px;
} }
} }
} }
.cms-content-actions, .cms-content-actions,
.cms-preview-controls { .cms-preview-controls {
z-index: 999; z-index: 999;
} }
.blog-cms-categorisation { .blog-cms-categorisation {
.MergeActionReveal { .MergeActionReveal {
margin-left: 10px; margin-left: 10px;
} }
.MergeActionReveal:after { .MergeActionReveal:after {
content: ''; content: '';
background: url('../images/move-icon.png'); background: url('../images/move-icon.png');
display: inline-block; display: inline-block;
height: 16px; height: 16px;
width: 16px; width: 16px;
margin-left: 4px; margin-left: 4px;
} }
} }