Skip to content

Commit 9666296

Browse files
author
Kristan Kenney
committed
Merge branch 'main' into feature/user-roles
2 parents 6b7f06f + 53b684e commit 9666296

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

bin/v-add-sys-rainloop

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ if [ "$UPDATE" == "no" ]; then
103103
echo "Forbidden" > ./data/index.html
104104

105105
# Create database
106-
mysql -e "DROP DATABASE rainloop"
107-
mysql -e "DROP USER rainloop@localhost"
108106
mysql -e "CREATE DATABASE rainloop"
109107
# Mysql available on system
110108
r=$(generate_password)
@@ -172,4 +170,4 @@ fi
172170
#----------------------------------------------------------#
173171

174172
$BIN/v-log-action "system" "Info" "Plugins" "Rainloop enabled (Version: $version)."
175-
log_event "$OK" "$ARGUMENTS"
173+
log_event "$OK" "$ARGUMENTS"

web/css/src/themes/dark.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,6 +1513,11 @@ form#vstobjects.suspended {
15131513
color: #fff !important;
15141514
}
15151515

1516+
.admin-warning-button {
1517+
padding-left: 65px!important;
1518+
padding-right: 65px!important;
1519+
}
1520+
15161521
@media screen and (max-width: 950px) {
15171522
.helper-container {
15181523
display: none;

web/css/src/themes/default.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3672,6 +3672,11 @@ form#vstobjects.suspended {
36723672
max-width: 140px;
36733673
}
36743674

3675+
.admin-warning-button {
3676+
padding-left: 59px !important;
3677+
padding-right: 59px !important;
3678+
}
3679+
36753680
.float-left {
36763681
float: left;
36773682
}
@@ -4063,6 +4068,7 @@ form#vstobjects.suspended {
40634068
width: 270px;
40644069
}
40654070

4071+
40664072
@media screen and (max-width: 950px) {
40674073
.helper-container {
40684074
display: none;

0 commit comments

Comments
 (0)