-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #73 from StemboltHQ/add_csslint
Add scss_lint gem
- Loading branch information
Showing
8 changed files
with
54 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,3 +67,5 @@ end | |
gem "font-awesome-rails" | ||
|
||
gem 'timecop' | ||
|
||
gem 'scss_lint', require: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,22 @@ | ||
/* | ||
* This is a manifest file that'll be compiled into application.css, which will include all the files | ||
* listed below. | ||
* | ||
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, | ||
* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. | ||
* | ||
* You're free to add application-wide styles to this file and they'll appear at the bottom of the | ||
* compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS | ||
* files in this directory. Styles in this file should be added after the last require_* statement. | ||
* It is generally better to create a new file per style scope. | ||
* | ||
// This is a manifest file that'll be compiled into application.css, which will include all the files | ||
// listed below. | ||
// | ||
// Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, | ||
// or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. | ||
// | ||
// You're free to add application-wide styles to this file and they'll appear at the bottom of the | ||
// compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS | ||
// files in this directory. Styles in this file should be added after the last require_* statement. | ||
// It is generally better to create a new file per style scope. | ||
// | ||
|
||
*= require tether | ||
*= require font-awesome | ||
*= require_tree . | ||
*= require_self | ||
*/ | ||
//= require tether | ||
//= require font-awesome | ||
//= require_tree . | ||
//= require_self | ||
|
||
@import "bootstrap"; | ||
@import "font-awesome"; | ||
@import "session-access"; | ||
@import "user-bar"; | ||
@import "bets/display-bet"; | ||
@import 'bootstrap'; | ||
@import 'font-awesome'; | ||
@import 'session-access'; | ||
@import 'user-bar'; | ||
@import 'bets/display-bet'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,16 @@ | ||
.display-bet{ | ||
.card-header{ | ||
background-color: #292b2c; | ||
$white-colour: #fff; | ||
$display-bet-colour: #292b2c; | ||
|
||
.display-bet { | ||
.card-header { | ||
background-color: $display-bet-colour; | ||
} | ||
.card-header-text{ | ||
color: white; | ||
|
||
.card-header-text { | ||
color: $white-colour; | ||
} | ||
.btn-full-width{ | ||
|
||
.btn-full-width { | ||
width: 100%; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
.resolve-bet-btn { | ||
width: 100%; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
.view-all-bets{ | ||
.view-button-text{ | ||
font-size: 0.8em; | ||
.view-all-bets { | ||
.view-button-text { | ||
font-size: .8em; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,15 @@ | ||
.sess-label{ | ||
width: 35%; | ||
.sess-label { | ||
float: left; | ||
width: 35%; | ||
} | ||
.sess-input-field{ | ||
width: 65%; | ||
height: 35px; | ||
|
||
.sess-input-field { | ||
float: left; | ||
} | ||
.sess-button{ | ||
height: 35px; | ||
width: 65%; | ||
} | ||
|
||
.sess-button { | ||
margin: auto 0 auto 35%; | ||
width: 65%; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
.user-bar{ | ||
img{ | ||
.user-bar { | ||
img { | ||
width: 50px; | ||
} | ||
} |