Skip to content

Commit

Permalink
linting
Browse files Browse the repository at this point in the history
  • Loading branch information
Brendan Sudol committed Apr 21, 2016
1 parent 5391d04 commit ce8901d
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 81 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/_base.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
body { background-color: #f5f5f5; }
body { background-color: $body-color; }

.container {
margin: 0 auto;
Expand Down
32 changes: 16 additions & 16 deletions app/assets/stylesheets/_fonts.scss
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
@font-face {
font-family: "Source Sans Pro";
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 300;
src: font-url("sourcesanspro-light-webfont.eot?#iefix") format("embedded-opentype"), font-url("sourcesanspro-light-webfont.woff2") format("woff2"), font-url("sourcesanspro-light-webfont.woff") format("woff"), font-url("sourcesanspro-light-webfont.ttf") format("truetype");
src: font-url('sourcesanspro-light-webfont.eot?#iefix') format('embedded-opentype'), font-url('sourcesanspro-light-webfont.woff2') format('woff2'), font-url('sourcesanspro-light-webfont.woff') format('woff'), font-url('sourcesanspro-light-webfont.ttf') format('truetype');
}

@font-face {
font-family: "Source Sans Pro";
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
src: font-url("sourcesanspro-regular-webfont.eot?#iefix") format("embedded-opentype"), font-url("sourcesanspro-regular-webfont.woff2") format("woff2"), font-url("sourcesanspro-regular-webfont.woff") format("woff"), font-url("sourcesanspro-regular-webfont.ttf") format("truetype");
src: font-url('sourcesanspro-regular-webfont.eot?#iefix') format('embedded-opentype'), font-url('sourcesanspro-regular-webfont.woff2') format('woff2'), font-url('sourcesanspro-regular-webfont.woff') format('woff'), font-url('sourcesanspro-regular-webfont.ttf') format('truetype');
}

@font-face {
font-family: "Source Sans Pro";
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 400;
src: font-url("sourcesanspro-italic-webfont.eot?#iefix") format("embedded-opentype"), font-url("sourcesanspro-italic-webfont.woff2") format("woff2"), font-url("sourcesanspro-italic-webfont.woff") format("woff"), font-url("sourcesanspro-italic-webfont.ttf") format("truetype");
src: font-url('sourcesanspro-italic-webfont.eot?#iefix') format('embedded-opentype'), font-url('sourcesanspro-italic-webfont.woff2') format('woff2'), font-url('sourcesanspro-italic-webfont.woff') format('woff'), font-url('sourcesanspro-italic-webfont.ttf') format('truetype');
}

@font-face {
font-family: "Source Sans Pro";
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 700;
src: font-url("sourcesanspro-bold-webfont.eot?#iefix") format("embedded-opentype"), font-url("sourcesanspro-bold-webfont.woff2") format("woff2"), font-url("sourcesanspro-bold-webfont.woff") format("woff"), font-url("sourcesanspro-bold-webfont.ttf") format("truetype");
src: font-url('sourcesanspro-bold-webfont.eot?#iefix') format('embedded-opentype'), font-url('sourcesanspro-bold-webfont.woff2') format('woff2'), font-url('sourcesanspro-bold-webfont.woff') format('woff'), font-url('sourcesanspro-bold-webfont.ttf') format('truetype');
}

@font-face {
font-family: "Merriweather";
font-family: 'Merriweather';
font-style: normal;
font-weight: 300;
src: font-url("merriweather-light-webfont.eot?#iefix") format("embedded-opentype"), font-url("merriweather-light-webfont.woff2") format("woff2"), font-url("merriweather-light-webfont.woff") format("woff"), font-url("merriweather-light-webfont.ttf") format("truetype");
src: font-url('merriweather-light-webfont.eot?#iefix') format('embedded-opentype'), font-url('merriweather-light-webfont.woff2') format('woff2'), font-url('merriweather-light-webfont.woff') format('woff'), font-url('merriweather-light-webfont.ttf') format('truetype');
}

@font-face {
font-family: "Merriweather";
font-family: 'Merriweather';
font-style: normal;
font-weight: 400;
src: font-url("merriweather-regular-webfont.eot?#iefix") format("embedded-opentype"), font-url("merriweather-regular-webfont.woff2") format("woff2"), font-url("merriweather-regular-webfont.woff") format("woff"), font-url("merriweather-regular-webfont.ttf") format("truetype");
src: font-url('merriweather-regular-webfont.eot?#iefix') format('embedded-opentype'), font-url('merriweather-regular-webfont.woff2') format('woff2'), font-url('merriweather-regular-webfont.woff') format('woff'), font-url('merriweather-regular-webfont.ttf') format('truetype');
}

@font-face {
font-family: "Merriweather";
font-family: 'Merriweather';
font-style: italic;
font-weight: 400;
src: font-url("merriweather-italic-webfont.eot?#iefix") format("embedded-opentype"), font-url("merriweather-italic-webfont.woff2") format("woff2"), font-url("merriweather-italic-webfont.woff") format("woff"), font-url("merriweather-italic-webfont.ttf") format("truetype");
src: font-url('merriweather-italic-webfont.eot?#iefix') format('embedded-opentype'), font-url('merriweather-italic-webfont.woff2') format('woff2'), font-url('merriweather-italic-webfont.woff') format('woff'), font-url('merriweather-italic-webfont.ttf') format('truetype');
}

@font-face {
font-family: "Merriweather";
font-family: 'Merriweather';
font-style: normal;
font-weight: 700;
src: font-url("merriweather-bold-webfont.eot?#iefix") format("embedded-opentype"), font-url("merriweather-bold-webfont.woff2") format("woff2"), font-url("merriweather-bold-webfont.woff") format("woff"), font-url("merriweather-bold-webfont.ttf") format("truetype");
src: font-url('merriweather-bold-webfont.eot?#iefix') format('embedded-opentype'), font-url('merriweather-bold-webfont.woff2') format('woff2'), font-url('merriweather-bold-webfont.woff') format('woff'), font-url('merriweather-bold-webfont.ttf') format('truetype');
}
19 changes: 11 additions & 8 deletions app/assets/stylesheets/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ $maroon: #85144b !default;
$white: #fff !default;
$silver: #ddd !default;
$gray: #aaa !default;
$gray-light: #ddd !default;
$black: #111 !default;

$body-color: #f5f5f5 !default;

$font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif !default;
$line-height: 1.5 !default;
$bold-font-weight: bold !default;
Expand Down Expand Up @@ -49,15 +52,15 @@ $button-padding-x: 1rem !default;
$button-color: $white !default;
$button-background-color: $blue !default;

$darken-1: rgba(0,0,0,.0625) !default;
$darken-2: rgba(0,0,0,.125) !default;
$darken-3: rgba(0,0,0,.25) !default;
$darken-4: rgba(0,0,0,.5) !default;
$darken-1: rgba(0, 0, 0, .0625) !default;
$darken-2: rgba(0, 0, 0, .125) !default;
$darken-3: rgba(0, 0, 0, .25) !default;
$darken-4: rgba(0, 0, 0, .5) !default;

$lighten-1: rgba(255,255,255,.0625) !default;
$lighten-2: rgba(255,255,255,.125) !default;
$lighten-3: rgba(255,255,255,.25) !default;
$lighten-4: rgba(255,255,255,.5) !default;
$lighten-1: rgba(255, 255, 255, .0625) !default;
$lighten-2: rgba(255, 255, 255, .125) !default;
$lighten-3: rgba(255, 255, 255, .25) !default;
$lighten-4: rgba(255, 255, 255, .5) !default;

$border-width: 1px !default;
$border-radius: 3px !default;
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/application.css.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "fonts";
@import "variables";
@import 'fonts';
@import 'variables';

@import "basscss/basscss";
@import 'basscss/basscss';

@import "base";
@import "components/all";
@import 'base';
@import 'components/all';
10 changes: 7 additions & 3 deletions app/assets/stylesheets/components/_alert.scss
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.alert-success { background-color: #e7f4e4 }
.alert-danger { background-color: #f9dede }
.alert-info { background-color: #e1f3f8 }
$success: #e7f4e4;
$danger: #f9dede;
$info: #e1f3f8;

.alert-success { background-color: $success; }
.alert-danger { background-color: $danger; }
.alert-info { background-color: $info; }
8 changes: 3 additions & 5 deletions app/assets/stylesheets/components/_form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
margin-top: 1rem;
}

form button[type="submit"],
form input[type="submit"] {
[type="submit"] {
margin-bottom: 2rem;
padding-left: 2rem;
padding-right: 2rem;
margin-bottom: 2rem;
width: 100%;
}

@media #{$breakpoint-sm} {
form button[type="submit"],
form input[type="submit"] {
[type="submit"] {
width: auto;
}
}
10 changes: 5 additions & 5 deletions app/assets/stylesheets/components/_panel.scss
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.panel {
padding: 2rem;
background-color: $white;
border: 1px solid $gray-light;
margin-bottom: 2rem;
background-color: #fff;
border: 1px solid #ddd;
padding: 2rem;
}

.panel-heading {
padding: 1rem 0;
border-bottom: 1px solid $gray-light;
margin-bottom: 3rem;
border-bottom: 1px solid #ddd;
padding: 1rem 0;
text-align: center;
}

Expand Down
36 changes: 0 additions & 36 deletions app/assets/stylesheets/components/_spinner.scss
View file

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/stylesheets/components/all.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import 'panel';
@import 'form';
@import 'alert';
@import 'spinner';
2 changes: 1 addition & 1 deletion app/views/shared/_navigation_links.html.slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
.px2.right-align
= link_to t('upaya.links.sign_in'), new_user_session_path
' · 
= link_to t('upaya.links.sign_up'), new_user_registration_path
= link_to t('upaya.links.sign_up'), new_user_registration_path

0 comments on commit ce8901d

Please sign in to comment.