Skip to content

Commit

Permalink
Add sass config and compile
Browse files Browse the repository at this point in the history
  • Loading branch information
dhensby committed Sep 25, 2017
1 parent 010d751 commit 311842a
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
25 changes: 25 additions & 0 deletions config.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
require 'compass/import-once/activate'
# Require any additional compass plugins here.

# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "css"
sass_dir = "scss"
images_dir = "images"
javascripts_dir = "javascripts"

# You can select your preferred output style here (can be overridden via the command line):
output_style = :nested

# 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 sass scss && rm -rf sass && mv scss sass
7 changes: 1 addition & 6 deletions css/cms.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
width: 20px;
height: 20px;
margin-left: 4px;
cursor:pointer; }
cursor: pointer; }

.middleColumn.toggle-description-correct-middle {
margin-left: 0;
Expand All @@ -95,11 +95,9 @@

.custom-summary .ui-accordion-content .field {
margin: 0; }

.custom-summary .ui-accordion-content,
.custom-summary .ui-accordion-content .field {
padding: 0; }

.custom-summary .ui-icon-triangle-1-e {
background-position: -16px -128px; }

Expand All @@ -118,17 +116,14 @@

.blog-cms-categorisation .MergeActionReveal {
margin-left: 10px; }

.blog-cms-categorisation .toolbar--content {
margin-top: 0; }

.blog-cms-categorisation .MergeActionReveal:after {
content: '';
background: url("../images/move-icon.png");
display: inline-block;
height: 16px;
width: 16px;
margin-left: 4px; }

.blog-cms-categorisation button.action {
margin-left: 5px; }
4 changes: 3 additions & 1 deletion scss/cms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
width: 20px;
height: 20px;
margin-left: 4px;
cursor:pointer;
}

.middleColumn.toggle-description-correct-middle {
Expand All @@ -136,9 +137,10 @@
width: 416px;
}

label.right.toggle-description-correct-right {
.tab-content .field p.toggle-description-correct-right {
display: inline-block;
margin-left: 0;
padding-left: 0;
clear: none;
float: left;
}
Expand Down

0 comments on commit 311842a

Please sign in to comment.