Skip to content

Commit

Permalink
Merge branch 'main' of github.com:TheMaxium69/SolidServ-WebSite
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMaxium69 committed Apr 23, 2022
2 parents a99850c + 5b80af1 commit 6297db9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion api/bot/recup.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function getAllActu(){

require "api/db.php";

$requestNews = "SELECT * FROM actu";
$requestNews = "SELECT * FROM announcement";

$allActu = mysqli_query($ConnectDB, $requestNews);

Expand Down
2 changes: 1 addition & 1 deletion api/bot/request.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

if ($token = $tokenBDD){

$q = $db->prepare("INSERT INTO `actu` (`user`, `content`) VALUES (:user, :content)");
$q = $db->prepare("INSERT INTO `announcement` (`user`, `content`) VALUES (:user, :content)");

$q->execute([
'user' => $user,
Expand Down
14 changes: 14 additions & 0 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,20 @@
#home .head .centertext h3 a:hover{
color: white;
}
@media (max-width: 1156px) {
#home .head .centertext h1{
font-size: 49px;
}
}

@media (max-width: 830px) {
#home .head .centertext{
width:unset;
margin-left: unset;
margin-right: unset;
}

}

@media (max-width: 887px){
#home .head{
Expand Down
4 changes: 4 additions & 0 deletions test.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
<main>



1156

49px
</main>


Expand Down

0 comments on commit 6297db9

Please sign in to comment.