This commit is contained in:
dartcafe 2018-11-07 07:34:21 +01:00
Родитель c26564070c
Коммит a2fb9a4b96
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: CCE73CEF3035D3C8
9 изменённых файлов: 122 добавлений и 403 удалений

Просмотреть файл

@ -1,23 +1,43 @@
$hover-color: #f7f7f7;
$bg_no: #ffede9;
$bg_maybe: #fcf7e1;
$bg_unvoted: #fff4c8;
$bg_yes: #ebf5d6;
$bg_information: #b19c3e;
$bg-no: #ffede9;
$bg-maybe: #fcf7e1;
$bg-unvoted: #fff4c8;
$bg-yes: #ebf5d6;
$bg-information: #b19c3e;
$fg_no: #f45573;
$fg_maybe: #f0db98;
$fg_unvoted: #f0db98;
$fg_yes: #49bc49;
$fg-no: #f45573;
$fg-maybe: #f0db98;
$fg-unvoted: #f0db98;
$fg-yes: #49bc49;
$bg-current_user: #f7f7f7;
$fg-current_user: #0082c9;
$bg_current_user: #f7f7f7;
$fg_current_user: #0082c9;
// Icon definitions
--icon-app: url('/index.php/svg/polls/app/888888?v=1');
--icon-yes: url('/index.php/svg/core/actions/checkmark/49bc49?v=1');
--icon-no: url('/index.php/svg/core/actions/close/f45573?v=1');
--icon-maybe: url('/index.php/svg/polls/maybe-vote/f0db98?v=1');
--icon-comment-yes: url('/index.php/svg/core/actions/comment/49bc49?v=1');
--icon-comment-no: url('/index.php/svg/core/actions/comment/f45573?v=1');
@mixin icon-color($icon, $dir, $color, $version: 1, $core: false)
.icon-app {
@include icon-color('app','polls',$color-text-maxcontrast)
}
.icon-yes {
@include icon-color('checkmark','actions',$fg-yes,1,true)
}
.icon-comment-yes {
@include icon-color('comment','actions',$fg-yes,1,true)
}
.icon-comment-no {
@include icon-color('comment','actions',$fg-no,1,true)
}
.icon-no {
@include icon-color('close','actions',$fg-no,1,true)
}
.icon-maybe {
@include icon-color('maybe-vote','polls',$fg-maybe)
}
// --icon-yes: url('/index.php/svg/core/actions/checkmark/49bc49?v=1');
// --icon-no: url('/index.php/svg/core/actions/close/f45573?v=1');
// --icon-maybe: url('/index.php/svg/polls/maybe-vote/f0db98?v=1');
// --icon-comment-yes: url('/index.php/svg/core/actions/comment/49bc49?v=1');
// --icon-comment-no: url('/index.php/svg/core/actions/comment/f45573?v=1');

Просмотреть файл

