diff options
| author | Patrick Davison <snapwilliam@gmail.com> | 2013-01-14 14:49:51 -0800 |
|---|---|---|
| committer | Patrick Davison <snapwilliam@gmail.com> | 2013-01-14 14:49:51 -0800 |
| commit | 59fc439d341900d99c00a31ff1653b274ba2a037 (patch) | |
| tree | 5bd4b89bb500bc5557750228030ee0f2b8e2fb6d /css/challenge.css | |
| parent | fab36d921f22cb5999357932785e03aa88269f8d (diff) | |
| parent | 532faa4d5cc5b20fba8422c87b0aac846874af43 (diff) | |
| download | pathery-59fc439d341900d99c00a31ff1653b274ba2a037.tar.xz | |
Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery
Conflicts:
css/challenge.css
Diffstat (limited to 'css/challenge.css')
| -rw-r--r-- | css/challenge.css | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/css/challenge.css b/css/challenge.css index ffcfe83..a7f7465 100644 --- a/css/challenge.css +++ b/css/challenge.css @@ -5,13 +5,32 @@ font-weight: bold; } #challenge_wrapper #challenges_listing { } -.challenge_complete { - color:green; +.challenge_ulist +{ + list-style-type:none; + padding-left:0px; + margin-left:0px; +} +.challenge_ulist li +{ + /* Replace the bullet-points with challenge complete/incomplete images */ + background-position: 0 5px; + background-repeat: no-repeat; + background-size: 28px 28px; + padding-left: 30px; + padding-top: 6px; +} +.challenge_ulist .challenge_complete +{ + background-image:url('../images/challenge_complete.png'); font-weight: normal; + color:#008000; } -.challenge_incomplete { +.challenge_ulist .challenge_incomplete +{ + background-image:url('../images/challenge_incomplete.png'); font-weight: bold; - color:red; + color:#DD1111; } .challenge_complete a { @@ -21,6 +40,7 @@ display: none; } +<<<<<<< HEAD .challengelist_map { float:left; padding: 15px; @@ -36,6 +56,8 @@ border-width: 0px 0px 1px 1px; } +======= +>>>>>>> origin/HEAD /** Challenge listing page **/ #challengelist_wrapper #challengelist {} #challengelist_wrapper #challengelist .challengelist_tier { @@ -57,4 +79,15 @@ height: 32px; background-image: url("../images/challenge_incomplete.png"); float: right; +} +.challengelist_map { + float:left; + padding: 15px; + background-color:#333; + margin: 20px; + border-radius:10px; + cursor:pointer; +} +.challengelist_map:hover { + background-color:#444; }
\ No newline at end of file |