Skip to content

Commit

Permalink
Merge branch 'newsDate' of https://github.com/bekzodjonganiyev/tkti i…
Browse files Browse the repository at this point in the history
…nto newsDate
  • Loading branch information
bekzodjonganiyev committed Jan 30, 2023
2 parents 57a4275 + 24da2d2 commit 255f318
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 64 deletions.
2 changes: 1 addition & 1 deletion src/components/aboutus/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ justify-content: center;
margin: 20px 0 ;
line-height: 130%;
color: #02307D;
min-width: 490px;
/* min-width: 490px; */
}

.list-info{
Expand Down
3 changes: 1 addition & 2 deletions src/components/footer/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
footer{
/* position: fixed;
bottom: 0; */

width: 100%;
display: flex;
align-items: flex-start;
Expand Down
54 changes: 0 additions & 54 deletions src/components/header/RespHeader/RespAccardoon.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/header/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ gap: 10px;

@media only screen and (max-width: 550px){
.hovered-content{
min-width: 333px;
/* min-width: 333px; */
width: 333px;

}
Expand Down
2 changes: 1 addition & 1 deletion src/components/mainheroslider/slider.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
}
}
.carousel-inner{
min-width:476px;
/* min-width:476px; */
}
2 changes: 1 addition & 1 deletion src/components/news/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
justify-content: space-evenly;
align-items: flex-start;
flex-wrap: wrap;
min-width: 425px;
/* min-width: 425px; */
}

.news__card {
Expand Down
4 changes: 4 additions & 0 deletions src/components/usefullinks/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@ width: 90%;
}
.useful__info{
height: 300px;
min-width: 425px;
}


.react-multiple-carousel__arrow{
display: none !important;
}
@media only screen and (min-width: 500px){

}
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ a{

.wrapped{
padding: 0 2%;
min-width: 425px;
/* min-width: 425px; */
}

.map{
Expand Down
14 changes: 12 additions & 2 deletions src/pages/home/home.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.home{
min-width: 425px;
/* min-width: 425px; */
}
.newsPage{
min-width: 490px;
}
.card__control {
display: flex;
Expand Down Expand Up @@ -59,7 +62,7 @@
}
.elonlar{
background:#eff5fb;
min-width: 490px;
min-width: 425px;
}
.news__info h3{
display: flex;
Expand Down Expand Up @@ -87,4 +90,11 @@ color: #0350D0 !important;
.news__info h3 {
font-size: 24px;
}
}
@media (max-width: 500px) {
.elonlar{
box-sizing:border-box;
background:#eff5fb;
min-width: 490px;
}
}
2 changes: 1 addition & 1 deletion src/pages/home/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const HomePage = () =>{
<MainSlider />
<Filter yili={yili} />

<div className="p-5">
<div className="p-5 newsPage">
<div className="news__info">
<h3>{about[lang].new}</h3>
</div>
Expand Down

0 comments on commit 255f318

Please sign in to comment.