Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/polls.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authordartcafe <github@dartcafe.de>2017-10-24 12:35:49 +0300
committerdartcafe <github@dartcafe.de>2017-10-24 12:35:49 +0300
commitf2c322c8d655ef05ad4deaf207855cc9a6c03bc3 (patch)
treef373055d627944484b8bdacfaa6fc1d7767c6830 /css
parent621a2eac8585e1bfcfdfcb3f1a005906a08c1b92 (diff)
some design changes
Diffstat (limited to 'css')
-rw-r--r--css/createpoll.css74
-rw-r--r--css/list.css177
-rw-r--r--css/list.scss10
-rw-r--r--css/main.css283
-rw-r--r--css/main.scss38
-rw-r--r--css/vendor/jquery.datetimepicker.css (renamed from css/jquery.datetimepicker.css)0
-rw-r--r--css/vote.css204
-rw-r--r--css/vote.scss5
8 files changed, 33 insertions, 758 deletions
diff --git a/css/createpoll.css b/css/createpoll.css
deleted file mode 100644
index 8100ff12..00000000
--- a/css/createpoll.css
+++ /dev/null
@@ -1,74 +0,0 @@
-.user-group-list {
- display:none;
- border:1px solid #ddd;
- margin:15px;
- padding:5px;
- border-radius:3px;
- max-height:150px;
- overflow-y:auto
-}
-#sec_name {
- display:none
-}
-.cl_access_item {
- padding:5px;
- background-color:white;
- color:#333;
- cursor:pointer
-}
-.cl_access_item:hover {
- background-color:#eee
-}
-.cl_access_item.selected {
- background-color:#409ae7;
- color:#fff
-}
-.cl_access_item.selected:hover {
- background-color:#ff6f6f;
- color:#fff;
- text-decoration:line-through
-}
-textarea {
- min-height:66px
-}
-.choices {
- margin-top:10px
-}
-.choices td {
- min-width:30px
-}
-table td {
- text-align:center
-}
-.text-row,.date-row {
- font-weight:bold;
- padding:2px 5px;
- background-color:#337ab7;
- color:#fff;
- text-align:left
-}
-.text-row:hover,.date-row:hover {
- background-color:#ff6f6f;
- text-decoration:line-through
-}
-#selected-dates-table tr:first-child td {
- font-weight:bold;
- padding:2px 5px;
- background-color:#337ab7;
- color:#fff
-}
-table .icon-close {
- cursor:pointer;
- background-color:#ffede9;
- padding:0 5px;
- background-image:url('../img/no-vote.svg')
-}
-table .icon-checkmark {
- cursor:pointer;
- background-color:#ebf5d6;
- padding:0 5px;
- background-image:url('../img/yes-vote.svg')
-}
-#expiration {
- max-width:200px
-}
diff --git a/css/list.css b/css/list.css
deleted file mode 100644
index bfbc6f29..00000000
--- a/css/list.css
+++ /dev/null
@@ -1,177 +0,0 @@
-.table,.row,.column {
- box-sizing:border-box;
- -webkit-box-sizing:border-box;
- -moz-box-sizing:border-box
-}
-.icon-polls {
- background-color:black;
- mask:url('../img/app-logo-polls.svg') no-repeat 50% 50%
-}
-.table {
- position:relative
-}
-.table.has-controls {
- top:44px
-}
-.row {
- display:flex;
- display:-webkit-flex;
- width:100%;
- padding-left:15px;
- padding-right:15px;
- line-height:2em;
- transition:background-color 0.3s ease;
- background-color:#fff;
- min-height:4em;
- border-bottom:1px solid #eee
-}
-.row.table-header .name,.row.table-header .description {
- padding-left:52px
-}
-.row.table-header .owner {
- padding-left:6px
-}
-.row.table-body:hover,.row.table-body:focus,.row.table-body:active,.row.table-body.mouseOver {
- transition:background-color 0.3s ease;
- background-color:#f8f8f8
-}
-.row.table-body .column.owner {
- display:flex
-}
-.row.table-body .column.owner .avatardiv {
- margin-right:4px
-}
-.row.table-body .icon-more {
- right:14px;
- opacity:0.3;
- cursor:pointer;
- height:44px;
- width:44px
-}
-.row.table-body .symbol {
- padding:2px
-}
-.row.table-header {
- color:#999
-}
-.wrapper {
- display:flex;
- display:-webkit-flex;
- align-items:center;
- position:relative
-}
-.column {
- padding:0 4px;
- overflow:hidden;
- white-space:nowrap;
- text-overflow:ellipsis;
- align-items:center;
- min-height:16px
-}
-.name {
- width:150px
-}
-.description {
- width:150px;
- color:#888
-}
-.owner {
- width:140px
-}
-.access {
- width:140px
-}
-.created {
- width:120px
-}
-.expiry {
- width:120px
-}
-.expiry.expired {
- color:red
-}
-.participants {
- width:80px
-}
-.participants div.partic_voted.icon-partic_yes {
- background-image:url('../img/yes-vote.svg')
-}
-.participants div.partic_voted.icon-partic_no {
- background-image:url('../img/no-vote.svg')
-}
-.participants div.partic_commented.icon-commented_yes {
- background-image:url('../img/yes-comment.svg')
-}
-.participants div.partic_commented.icon-commented_no {
- background-image:url('../img/no-comment.svg')
-}
-.actions {
- width:44px;
- position:relative;
- overflow:initial
-}
-.thumbnail {
- background-size:32px;
- width:44px;
- height:44px;
- padding-right:4px;
- background-repeat:no-repeat;
- background-position:center
-}
-.thumbnail.progress.partic_yes,.thumbnail.endless.partic_yes {
- background-image:url('../img/open-voted-vote.svg')
-}
-.thumbnail.progress.partic_no,.thumbnail.endless.partic_no {
- background-image:url('../img/open-unvoted-vote.svg')
-}
-.thumbnail.expired.partic_yes {
- background-image:url('../img/expired-voted-vote.svg')
-}
-.thumbnail.expired.partic_no {
- background-image:url('../img/expired-unvoted-vote.svg')
-}
-.options,.participants {
- display:flex;
- flex-direction:row;
- -webkit-flex-direction:row
-}
-.group-1,.group-1-1,.group-master {
- flex-grow:1;
- -webkit-flex-grow:1
-}
-.group-1-1 {
- flex-direction:column;
- -webkit-flex-direction:column;
- width:150px
-}
-.group-1-1 > div {
- width:100%
-}
-@media all and (max-width:868px) {
- .group-1 {
- width:238px
- }
- .group-2-1,.group-2-2 {
- flex-direction:column;
- -webkit-flex-direction:column
- }
- .access,.created {
- width:140px
- }
- .expiry,.participants {
- width:120px
- }
-}
-@media all and (max-width:668px) {
- .row {
- padding:0
- }
- .group-2-1 {
- display:none
- }
-}
-@media all and (max-width:548px) {
- .group-2 {
- display:none
- }
-}
diff --git a/css/list.scss b/css/list.scss
index 4c269297..a8b44f91 100644
--- a/css/list.scss
+++ b/css/list.scss
@@ -30,10 +30,6 @@ $mediabreak-2: ($group-1-width + $group-2-width + $row-padding * 2);
$mediabreak-3: $group-1-width + $owner-width + max($group-2-1-width, $group-2-2-width) + $row-padding *2 ;
-.table, .row, .column {
- box-sizing: border-box; -webkit-box-sizing: border-box; -moz-box-sizing: border-box;
-}
-
/* #controls h2 {
float: left;
padding: 15px 15px 0 15px;
@@ -45,12 +41,6 @@ $mediabreak-3: $group-1-width + $owner-width + max($group-2-1-width, $group-2-2-
mask: url('../img/app-logo-polls.svg') no-repeat 50% 50%;
}
-.table {
- position: relative;
- &.has-controls {
- top: 44px;
- }
-}
.row {
display: flex; display: -webkit-flex;
diff --git a/css/main.css b/css/main.css
deleted file mode 100644
index cb53d479..00000000
--- a/css/main.css
+++ /dev/null
@@ -1,283 +0,0 @@
-h1 {
- font-size:1.8em;
- margin-bottom:5px
-}
-#app header {
- padding-top:44px
-}
-.row:after {
- content:".";
- display:block;
- height:0;
- clear:both;
- visibility:hidden
-}
-.col-100 {
- width:100%;
- padding:0px 15px
-}
-.col-50 {
- width:50%;
- float:left;
- padding:0px 15px
-}
-.col-70 {
- width:65%;
- float:left;
- padding:0px 15px
-}
-.col-30 {
- width:35%;
- float:left;
- padding:0px 15px
-}
-@media (max-width:992px) {
- .col-70,.col-30,.col-50 {
- float:none;
- width:100%
- }
-}
-#breadcrump {
- min-width:350px
-}
-input[type="text"] {
- display:block;
- width:100%
-}
-textarea {
- min-width:100%;
- max-width:100%
-}
-.form-actions {
- padding:15px
-}
-.goto_poll {
- width:100%
-}
-div.new_poll {
- width:100%
-}
-input.table_button {
- background-color:transparent;
- border:none;
- height:12px;
- width:12px;
- vertical-align:middle
-}
-div.scroll_div {
- width:100%;
- overflow-x:auto;
- overflow-y:hidden
-}
-div.scroll_div_dialog {
- width:100%;
- height:250px;
- overflow-y:auto
-}
-.bordered {
- border-left:1px solid #fff
-}
-tbody th {
- text-align:left
-}
-td.td_shown {
- visibility:visible
-}
-.td_hidden {
- visibility:hidden;
- visibility:collapse
-}
-.td_selected {
- background-color:#82de82
-}
-.td_deselected {
- background-color:white
-}
-.cl_with_border td {
- padding-right:15px;
- padding:1px;
- border-width:1px;
- border-style:solid;
- border-color:gray;
- -moz-border-radius:initial;
- text-align:center;
- vertical-align:bottom;
- cursor:pointer
-}
-.scrollable_table {
- table-layout:fixed
-}
-.desc {
- color:#888
-}
-.wordwrap {
- white-space:normal;
- word-wrap:break-word;
- word-break:normal
-}
-.cl_title {
- font-size:2em
-}
-.input_title {
- display:block;
- font-size:1.2em;
- margin-top:5px
-}
-.padded td {
- padding:10px
-}
-.userNameImg {
- vertical-align:middle;
- margin-right:5px;
- border-radius:16px
-}
-.noAvatar {
- color:#fff;
- font-weight:bold;
- text-align:center;
- line-height:32px;
- width:32px;
- height:32px;
- font-size:19px;
- display:inline-block
-}
-.cl_time_display {
- background-color:aqua;
- cursor:pointer
-}
-.cl_date_time_header:hover {
- background-color:red
-}
-.cl_hour,.cl_min {
- cursor:pointer;
- background-color:white
-}
-.cl_hour_selected,.cl_min_selected {
- background-color:#82de82
-}
-.cl_poll_url,.cl_date_time_header {
- cursor:pointer
-}
-.cl_pad_left {
- padding-left:30px
-}
-.cl_del_item {
- cursor:pointer;
- padding:0px 5px 0px 5px
-}
-.cl_del_item:hover {
- background-color:#ffccca
-}
-.cl_maybe:before,.cl_maybe:after {
- content:"?"
-}
-.win_row {
- color:#5ef56c;
- font-size:2em
-}
-.cl_user_comments {
- table-layout:fixed
-}
-.cl_user_comments td {
- text-align:left
-}
-.cl_user_comments th {
- word-wrap:break-word;
- vertical-align:top;
- text-align:center
-}
-.user_comment {
- font-size:0.9em
-}
-.user_comment {
- padding-bottom:10px
-}
-.user_comment_text {
- margin-top:-5px;
- margin-left:5px
-}
-#id_tab_total {
- height:2em;
- width:100%;
- text-align:center
-}
-#id_tab_total tr:nth-child(even) {
- color:#000
-}
-#id_cal_table td {
- padding:10px
-}
-#id_time_table td {
- padding:8px
-}
-#id_poss_table td {
- padding-left:2px
-}
-.input-group {
- position:relative;
- display:table;
- border-collapse:separate;
- width:100%
-}
-.input-group > input,.input-group-addon,.input-group-btn {
- display:table-cell
-}
-.input-group-addon {
- padding:6px 12px;
- font-size:14px;
- line-height:1;
- color:#555;
- text-align:center;
- background-color:#eee;
- border:1px solid #ccc;
- border-radius:4px;
- white-space:nowrap;
- vertical-align:middle;
- width:1%
-}
-.input-group-addon input[type="checkbox"] {
- margin:0
-}
-.input-group-btn {
- vertical-align:top
-}
-.input-group-btn .btn {
- height:31.25px;
- border:1px solid #ddd;
- margin:0;
- border-radius:3px;
- vertical-align:middle;
- display:block;
- width:100%
-}
-.input-group > input {
- position:relative;
- z-index:2;
- float:left;
- width:100%;
- margin:0
-}
-.input-group input:first-child,.input-group .input-group-btn:first-child .btn,.input-group-addon:first-child {
- border-top-right-radius:0;
- border-bottom-right-radius:0
-}
-.input-group input:last-child,.input-group .input-group-btn:last-child .btn,.input-group-addon:last-child {
- border-top-left-radius:0;
- border-bottom-left-radius:0
-}
-.input-group .input-group-btn:first-child .btn,.input-group-addon:first-child {
- border-right:none
-}
-.input-group .input-group-btn:last-child .btn,.input-group-addon:last-child {
- border-left:none
-}
-.alert-info {
- margin-left:50%;
- transform:translateX(-50%);
- width:auto;
- padding:5px 15px;
- text-align:center;
- border:1px solid #1d2d44;
- border-top:0;
- border-radius:0 0 3px 3px
-}
diff --git a/css/main.scss b/css/main.scss
index f1ac6230..9c23b8a2 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -1,4 +1,3 @@
-
h1 {
font-size: 1.8em;
margin-bottom: 5px;
@@ -12,10 +11,42 @@ h1 {
text-decoration: underline;
}
- */#app header {
+ */
+#app header {
padding-top: 44px;
}
+#controls {
+ width: inherit;
+ z-index: 120;
+ display: flex;
+ align-items: center;
+ position: inherit;
+ width: 100% !important;
+
+ #breadcrump {
+ min-width: 350px;
+ }
+
+ h2 {
+ margin-top: 12px;
+ }
+}
+
+.table {
+ position: relative;
+}
+
+#app-sidebar {
+ display: flex;
+ flex-direction: column;
+
+ .share, h2, .comments {
+ padding: 15px;
+ }
+}
+
+
.row:after {
content: ".";
display:block;
@@ -46,9 +77,6 @@ h1 {
}
}
-#breadcrump {
- min-width: 350px;
-}
input[type="text"] {
display: block;
diff --git a/css/jquery.datetimepicker.css b/css/vendor/jquery.datetimepicker.css
index beda1458..beda1458 100644
--- a/css/jquery.datetimepicker.css
+++ b/css/vendor/jquery.datetimepicker.css
diff --git a/css/vote.css b/css/vote.css
deleted file mode 100644
index 6b6da813..00000000
--- a/css/vote.css
+++ /dev/null
@@ -1,204 +0,0 @@
-.vote_table {
- white-space:normal;
- width:100%
-}
-.vote_table thead {
- white-space:normal
-}
-.vote_table thead .time-slot,.vote_table thead .vote-option {
- min-width:50px;
- text-align:center
-}
-.vote_table thead .time-slot .month,.vote_table thead .vote-option .month,.vote_table thead .time-slot .dayow,.vote_table thead .vote-option .dayow {
- font-size:1.2em;
- color:#666
-}
-.vote_table thead .time-slot .day,.vote_table thead .vote-option .day {
- font-size:1.8em;
- margin:5px 0 5px 0
-}
-.vote_table td.avatar-cell {
- width:40px
-}
-.vote_table td.name {
- max-width:170px;
- min-width:80px
-}
-.vote_table .total th,.vote_table .best th {
- text-align:right
-}
-.vote_table .total td,.vote_table .best td {
- text-align:center
-}
-.vote_table .cl_click div,.vote_table td.cl_click {
- cursor:pointer
-}
-.vote_table .poll-cell div,.vote_table .toggle div {
- background-repeat:no-repeat;
- background-position:center;
- transition:background-color 0.2s;
- background-size:32px;
- height:32px;
- width:32px;
- margin-left:auto;
- margin-right:auto
-}
-.vote_table .poll-cell.yes div,.vote_table .toggle.yes div {
- background-image:url('../img/yes-vote.svg')
-}
-.vote_table .poll-cell.maybe div,.vote_table .toggle.maybe div {
- background-image:url('../img/maybe-vote.svg')
-}
-.vote_table .poll-cell.no div,.vote_table .toggle.no div {
- background-image:url('../img/no-vote.svg')
-}
-.vote_table .toggle div {
- width:24px;
- height:24px;
- background-size:24px
-}
-.vote_table #toggle {
- float:left;
- cursor:pointer
-}
-.vote_table .poll-cell,.vote_table .toggle {
- border-right:2px solid white
-}
-.vote_table td.toggle-all.toggle {
- cursor:pointer;
- min-width:50px
-}
-.vote_table td.toggle-all.toggle.yes div {
- background-image:url('../img/yes-toggle.svg')
-}
-.vote_table td.toggle-all.toggle.maybe div {
- background-image:url('../img/maybe-toggle.svg')
-}
-.vote_table td.toggle-all.toggle.no div {
- background-image:url('../img/no-toggle.svg')
-}
-.vote_table td.toggle-all.toggle img {
- float:right;
- padding-top:4px;
- cursor:pointer;
- display:none
-}
-.vote_table .current-user td {
- border-top:2px solid #0082c9;
- border-bottom:2px solid #0082c9;
- background-color:#f7f7f7
-}
-.vote_table .current-user td:first-child {
- border-left:2px solid #0082c9;
- border-top-left-radius:4px;
- border-bottom-left-radius:4px
-}
-.vote_table .current-user td:last-child {
- border-right:2px solid #0082c9;
- border-top-right-radius:4px;
- border-bottom-right-radius:4px
-}
-.vote_table .current-user .name {
- font-weight:bold
-}
-.vote_table .poll-cell div,.vote_table .toggle div,.vote_table .result-cell div {
- background-color:transparent
-}
-.vote_table .poll-cell.unvoted,.vote_table .toggle.unvoted,.vote_table .result-cell.unvoted {
- background-color:#fff4c8;
- color:#fff3cd
-}
-.vote_table .poll-cell.unvoted div,.vote_table .toggle.unvoted div,.vote_table .result-cell.unvoted div {
- color:#fff3cd
-}
-.vote_table .poll-cell.yes,.vote_table .toggle.yes,.vote_table .result-cell.yes {
- background-color:#ebf5d6;
- color:#49bc49
-}
-.vote_table .poll-cell.yes div,.vote_table .toggle.yes div,.vote_table .result-cell.yes div {
- color:#49bc49
-}
-.vote_table .poll-cell.no,.vote_table .toggle.no,.vote_table .result-cell.no {
- background-color:#ffede9;
- color:#f45573
-}
-.vote_table .poll-cell.no div,.vote_table .toggle.no div,.vote_table .result-cell.no div {
- color:#f45573
-}
-.vote_table .poll-cell.maybe,.vote_table .toggle.maybe,.vote_table .result-cell.maybe {
- background-color:#fcf7e1;
- color:#fff3cd
-}
-.vote_table .poll-cell.maybe div,.vote_table .toggle.maybe div,.vote_table .result-cell.maybe div {
- color:#fff3cd
-}
-.vote_table td.total {
- padding:2px 0 1px
-}
-th,tr,td {
- padding:4px;
-}
-.votes {
-}
-.votes th,.votes tr,.votes td {
- border-top:1px solid #ddd
-}
-.external {
- min-width:150px
-}
-.external th {
- padding-left:40px
-}
-.external th input {
- min-width:100px
-}
-.finish_vote {
- display:contents
-}
-.share {
- margin:10px 0
-}
-.share .input-group-addon {
- background-image:url('../img/share.svg');
- background-repeat:no-repeat;
- background-position:10px center;
- padding-left:35px
-}
-#poll-desc,#comments-container,#poll-dates {
- margin-bottom:15px
-}
-.comment {
- border:1px solid #ddd;
- border-radius:3px;
- margin-bottom:10px
-}
-.comment.new-comment {
- border:none
-}
-.comment .comment-header {
- background-color:#eee;
- border-bottom:1px solid #ddd;
- border-radius:3px 3px 0 0;
- padding:2px 5px
-}
-.comment .comment-date {
- float:right;
- color:#555
-}
-.comment .comment-content {
- padding:5px
-}
-.new-comment .icon-loading-small {
- float:left;
- margin-top:10px;
- display:none
-}
-.new-comment .comment-content textarea {
- display:block;
- min-width:100%;
- max-width:100%;
- min-height:66px
-}
-#controls h2 {
- margin-top:12px
-}
diff --git a/css/vote.scss b/css/vote.scss
index 340a7d21..111920c5 100644
--- a/css/vote.scss
+++ b/css/vote.scss
@@ -277,9 +277,4 @@ th, tr, td {
}
}
-#controls h2 {
- margin-top: 12px;
-}
-
-