diff options
Diffstat (limited to 'css/vote.css')
-rw-r--r-- | css/vote.css | 202 |
1 files changed, 202 insertions, 0 deletions
diff --git a/css/vote.css b/css/vote.css index 88d43cad..ada22a3a 100644 --- a/css/vote.css +++ b/css/vote.css @@ -1,13 +1,21 @@ #content { display: flex; } +<<<<<<< HEAD .row { +======= +.flex-row { +>>>>>>> master display: flex; flex-direction: row; flex-grow: 1; align-items: center; } +<<<<<<< HEAD .column { +======= +.flex-column { +>>>>>>> master display: flex; flex-direction: column; flex-grow: 0; @@ -20,6 +28,7 @@ color: red; font-weight: bold; } +<<<<<<< HEAD #breadcrump { flex-grow: 0; overflow: hidden; } @@ -29,6 +38,8 @@ div.crumb { white-space: nowrap; flex-shrink: 0; } +======= +>>>>>>> master .header { margin-left: 265px; padding: 0 17px; @@ -142,7 +153,11 @@ div.crumb { background-color: #e6f1f8; } #switchDetails { +<<<<<<< HEAD margin-right: 6px; } +======= + margin-right: 32px; } +>>>>>>> master .button.details .badge { position: relative; @@ -187,6 +202,7 @@ div.crumb { .authorRow .author.external > input { width: 100%; } +<<<<<<< HEAD #app-sidebar .close.row { justify-content: flex-end; margin: 8px 8px 0 0; } @@ -296,21 +312,146 @@ div.crumb { float: left; margin-top: 10px; display: none; } +======= +.detailsView { + z-index: 1000 !important; } + .detailsView .close.flex-row { + justify-content: flex-end; + margin: 8px 8px 0 0; } + .detailsView .header.flex-row { + flex-direction: row; + align-items: flex-start; + margin-left: 0; + margin-top: 0; } + .detailsView .pollInformation { + width: 220px; + flex-grow: 1; + flex-shrink: 1; + padding-right: 15px; } + .detailsView .pollInformation .authorRow .leftLabel { + margin-right: 4px; } + .detailsView .pollInformation .cloud { + margin: 4px 0; } + .detailsView .pollInformation .cloud > span { + color: #fff; + margin: 2px; + padding: 2px 4px; + border-radius: 3px; + float: left; + text-shadow: 1px 1px #666; + background-color: #aaa; } + .detailsView .pollInformation .cloud .open { + background-color: #49bc49; } + .detailsView .pollInformation .cloud .expired { + background-color: #f45573; } + .detailsView .pollInformation .cloud .information { + background-color: #b19c3e; } + .detailsView #expired_info { + margin: 0 15px; } + .detailsView .pollActions { + display: flex; + flex-direction: column; + margin-right: 15px; } + .detailsView .pollActions .close { + margin: 15px; + background-position: right top; + height: 30px; } + .detailsView .pollActions > ul > li:focus, .detailsView .pollActions > ul > li:focus > a, .detailsView .pollActions > ul > li:hover, .detailsView .pollActions > ul > li:hover > a, .detailsView .pollActions > ul > li.active, .detailsView .pollActions > ul > li.active > a, .detailsView .pollActions > ul > li a.selected, .detailsView .pollActions > ul > li a.selected > a { + opacity: 1; + box-shadow: inset 2px 0 #0082c9; } + .detailsView .pollActions > ul > li > a[class*="icon-"], + .detailsView .pollActions > ul > li > ul > li > a[class*="icon-"], + .detailsView .pollActions > ul > li > a[style*="background-image"], + .detailsView .pollActions > ul > li > ul > li > a[style*="background-image"] { + padding-left: 44px; } + .detailsView .pollActions > ul > li > a, + .detailsView .pollActions > ul > li > ul > li > a { + background-size: 16px 16px; + background-position: 14px center; + background-repeat: no-repeat; + display: block; + justify-content: space-between; + line-height: 44px; + min-height: 44px; + padding: 0 12px; + overflow: hidden; + box-sizing: border-box; + white-space: nowrap; + text-overflow: ellipsis; + color: #000; + opacity: 0.57; + flex: 1 1 0; + z-index: 100; } + .detailsView .pollActions > ul > li a, + .detailsView .pollActions > ul > li .app-navigation-entry-deleted { + padding-left: 44px !important; } + .detailsView #commentsTabView .newCommentForm div.message:empty:before { + content: attr(data-placeholder); + color: grey; } + .detailsView #commentsTabView #commentBox { + border: 1px solid #dbdbdb; + border-radius: 3px; + padding: 7px 6px; + margin: 3px 3px 3px 40px; + cursor: text; } + .detailsView #commentsTabView .comment { + margin-bottom: 30px; } + .detailsView #commentsTabView .comment .comment-header { + background-color: #EEE; + border-bottom: 1px solid #DDD; + border-radius: 3px 3px 0 0; } + .detailsView #commentsTabView .comment .comment-date { + float: right; + color: #555; } + .detailsView #commentsTabView .comment .date { + position: absolute; + right: 0; + top: 5px; + opacity: .5; } + .detailsView #commentsTabView .message { + margin-left: 40px; + flex-grow: 1; + flex-shrink: 1; } + .detailsView #commentsTabView .new-comment .submitComment { + align-self: last baseline; + width: 30px; + margin: 0; + padding: 7px 9px; + background-color: transparent; + border: none; + opacity: .3; } + .detailsView #commentsTabView .new-comment .icon-loading-small { + float: left; + margin-top: 10px; + display: none; } +>>>>>>> master @media all and (max-width: 768px) { #app-content { position: relative !important; } } @media all and (max-width: 480px) { +<<<<<<< HEAD .row { flex-direction: column; } .row.user-cell, .row.counter, .row.counter .yes, .row.counter .no, .row.controls, .row.breadcrump, .row.submitPoll, .row.newCommentForm, .row.close { flex-direction: row; } .row.header { +======= + #votings { + padding: 0px 2px; } + + .flex-row { + flex-direction: column; } + .flex-row.user-cell, .flex-row.counter, .flex-row.counter .yes, .flex-row.counter .no, .flex-row.controls, .flex-row.breadcrump, .flex-row.submitPoll, .flex-row.newCommentForm, .flex-row.close { + flex-direction: row; } + .flex-row.header { +>>>>>>> master flex-grow: 1; margin-left: 0; margin-top: 44px; width: 120px; padding: 0 0 0 4px; } +<<<<<<< HEAD .row.header .vote { padding-right: 10px; } .row.header .vote.option { @@ -327,17 +468,40 @@ div.crumb { .row.user { display: none; } .row.current-user { +======= + .flex-row.header .vote { + padding-right: 10px; } + .flex-row.header .vote.option { + align-items: baseline; + width: 100%; + border-top: 1px solid #ddd; } + .flex-row.header .vote.time { + align-items: center; + width: 100%; + border-top: 1px solid #ddd; } + .flex-row.header .vote.time .counter { + flex-direction: column; + align-items: flex-end; } + .flex-row.user { + display: none; } + .flex-row.current-user { +>>>>>>> master display: flex; width: 44px; padding: 0; border: none; background-color: transparent; } +<<<<<<< HEAD .row.current-user .poll-cell { +======= + .flex-row.current-user .poll-cell { +>>>>>>> master border: none; border-radius: 0; border-top: 1px solid #ddd; background-color: transparent; padding: 0 2px; } +<<<<<<< HEAD .row.current-user .poll-cell.active.yes { background-image: url("../img/yes-vote-bordered.svg"); } .row.current-user .poll-cell.active.no { @@ -350,16 +514,42 @@ div.crumb { position: absolute; left: 22px; } .row.current-user .poll-cell, .row.current-user .toggle-cell { +======= + .flex-row.current-user .poll-cell.active.yes { + background-image: url("../img/yes-vote-bordered.svg"); } + .flex-row.current-user .poll-cell.active.no { + background-image: url("../img/no-vote-bordered.svg"); } + .flex-row.current-user .poll-cell.active.maybe { + background-image: url("../img/maybe-vote-bordered.svg"); } + .flex-row.current-user .poll-cell.active.unvoted { + background-image: url("../img/unvoted-vote-bordered.svg"); } + .flex-row.current-user .user-cell { + position: absolute; + left: 22px; } + .flex-row.current-user .poll-cell, .flex-row.current-user .toggle-cell { +>>>>>>> master width: 44px; height: 44px; background-color: transparent; } +<<<<<<< HEAD .column.table-body { flex-grow: 0; } .column.poll-cell, .column.table { flex-direction: row; align-items: center; } .column.vote.time { +======= + .description { + margin: 4px; } + + .flex-column.table-body { + flex-grow: 0; } + .flex-column.poll-cell, .flex-column.table { + flex-direction: row; + align-items: center; } + .flex-column.vote.time { +>>>>>>> master flex-direction: row; } .table { @@ -369,12 +559,20 @@ div.crumb { .submitPoll { border-top: 1px solid #ddd; +<<<<<<< HEAD box-shadow: 0px 0px 9px 2px #999999; +======= + box-shadow: 0 0 9px 2px #999999; +>>>>>>> master flex-wrap: wrap; align-items: center; position: fixed; background-color: #fff; bottom: 0; +<<<<<<< HEAD +======= + left: 0; +>>>>>>> master width: 100%; } .submitPoll .finish_vote { padding: 8px 8px; } @@ -387,7 +585,11 @@ div.crumb { height: 44px; width: unset; } +<<<<<<< HEAD #options.row { +======= + #options.flex-row { +>>>>>>> master flex-direction: column; width: 100%; } } @media all and (max-width: 320px) { |