Skip to content

Commit

Permalink
Compiling scss as part of build rather than with compass.
Browse files Browse the repository at this point in the history 
Remove dependency on compass, add fourseven:scss (includes autoprefixer),
add reset package, delete compiled css, and some random scss cleanup.
  • Loading branch information
@anthonymayer
anthonymayer committed Nov 24, 2014
1 parent 3c9354e commit 30ca412
Show file tree
Hide file tree
Showing 23 changed files with 179 additions and 2,332 deletions.
3 changes: 3 additions & 0 deletions .meteor/packages
View file
Expand Up @@ -45,6 +45,9 @@ rajit:bootstrap3-datepicker
bengott:avatar
jparker:gravatar

# CSS reset (Must come before any other css)
ccan:cssreset

# Telescope Packages (Required)

telescope-base
Expand Down
2 changes: 2 additions & 0 deletions .meteor/versions
View file
Expand Up @@ -19,6 +19,7 @@ blaze-tools@1.0.1
blaze@2.0.3
boilerplate-generator@1.0.1
callback-hook@1.0.1
ccan:cssreset@1.0.0
check@1.0.2
chuangbo:cookie@1.1.0
chuangbo:marked@0.3.5
Expand All @@ -34,6 +35,7 @@ email@1.0.4
facebook@1.1.2
fastclick@1.0.1
follower-livedata@1.0.2
fourseven:scss@1.0.0
geojson-utils@1.0.1
handlebars@1.0.1
html-tools@1.0.2
Expand Down
893 changes: 0 additions & 893 deletions packages/telescope-theme-base/lib/client/css/screen.css
View file

This file was deleted.

