diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:49:34 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:49:34 -0400 |
commit | 474a048ae4a4fae86e7fde93745f0ea79c7ed717 (patch) | |
tree | 63e87b93634d90c8236b09a02c19e37031d55304 /app/assets/stylesheets/custom.css.scss | |
parent | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (diff) | |
parent | 9531e27d6414ca1e3c9a81b1a98f0550d74fad1d (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/models/match.rb
Diffstat (limited to 'app/assets/stylesheets/custom.css.scss')
-rw-r--r-- | app/assets/stylesheets/custom.css.scss | 61 |
1 files changed, 42 insertions, 19 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index febcbb8..d7f1698 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -18,37 +18,60 @@ header > nav { } } + a, input[type="submit"] { @extend .btn; &.user { @extend .btn-info; } &.signup { @extend .btn-success; } - &.signin { @extend .btn-info; } + &.signin { @extend .btn-warning; } &.signout { @extend .btn-danger; } &.server { @extend .btn-danger; } + font-weight: bold !important; +} + + +input[type="text"], input[type="password"]{ + border: 3px inset #A5A5A5; + -webkit-box-shadow: + inset 0 0 8px rgba(0,0,0,0.1), + 0 0 16px rgba(0,0,0,0.1); + -moz-box-shadow: + inset 0 0 8px rgba(0,0,0,0.1), + 0 0 16px rgba(0,0,0,0.1); + box-shadow: + inset 0 0 8px rgba(0,0,0,0.1), + 0 0 16px rgba(0,0,0,0.1); + padding: 8px; + background: rgba(0,0,0,0.5); + margin: 0 0 5px 0; } p.errors { - background-color: #FCF8C7; + background-color: rgba(0,0,0,0.5);; color: red; border-radius: 7px; padding: 10px; } -#errorExplanation { - h2 { - font-size: 1em; - color: red; - font-weight: bold; - } - li { - font-size: 1em; - color: red; - font-style: italic; - } - -} - -#notice { - text-align: center; - font-weight: bold; +#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; + } }
\ No newline at end of file |