diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
commit | 0d3a1f6030eec5631892ec733ec75001bfe2f9ff (patch) | |
tree | 00ad96fd52bcdebc2e96ebb3157e314b2466fc22 /app/assets | |
parent | 59b2dc33ea83d5d5a52a72d14213f564afe8f0ce (diff) | |
parent | 699bd065c06689a159c11ac3aacef6b34001617c (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/application.css | 13 | ||||
-rw-r--r-- | app/assets/stylesheets/custom.css.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 89 | ||||
-rw-r--r-- | app/assets/stylesheets/static.css.scss | 12 |
4 files changed, 114 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3192ec8..355c0d4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,5 +9,16 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self - *= require_tree . + *= require_tree + */ + +#query{ + background-color: #888; + border: 2px solid #ED9C28; + border-radius: 5px; + color: #FFF; + font-weight: bold; + height: 30px; + +}
\ No newline at end of file diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss new file mode 100644 index 0000000..b0692d8 --- /dev/null +++ b/app/assets/stylesheets/custom.css.scss @@ -0,0 +1 @@ +@import "bootstrap";
\ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss new file mode 100644 index 0000000..8279f4f --- /dev/null +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -0,0 +1,89 @@ +body { + background-color: #EEEEEE; + color: #333; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; + + h1, h2, h3, h4, h5{ + color: #0f0f0f; + } +} + +p, ol, ul, td { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +pre { + background-color: #eee; + padding: 10px; + font-size: 11px; +} + +a { + color: #000; + &:visited { + color: #666; + } + &:hover { + color: #fff; + background-color: #000; + } +} + +div { + &.field, &.actions { + margin-bottom: 10px; + } +} + +#notice { + color: green; +} + +.field_with_errors { + padding: 2px; + background-color: red; + display: table; +} + +#error_explanation { + width: 450px; + border: 2px solid red; + padding: 7px; + padding-bottom: 0; + margin-bottom: 20px; + background-color: #f0f0f0; + h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px; + margin-bottom: 0px; + background-color: #c00; + color: #fff; + } + ul li { + font-size: 12px; + list-style: square; + } +} + +hr { + -moz-border-bottom-colors: none; + -moz-border-image: none; + -moz-border-left-colors: none; + -moz-border-right-colors: none; + -moz-border-top-colors: none; + border-color: #999 -moz-use-text-color #FFFFFF; + border-style: solid none; + border-width: 1px 0; + margin: 18px 0; +} + +#footer{ + text-align: center; +} diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss new file mode 100644 index 0000000..9457e7f --- /dev/null +++ b/app/assets/stylesheets/static.css.scss @@ -0,0 +1,12 @@ +// Place all the styles related to the static controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: + +.jumbotron { + background-color: #FFF; + + p { + line-height: 1.5em; + } + +}
\ No newline at end of file |