diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-23 13:19:56 -0400 |
commit | 9d6dc1e5959590eeca5f9ea19cf731d73c735bd6 (patch) | |
tree | fd135e0f543a7f78388c91992fcfa85b5b7564dd /app/assets/stylesheets | |
parent | b2ceff6667461a6db587c4077ef56bdb4fe9f44b (diff) | |
parent | 21d6ddb3b2e85fa24f331dbf547133a34b0d37bd (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/custom.css.scss | 71 | ||||
-rw-r--r-- | app/assets/stylesheets/search.css.scss | 11 |
2 files changed, 38 insertions, 44 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index d7f1698..d299dda 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -31,19 +31,14 @@ a, input[type="submit"] { input[type="text"], input[type="password"]{ + -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); + 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; + padding: 8px; + background: rgba(0,0,0,0.5); + margin: 0 0 5px 0; } p.errors { @@ -54,24 +49,34 @@ p.errors { } #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 + 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; + } +} + +// Limitation: Only one box can be expanded at a time +.collapsible { + .collapsed { display: block; } + .expanded { display: none; } + &:target { + .collapsed { display: none; } + .expanded { display: block; } + } +} diff --git a/app/assets/stylesheets/search.css.scss b/app/assets/stylesheets/search.css.scss index 69cd1ad..22fd394 100644 --- a/app/assets/stylesheets/search.css.scss +++ b/app/assets/stylesheets/search.css.scss @@ -1,14 +1,3 @@ // Place all the styles related to the search controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ - -#search-down { - text-align: center; - cursor: pointer; - text-decoration: underline; -} - - -#advanced-search { - display: none; -}
\ No newline at end of file |