diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-11 07:43:36 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-11 07:43:36 +0000 |
| commit | 598354eef7b05598299dc7eabbee0c7e147d40cc (patch) | |
| tree | b585f18d481d867426c10c7386a6f6a749b8ac51 | |
| parent | 311bd49e19b10ca70742bb4cd919dfec1800e23f (diff) | |
Added top info for user post, need background fixing
| -rw-r--r-- | assets/css/style.css | 100 | ||||
| -rw-r--r-- | assets/images/down_arrow.png | bin | 0 -> 7056 bytes | |||
| -rw-r--r-- | assets/images/up_arrow.png | bin | 0 -> 8987 bytes | |||
| -rw-r--r-- | assets/images/user-default.png | bin | 0 -> 8768 bytes | |||
| -rw-r--r-- | user_solutions.html | 28 |
5 files changed, 120 insertions, 8 deletions
diff --git a/assets/css/style.css b/assets/css/style.css index e88062c..a91d984 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -135,6 +135,7 @@ main{ flex-flow: column; /* Makes it grow vertically */ } +/*************************** SEARCH - index.html *********************************/ /* Changes - search is a flex container for h2 and bar, removed various attributes */ main .search { @@ -142,8 +143,6 @@ main .search { width: 60%; height: 100%; background-color: rgba(235,235,235, 0.6); - - } /* Changes - added h2 styiling for main */ @@ -207,19 +206,110 @@ main .search img { display: inline; } -main button#add-solution { +/*************************** END OF SEARCH - index.html *********************************/ + +/*************************** USER SOLUTIONS - user_solutions.html *********************************/ + + +main #solutions button#add-solution { display: inline-block; border-radius: 10px; - background-color: maroon; + background-color: #F79F79; color: white; width: 110px; } -main p { +main p#show-path { + display: inline-block; + margin-left: 30px; +} + +main #solutions { + margin-top: 2%; + text-align: left; + width: 86%; + height: 100%; + border-top: 1px solid black; + border-left: 1px solid black; + border-right: 1px solid black; + margin-left: 7%; +} + + +[id^="sol-"] { + border-radius: 10px; + padding-top: 30px; +} + +[id^="sol-"] .post-info { + background: #F79F79; +} + +[id^="sol-"] .left{ + float: left; + display: inline-block; +} + +[id^="sol-"] .right { + float: right; + display: inline-block; +} + +[id^="sol-"] img.user-image { + border-radius: 50%; + border: 2px solid darkgray; + margin-left: 25px; +} + +[id^="sol-"] img.user-image, [id^="sol-"] p.username { + display: inline-block; +} + +[id^="sol-"] p.username { + vertical-align: top; +} + +[id^="sol-"] p.num-upvotes, [id^="sol-"] p.num-downvotes, [id^="sol-"] button { display: inline-block; } +[id^="sol-"] button.upvote, [id^="sol-"] button.downvote { + background-color: transparent; + background-repeat:no-repeat; + border: none; + cursor:pointer; + overflow: hidden; + outline:none; +} + +[id^="sol-"] button.upvote img, [id^="sol-"] button.downvote img { + width: 30px; + height: 30px; +} + +[id^="sol-"] p.num-downvotes, [id^="sol-"] p.num-upvotes { + vertical-align: top; +} + + +[id^="sol-"] p.username { + margin-left: 10px; +} + +[id^="sol-"] p.num-downvotes { + margin-right: 25px; +} + + + + + + + + +/*************************** END OF USER SOLUTIONS - user_solutions.html *********************************/ + footer { background-color: #333333; bottom: 0; diff --git a/assets/images/down_arrow.png b/assets/images/down_arrow.png Binary files differnew file mode 100644 index 0000000..b194d18 --- /dev/null +++ b/assets/images/down_arrow.png diff --git a/assets/images/up_arrow.png b/assets/images/up_arrow.png Binary files differnew file mode 100644 index 0000000..8dc9dd4 --- /dev/null +++ b/assets/images/up_arrow.png diff --git a/assets/images/user-default.png b/assets/images/user-default.png Binary files differnew file mode 100644 index 0000000..2ae8ba2 --- /dev/null +++ b/assets/images/user-default.png diff --git a/user_solutions.html b/user_solutions.html index ee56557..f0261f0 100644 --- a/user_solutions.html +++ b/user_solutions.html @@ -40,10 +40,32 @@ <main> <!--made the id in to a class--> - <div class='search solutions'> + <div class='search solutions-container'> - <button id="add-solution"><h3>Add a solution</h3></button> - <p id="show-path">CSC148 > Winter 2015 > Question 1</p> + <div id="solutions"> + <button id="add-solution"><h3>Add a solution</h3></button> + <p id="show-path">CSC148 > Winter 2015 > Question 1</p> + + <section id="sol-1"> + <div class="post-info"> + <div class="left"> + <img class="user-image" src="assets/images/user-default.png"> + <p class="username">jSmith123</p> + </div> + + <div class="right"> + <button class="upvote"><img src="assets/images/up_arrow.png"></button> + <p class="num-upvotes">3</p> + <button class="downvote"><img src="assets/images/down_arrow.png"></button> + <p class="num-downvotes">-1</p> + </div> + </div> + + </section> + + + </div> + </div> |