@ -28,9 +28,9 @@
.divider {
width: 25px;
border-left: 1px solid #ddd;
background-color: #eee;
border-right: 1px solid #ddd;
border-left: 1px solid var(--color-border-dark);
background-color: var(--color-background-dark);
border-right: 1px solid var(--color-border-dark);
background-image: url('/apps/polls/css/../img/toggle.svg?v=1');
background-repeat: no-repeat;
background-position-x: 5px;

Просмотреть файл

@ -48,7 +48,7 @@ $mediabreak-3: $group-1-width + $owner-width + max($group-2-1-width, $group-2-2-
transition: background-color 0.3s ease;
background-color: var(--color-main-background);
min-height: 4em;
border-bottom: 1px solid #eee;
border-bottom: 1px solid var(--color-border);
&.table-header {
.name, .description {
@ -113,7 +113,7 @@ $mediabreak-3: $group-1-width + $owner-width + max($group-2-1-width, $group-2-2-
.description {
width: $description-width;
color: #888;
color: var(--text-maxcontrast);
}
.owner {

Просмотреть файл

@ -17,6 +17,13 @@ h1 {
}
}
.icon-polls {
background-color: black;
-webkit-mask: url('../img/app.svg') no-repeat 50% 50%;
mask: url('../img/app.svg') no-repeat 50% 50%;
}
#app-content-wrapper {
flex-direction: column;
}
@ -42,303 +49,15 @@ h1 {
}
.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%;
}
}
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;
text-align: center;
vertical-align: bottom;
cursor: pointer;
}
.scrollable_table {
table-layout: fixed;
}
.description {
opacity: 0.7;
}
.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: "?";
}
.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;
}
/* OC10 and NC11 fixes*/
.symbol {
display: inline-block;

Просмотреть файл

@ -49,12 +49,12 @@ $user-column-width: 265px;
margin-top: 0;
padding: 0 17px;
}
.pollInformation {
width: 220px;
flex-grow: 1;
flex-shrink: 1;
padding-right: 15px;
padding-right: 15px;
.authorRow {
.leftLabel {
@ -64,7 +64,7 @@ $user-column-width: 265px;
.cloud {
margin: 4px 0;
> span {
color: #fff;
margin: 2px;
@ -73,16 +73,16 @@ $user-column-width: 265px;
float: left;
text-shadow: 1px 1px #666;
background-color: #aaa;
}
.open {
background-color: $fg_yes;
background-color: $fg-yes;
}
.expired {
background-color: $fg_no;
background-color: $fg-no;
}
.information {
background-color: $bg_information;
background-color: $bg-information;
}
}
}
@ -100,7 +100,7 @@ $user-column-width: 265px;
background-position: right top;
height: 30px;
}
> ul > li {
&:focus, &:hover, &.active, a.selected {
&, > a {
@ -109,14 +109,14 @@ $user-column-width: 265px;
}
}
> a[class*="icon-"],
> ul > li > a[class*="icon-"],
> a[style*="background-image"],
> a[class*="icon-"],
> ul > li > a[class*="icon-"],
> a[style*="background-image"],
> ul > li > a[style*="background-image"] {
padding-left: 44px;
}
> a,
> a,
> ul > li > a {
background-size: 16px 16px;
background-position: 14px center;
@ -135,7 +135,7 @@ $user-column-width: 265px;
flex: 1 1 0;
z-index: 100;
}
a,
a,
.app-navigation-entry-deleted {
padding-left: 44px !important;
}
@ -144,16 +144,16 @@ $user-column-width: 265px;
#configurationsTabView {
.configBox {
padding: 8px 8px;
> .title {
font-weight: bold;
margin-bottom: 4px;
}
> div {
padding-left: 4px;
}
input.hasDatepicker {
margin-left:17px;
}
@ -183,7 +183,7 @@ $user-column-width: 265px;
border-bottom: 1px solid #DDD;
border-radius: 3px 3px 0 0;
}
.comment-date {
float: right;
color: #555;
@ -195,7 +195,7 @@ $user-column-width: 265px;
opacity: .5;
}
}
.message {
margin-left: 40px;
flex-grow: 1;
@ -222,4 +222,3 @@ $user-column-width: 265px;
}
}
}

Просмотреть файл