12 changes: 6 additions & 6 deletions packages/telescope-theme-base/lib/client/scss/global/_forms.scss
View file
Expand Up @@ -77,13 +77,13 @@ form, .accounts-dialog{
width:100%;
font-size:14px;
@include border-box;
border:1px solid $grey;
@include single-transition(border-color, 500ms);
// @include box-shadow(inset 0px 0px 0px 1px black(0.2));
border: 1px solid $grey;
transition: $border-color, 500ms;
// box-shadow: inset 0px 0px 0px 1px black(0.2);
&:focus{
outline: none;
border-color:$red;
@include box-shadow(0px 0px 5px 0px rgba($red,0.3));
box-shadow: 0px 0px 5px 0px rgba($red,0.3);
}
&[type="number"]{
width: 30%;
Expand Down Expand Up @@ -157,7 +157,7 @@ input[type="search"]{
width: 200px!important;
padding:10px;
font-size:14px;
@include box-shadow(0 1px 1px black(0.15));
box-shadow: 0 1px 1px black(0.15);
}

.help-block{
Expand All @@ -168,7 +168,7 @@ input[type="search"]{
border: 1px solid #B5B0B0;
}
.comment-field{
margin-bottom: 10px;
margin-bottom: 10px;
}
.fieldset-heading{
padding-bottom: 5px;
Expand Down
16 changes: 8 additions & 8 deletions packages/telescope-theme-base/lib/client/scss/includes/_mixins.scss
View file
Expand Up @@ -27,10 +27,10 @@ $grid-margin: 10px;
@mixin vcenter {
position: relative;
top: 50%;
@include translateY(-50%);
transform: translateY(-50%);
}
@mixin animate($property: all){
@include single-transition($property, 300ms, 0ms, ease-out);
transition: $property, 300ms, 0ms, ease-out;
}
@mixin border-box{
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
Expand Down Expand Up @@ -111,21 +111,21 @@ $grid-margin: 10px;
.popover{
background:white;
border:1px solid $red;
@include border-radius(3px);
@include box-shadow(0px 1px 2px 0px black(0.25));
border-radius: 3px;
box-shadow: 0px 1px 2px 0px black(0.25);
z-index:100;
@include transition(all, 300ms);
transition: all, 300ms;
}
// .grid-block{
// background:#fff;
// @include border-radius(3px);
// border-radius: 3px;
// // border:1px solid $light-blue;
// padding:$grid-padding;
// margin-bottom:$grid-margin;
// @include box-shadow(0 1px 1px black(0.15));
// box-shadow: 0 1px 1px black(0.15);
// }
.has-shadow{
@include box-shadow(0 1px 1px black(0.15));
box-shadow: 0 1px 1px black(0.15);
}
.cf{
@include cf;
Expand Down
5 changes: 0 additions & 5 deletions packages/telescope-theme-base/lib/client/scss/screen.scss
View file
@@ -1,8 +1,3 @@
@import "compass/reset";
// @import "global/normalize";

@import "compass/css3";

// Includes

@import "includes/breakpoints";
Expand Down
4 changes: 2 additions & 2 deletions packages/telescope-theme-base/lib/client/scss/specific/_dropdown.scss
View file
Expand Up @@ -33,8 +33,8 @@
background:white;
padding:10px;
min-width:140px;
@include border-radius(3px);
@include box-shadow(0 1px 3px black(0.35));
border-radius: 3px;
box-shadow: 0 1px 3px black(0.35);
list-style-type: none;
li{
padding-bottom: 10px;
Expand Down
4 changes: 2 additions & 2 deletions packages/telescope-theme-base/lib/client/scss/specific/_layout.scss
View file
@@ -1,6 +1,6 @@
*, *:before, *:after {
@include box-sizing(border-box);
line-height: 1.5;
box-sizing: border-box;
line-height: 1.5;
}

html, body, .outer-wrapper{
Expand Down
4 changes: 2 additions & 2 deletions packages/telescope-theme-base/lib/client/scss/specific/_mobile_nav.scss
View file
Expand Up @@ -23,12 +23,12 @@ $mobile-nav-width: 200px;
bottom: 0px;
background:#444;
color:white;
@include box-shadow(inset -3px 0px 7px black(0.5));
box-shadow: inset -3px 0px 7px black(0.5);
z-index: 100;
}

.mobile-nav, .inner-wrapper{
@include single-transition(all, 300ms, ease-out, 0ms);
transition: all, 300ms, ease-out, 0ms;
}

.inner-wrapper{
Expand Down
8 changes: 4 additions & 4 deletions packages/telescope-theme-base/lib/client/scss/specific/_users.scss
View file
@@ -1,15 +1,15 @@
.user-list, .user-table{
font-size: 13px;
font-size: 13px;
.user{
.user-avatar{
height:30px;
width:30px;
background-size: 30px 30px;
display:block;
@include border-radius(30px);
border-radius: 30px;
}
.posts-list{

}
}
}
Expand All @@ -26,7 +26,7 @@
&:last-child{
margin-right: 0;
}
}
}
.filter{
float: left;
}
Expand Down
40 changes: 34 additions & 6 deletions packages/telescope-theme-base/package.js
View file
Expand Up @@ -2,10 +2,38 @@ Package.describe({summary: "Telescope base theme"});

Package.onUse(function (api) {

api.use(['telescope-lib', 'telescope-base'], ['client', 'server']);

api.add_files([
'lib/client/css/screen.css',
], ['client']);

api.use(['telescope-lib', 'telescope-base', 'fourseven:scss'], ['client', 'server']);

api.addFiles(
[
// global
'lib/client/scss/global/_forms.scss',
'lib/client/scss/global/_links.scss',
'lib/client/scss/global/_main.scss',
'lib/client/scss/global/_markdown.scss',
'lib/client/scss/global/_tables.scss',
'lib/client/scss/global/_typography.scss',

// includes
'lib/client/scss/includes/_breakpoints.scss',
'lib/client/scss/includes/_colors.scss',
'lib/client/scss/includes/_mixins.scss',

// specific
'lib/client/scss/specific/_dropdown.scss',
'lib/client/scss/specific/_errors.scss',
'lib/client/scss/specific/_header.scss',
'lib/client/scss/specific/_layout.scss',
'lib/client/scss/specific/_loading.scss',
'lib/client/scss/specific/_mobile_nav.scss',
'lib/client/scss/specific/_notifications.scss',
'lib/client/scss/specific/_posts.scss',
'lib/client/scss/specific/_users.scss',

// screen
'lib/client/scss/screen.scss'
],
'client'
);

});
4 changes: 4 additions & 0 deletions packages/telescope-theme-base/versions.json
View file
Expand Up @@ -16,6 +16,10 @@
"ejson",
"1.0.4"
],
[
"fourseven:scss",
"1.0.0"
],
[
"geojson-utils",
"1.0.1"
Expand Down
1,314 changes: 0 additions & 1,314 deletions packages/telescope-theme-hubble/lib/client/css/screen.css
View file

This file was deleted.

24 changes: 12 additions & 12 deletions packages/telescope-theme-hubble/lib/client/scss/modules/_comments.scss
View file
@@ -1,15 +1,15 @@
.queue-container{
position:relative;
height:0px;
@include single-transition(ease-out, opacity, 400ms, 0ms);
transition: ease-out, opacity, 400ms, 0ms;
ul{
position:absolute;
// right:0;
margin-left:100%;
left:10px;
top:-30px;
// @include box-shadow(0 1px 1px black(0.15));
@include border-radius(3px);
// box-shadow: 0 1px 1px black(0.15);
border-radius: 3px;
background: black(0.05);
padding:10px 0 0 10px;
max-width:120px;
Expand Down Expand Up @@ -37,7 +37,7 @@
height:30px;
width:30px;
background:$red;
@include border-radius(100px);
border-radius: 100px;
line-height:30px;
text-align:center;
position:relative;
Expand All @@ -50,7 +50,7 @@
display:block;
height:30px;
width:30px;
@include border-radius(100px);
border-radius: 100px;
background-size: 30px 30px;
// @extend .has-tooltip;
}
Expand All @@ -60,7 +60,7 @@
// @extend .grid-block;
// display:block;
// padding:3px 8px;

// white-space:nowrap;

// font-size:14px;
Expand All @@ -73,7 +73,7 @@
padding: 0;
background: none;
.comment-body{
@include single-transition(ease-out, opacity, 600ms, 0ms);
transition: ease-out, opacity, 600ms, 0ms;
opacity:1;
}
&.comment-queued{
Expand Down Expand Up @@ -128,13 +128,13 @@
.comment-content{
position:relative;
@extend .grid-block;
@include border-radius(0 3px 3px 3px);
border-radius: 0 3px 3px 3px;
font-size:14px;
.comment-main{
margin-left:50px;
}
.user-avatar{
@include border-radius(100px);
border-radius: 100px;
overflow:hidden;
position:block;
float:left;
Expand Down Expand Up @@ -175,19 +175,19 @@
left:-30px;
top:0px;
a{
@include border-radius(0 0 0 3px);
border-radius: 0 0 0 3px;
position:relative;
display:block;
height:30px;
width:30px;
// background:$light-blue;
background:white;
@include box-shadow(0 1px 1px black(0.15));
box-shadow: 0 1px 1px black(0.15);
overflow:hidden;
@include hide-text;
// border-right:1px solid $lightest-grey;
&.upvote{
@include border-radius(3px 0 0 0);
border-radius: 3px 0 0 0;
margin-bottom:1px;
}
i{
Expand Down

0 comments on commit 30ca412

Please sign in to comment.