Skip to content

Commit 6cdaea4

Browse files
h2Entwicklungh2Entwicklung
committedMar 31, 2023
* add new logo
* add favorite css * change to white
·
DEV-UNSTABLE-CI-2023.10.25-20.76.0-RC01
1 parent 6997bc5 commit 6cdaea4

15 files changed

+61
-58
lines changed
 

‎assets/css/helper/_variables.scss

+4-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ $black_modal_header: #003c60;
2020
$black_link-color: #58a6ff;
2121
$my-theme-primary: $main-color; // theme primary color, change this value to customize theme
2222
$my-theme-secondary: $sec-color; // theme secondary color, change this value to customize theme
23-
$background-color: #F0F1F1;
23+
$background-color: white;
2424
$breakpointMenue: 1200px;
2525
$utilities-border-colors: $main-color;
26+
$in-a-meeting: #0158B0;
27+
$online: #00B047;
28+
$away:#F9A825;

‎assets/css/layout/_adressbook.scss

+9-15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
$border-width-entry: 6px;
12

23
.capital-Letter {
34
border-right: none;
@@ -15,7 +16,8 @@
1516
padding: 14px 12px 14px 12px;
1617
border-radius: 8px;
1718
margin-bottom: 8px;
18-
19+
border-top-width: 1px !important;
20+
box-shadow: 0 0 11px 1px rgb(0 0 0 / 7%), 0 10px 20px -2px rgb(0 0 0 / 4%);
1921
.name {
2022
i {
2123
margin-right: 0.5rem !important;
@@ -64,13 +66,6 @@
6466
}
6567

6668

67-
@mixin statusColors {
68-
69-
&[data-status="inMeeting"] {
70-
border: $info 2px solid;
71-
}
72-
73-
}
7469

7570
#modalAdressbookBody {
7671
height: 100%;
@@ -80,7 +75,6 @@
8075
.adressbookline {
8176
display: flex;
8277
justify-content: space-between;
83-
@include statusColors();
8478
}
8579

8680
.register {
@@ -144,10 +138,10 @@
144138

145139
[data-status="away"] {
146140
.dot {
147-
background-color: $warning;
141+
background-color: $away;
148142
}
149143
&.adressbookline{
150-
border-left: 4px $warning solid;
144+
border-left: $border-width-entry $away solid;
151145
}
152146
}
153147

@@ -159,21 +153,21 @@
159153

160154
[data-status="inMeeting"] {
161155
.dot {
162-
background-color: $info;
156+
background-color: $in-a-meeting;
163157

164158
}
165159
&.adressbookline{
166-
border-left: 4px $info solid;
160+
border-left: $border-width-entry $in-a-meeting solid;
167161
}
168162
}
169163

170164
[data-status="online"] {
171165
.dot {
172-
background-color: #00c851;
166+
background-color: $online;
173167

174168
}
175169
&.adressbookline{
176-
border-left: 4px #00c851 solid;
170+
border-left: $border-width-entry $online solid;
177171
}
178172
}
179173

‎assets/css/layout/_main.scss

+27-35
Original file line numberDiff line numberDiff line change
@@ -591,44 +591,22 @@ strong {
591591
opacity: 0.95;
592592
}
593593

594-
.successBorder {
595-
border: #00c851 solid 4px !important;;
594+
.olineBorder {
595+
border: $online solid 4px !important;;
596+
}
597+
.bg-online{
598+
background-color: $online;
596599
}
597-
598600
.infoBorder {
599-
border: $info solid 4px !important;;
601+
border: $in-a-meeting solid 4px !important;;
600602
}
601-
602-
@keyframes warning-roller {
603-
0% {
604-
border-image: linear-gradient(
605-
to right,
606-
#dad78a 0%,
607-
#ded201 1%,
608-
#dad78a 100%
609-
);
610-
611-
}
612-
100% {
613-
border-image: linear-gradient(
614-
to right,
615-
#dad78a 0%,
616-
#ded201 99%,
617-
#dad78a 100%
618-
);
619-
}
603+
.bg-away{
604+
background-color: $away;
620605
}
621606

622607

623-
.warningBorder {
624-
//border: #c8be00 solid 4px !important;
625-
//border-width: 3px!important;
626-
//border-style: solid!important;
627-
//animation-name: warning-roller; /** Name der Animation **/
628-
//animation-duration: 5s; /** Dauer der Animation **/
629-
//animation-iteration-count: infinite; /** Anzahl der Wiederholungen **/
630-
//border-image-slice: 1!important;
631-
border: #eaca00 solid 4px !important;;
608+
.awayBorder {
609+
border: $away solid 4px !important;;
632610
}
633611

634612
.occupant {
@@ -1165,7 +1143,7 @@ a:hover {
11651143

11661144
&:after {
11671145
content: "";
1168-
background-image: url("../../image/jits-admin-half.png");
1146+
background-image: url("../../image/jitsi-admin-half.png");
11691147
opacity: 0.3;
11701148
top: 0;
11711149
left: 0;
@@ -1394,11 +1372,14 @@ a:hover {
13941372
display: none;
13951373
position: absolute;
13961374
bottom: 0;
1397-
right: 50px;
1375+
right: 20px;
13981376
z-index: 10;
13991377
@media only screen and (min-width: $breakpointMenue) {
14001378
display: flex;
14011379
}
1380+
img{
1381+
height: 20px;
1382+
}
14021383

14031384
flex-direction: column;
14041385
background-color: $background-color;
@@ -1414,12 +1395,18 @@ a:hover {
14141395
.fa{
14151396
transform: rotateZ(180deg);
14161397
}
1398+
.first-line {
1399+
font-size: 18px;
1400+
}
1401+
img{
1402+
height: 100%;
1403+
}
14171404
}
14181405
.first-line {
14191406
display: flex;
14201407
flex-direction: row;
14211408
align-items: center;
1422-
font-size: 18px;
1409+
font-size: 12px;
14231410
font-weight: bolder;
14241411
margin-bottom: 4px;
14251412
*{
@@ -1428,4 +1415,9 @@ a:hover {
14281415
}
14291416
}
14301417
}
1418+
}
1419+
1420+
.card {
1421+
border: 0;
1422+
box-shadow: 0px 0px 11px 1px rgb(0 0 0 / 7%), 0 10px 20px -2px rgb(0 0 0 / 4%);
14311423
}

‎assets/image/jits-admin-half.png

-7.63 KB
Binary file not shown.

‎assets/image/jitsi-admin-half.png

23.8 KB
Loading

‎public/Group 121.svg

+13
Loading

‎public/Group 122 (3).png

35.2 KB
Loading

‎public/Group 122.svg

+3
Loading

‎public/jits-admin-half.png

-7.63 KB
Binary file not shown.

‎public/logo.png

-12.3 KB
Loading

‎public/logo_small.png

-9.04 KB
Loading

‎public/oie_We7RKon74mNT.png

56.9 KB
Loading

‎src/Migrations/Version20230330075157.php

-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public function up(Schema $schema): void
2626
$this->addSql('CREATE INDEX IDX_D3FE5EA5233D34C1 ON addressbook_favorites (user_target)');
2727
$this->addSql('ALTER TABLE addressbook_favorites ADD CONSTRAINT FK_D3FE5EA53AD8644E FOREIGN KEY (user_source) REFERENCES fos_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
2828
$this->addSql('ALTER TABLE addressbook_favorites ADD CONSTRAINT FK_D3FE5EA5233D34C1 FOREIGN KEY (user_target) REFERENCES fos_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
29-
$this->addSql('ALTER TABLE fos_user DROP accept_terms_and_condition_domain');
3029
}
3130
}
3231

@@ -38,7 +37,6 @@ public function down(Schema $schema): void
3837
$this->addSql('ALTER TABLE addressbook_favorites DROP CONSTRAINT FK_D3FE5EA53AD8644E');
3938
$this->addSql('ALTER TABLE addressbook_favorites DROP CONSTRAINT FK_D3FE5EA5233D34C1');
4039
$this->addSql('DROP TABLE addressbook_favorites');
41-
$this->addSql('ALTER TABLE fos_user ADD accept_terms_and_condition_domain TEXT DEFAULT NULL');
4240
$this->addSql('COMMENT ON COLUMN fos_user.accept_terms_and_condition_domain IS \'(DC2Type:array)\'');
4341
}
4442
}

‎templates/addressbook/__addressBookEntry.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
</div>
1818
{% endif %}
1919
<div class="d-flex flex-column">
20-
<p class="mb-0">{{ u|nameOfUser }} {% if u in app.user.deputy %}<i
20+
<p class="mb-0">{{ u|nameOfUser }} <small><a href="{{ path('app_adressbook_favorite',{'userId':u.uid}) }}"><i class="{% if u in app.user.adressbookFavorites %}fa isAddressbookFavorite{% else %}far{% endif%} fa-star"></i> </a></small> {% if u in app.user.deputy %}<i
2121
class="ms-2 fa-solid fa-file-contract" data-mdb-toggle="tooltip"
2222
title="{{ 'deputy.text.isDeputy'|trans }}"></i>{% endif %}</p>
23-
<p class="mb-0"><small>{{ u.username }}<a href="{{ path('app_adressbook_favorite',{'userId':u.uid}) }}"><i class="{% if u in app.user.adressbookFavorites %}fa isAddressbookFavorite{% else %}far{% endif%} fa-star"></i> </a> </small></p>
23+
<p class="mb-0"><small>{{ u.username }}</small></p>
2424
</div>
2525

2626

‎templates/dashboard/__roomCard.html.twig

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="card card-body mb-1 text-lg-start text-center triggerHide
2-
{% if room.start is not null and room.startTimestamp-600 < timestamp and room.startTimestamp > timestamp %} warningBorder {% endif %} {% if runningRooms is defined and room in runningRooms %} successBorder {% endif %}"
2+
{% if room.start is not null and room.startTimestamp-600 < timestamp and room.startTimestamp > timestamp %} awayBorder {% endif %} {% if runningRooms is defined and room in runningRooms %} olineBorder {% endif %}"
33
id="room_card{{ room.uidReal }}">
44
<div class="row">
55
{% if roomIsReadOnly(room,app.user) == true %}
@@ -18,13 +18,13 @@
1818
</div>
1919

2020
{% if room.start is not null and room.startTimestamp-600 < timestamp and room.startTimestamp > timestamp %}
21-
<div class="showTime bg-warning text-black">
21+
<div class="showTime bg-away text-black">
2222
{% set time = (( room.startTimestamp - timestamp)/60)|number_format(0) %}
2323
{% trans with {'{time}': time} %}Startet in {time} min {% endtrans %}
2424
</div>
2525
{% endif %}
2626
{% if runningRooms is defined and room in runningRooms %}
27-
<div class="showTime bg-success text-white">
27+
<div class="showTime bg-online text-white">
2828
{% set time = (( room.startTimestamp - timestamp)/60)|number_format(0) %}
2929
{{ 'Jetzt'|trans }}
3030
</div>

0 commit comments

Comments
 (0)
Please sign in to comment.