@ -19,7 +19,7 @@ $user-column-width: 265px;
#votings {
position: relative !important;
padding: 12px 17px;
padding: 12px 17px;
.table {
overflow-x: auto;
padding-bottom: 10px;
@ -34,7 +34,7 @@ $user-column-width: 265px;
margin-left: $user-column-width;
padding: 0 17px;
align-items: initial;
.date-box {
padding: 0 2px;
align-items: center;
@ -62,23 +62,23 @@ $user-column-width: 265px;
}
}
.yes {
color: $fg_yes;
color: $fg-yes;
.svg {
background-image: var(--icon-yes);
}
}
}
.no {
color: $fg_no;
color: $fg-no;
.svg {
background-image: var(--icon-no);
}
}
}
}
.winner {
font-style: italic;
font-weight: bold;
color: $fg_yes;
color: $fg-yes;
}
.vote.option {
.date-box {
@ -88,7 +88,7 @@ $user-column-width: 265px;
.counter {
flex-grow: 0;
height: 32px;
}
}
}
}
.user {
@ -124,29 +124,29 @@ $user-column-width: 265px;
height: 44px;
&.yes {
background-color: $bg_yes;
color: $fg_yes;
background-color: $bg-yes;
color: $fg-yes;
background-image: var(--icon-yes);
}
&.no {
background-color: $bg_no;
color: $fg_no;
background-color: $bg-no;
color: $fg-no;
background-image: var(--icon-no);
}
&.maybe {
background-color: $bg_maybe;
color: $fg_maybe;
background-color: $bg-maybe;
color: $fg-maybe;
background-image: var(--icon-maybe);
}
&.unvoted {
background-color: $bg_no;
color: $fg_no;
background-color: $bg-no;
color: $fg-no;
&:before {
content: attr(data-unvoted);
color: $fg_no;
color: $fg-no;
font-size: 14px;
font-style: italic;
font-weight: bold;
@ -160,8 +160,8 @@ $user-column-width: 265px;
border-radius: 4px;
box-sizing: border-box;
&.unvoted {
background-color: $bg_maybe;
color: $fg_maybe;
background-color: $bg-maybe;
color: $fg-maybe;
}
}
}
@ -177,17 +177,17 @@ $user-column-width: 265px;
background-size: 28px;
&.yes {
background-color: $bg_yes;
background-color: $bg-yes;
background-image: url('../img/yes-toggle.svg');
}
&.no {
background-color: $bg_no;
background-color: $bg-no;
background-image: url('../img/no-toggle.svg');
}
&.maybe {
background-color: $bg_maybe;
background-color: $bg-maybe;
background-image: url('../img/maybe-toggle.svg');
}
@ -228,7 +228,7 @@ $user-column-width: 265px;
min-width: 150px;
.th {
padding-left: 40px;
input {
min-width: 100px;
}
@ -289,7 +289,7 @@ $user-column-width: 265px;
}
}
}
&.user {
display: none;
}
@ -336,13 +336,13 @@ $user-column-width: 265px;
}
}
}
.description {
margin: 4px;
}
.flex-column {
&.table-body {
flex-grow: 0;
@ -357,12 +357,12 @@ $user-column-width: 265px;
}
}
.table {
.table {
display: flex;
margin-right: 8px;
padding-bottom: 75px;
}
.submitPoll {
border-top: $border_user;
box-shadow: 0 0 9px 2px rgba(153,153,153,1);
@ -382,7 +382,7 @@ $user-column-width: 265px;
line-height: 2em;
}
}
#options.flex-row {
flex-direction: column;
@ -393,7 +393,7 @@ $user-column-width: 265px;
@media all and (max-width: (320px) ) {
.table {
.table {
padding-bottom: 105px;
}
}

Просмотреть файл

@ -24,19 +24,12 @@
use OCP\Util;
Util::addStyle('polls', 'main');
?>
<div id="app">
<div id="app-content">
<div id="app-content-wrapper">
<div id="emptycontent" class="">
<div class="icon-polls"></div>
<h1>
<?php p($l->t('Access denied')); ?>
</h1>
<h2>
<?php p($l->t('You are not allowed to view this poll or the poll does not exist.')); ?>
</h2>
</div>
</div>
</div>
<div id="emptycontent" class="">
<div class="icon-polls"></div>
<h1>
<?php p($l->t('Access denied')); ?>
</h1>
<h2>
<?php p($l->t('You are not allowed to view this poll or the poll does not exist.')); ?>
</h2>
</div>

Просмотреть файл

@ -24,18 +24,12 @@
use OCP\Util;
Util::addStyle('polls', 'main');
?>
<div id="app">
<div id="app-content">
<div id="app-content-wrapper">
<div id="emptycontent" class="">
<div class="icon-polls"></div>
<h1>
<?php p($l->t('Access denied')); ?>
</h1>
<h2>
<?php p($l->t('You are not allowed to edit this poll or the poll does not exist.')); ?>
</h2>
</div>
</div>
</div>
<div id="emptycontent" class="">
<div class="icon-polls"></div>
<h1>
<?php p($l->t('Access denied')); ?>
</h1>
<h2>
<?php p($l->t('You are not allowed to edit this poll or the poll does not exist.')); ?>
</h2>
</div>

Просмотреть файл

@ -24,18 +24,12 @@
use OCP\Util;
Util::addStyle('polls', 'main');
?>
<div id="app">
<div id="app-content">
<div id="app-content-wrapper">
<div id="emptycontent" class="">
<div class="icon-polls"></div>
<h1>
<?php p($l->t('Access denied')); ?>
</h1>
<h2>
<?php p($l->t('You are either not allowed to delete this poll or it doesn\'t exist.')); ?>
</h2>
</div>
</div>
</div>
<div id="emptycontent" class="">
<div class="icon-polls"></div>
<h1>
<?php p($l->t('Access denied')); ?>
</h1>
<h2>
<?php p($l->t('You are either not allowed to delete this poll or it doesn\'t exist.')); ?>
</h2>
</div>