Skip to content

Commit

Permalink
Merge remote-tracking branch 'kodilan-com/master' into kodilan-com#52
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/components/pages/Home.vue
  • Loading branch information
izerozlu committed Jan 5, 2020
2 parents 77fc537 + dfe2fe4 commit e727be1
Show file tree
Hide file tree
Showing 10 changed files with 375 additions and 176 deletions.
117 changes: 110 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 62 additions & 3 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "App",
"name": "Kod İlan",
"short_name": "Kod İlan",
"icons": [
{
"src": "\/android-icon-36x36.png",
Expand Down Expand Up @@ -36,6 +37,64 @@
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
},
{
"src": "\/apple-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/apple-icon-57x57.png",
"sizes": "57x57",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/apple-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/apple-icon-76x76.png",
"sizes": "76x76",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/apple-icon-114x114.png",
"sizes": "114x114",
"type": "image\/png",
"density": "2.5"
},
{
"src": "\/apple-icon-120x120.png",
"sizes": "120x120",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/apple-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.5"
},
{
"src": "\/apple-icon-152x152.png",
"sizes": "152x152",
"type": "image\/png",
"density": "4.0"
},
{
"src": "\/apple-icon-180x180.png",
"sizes": "152x152",
"type": "image\/png",
"density": "4.5"
}
],
"start_url": ".",
"display": "standalone",
"background_color": "#ffffff",
"theme_color": "#333333"
}
6 changes: 5 additions & 1 deletion src/assets/css/responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ body.boxed {

@media only screen and (min-width: 768px) and (max-width: 990px) {
.container {
width: 768px;
width: 100%;
}
.container .column,
.container .columns {
Expand Down Expand Up @@ -312,6 +312,10 @@ body.boxed {
.container .two-thirds.column {
width: 492px;
}
.companyLink {
overflow: hidden;
text-overflow: ellipsis;
}
}

/* #Mobile (Portrait)
Expand Down
15 changes: 10 additions & 5 deletions src/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ ul li ul a.sf-with-ul:after {
-o-background-size: cover;
background-size: cover;
margin-bottom: 35px;
z-index: 1000;
z-index: 999;
}

#banner:before {
Expand Down Expand Up @@ -672,7 +672,7 @@ ul li ul a.sf-with-ul:after {
#titlebar {
background-color: #f6f6f6;
position: relative;
padding: 70px;
padding: 70px 0px;
margin-bottom: 50px;
}

Expand Down Expand Up @@ -1339,6 +1339,7 @@ table.manage-table td.action a:hover {
right: 0;
bottom: 20px;
margin: 0 20px 0 0;
z-index: 1000;
}

#backtotop a {
Expand Down Expand Up @@ -4489,12 +4490,16 @@ span.temporary {
.listing .listing-logo {
width: 60px;
min-width: 60px;
flex-wrap: wrap;
display: flex;
align-items: center;
}

.listing .listing-logo img {
border-radius: 3px;
transform: translate3d(0, 0, 0);
object-fit: cover;
height: auto;
width: 100%;
}

.listing .listing-title {
Expand Down Expand Up @@ -8775,12 +8780,12 @@ select {

.multiselect {
position: relative;
z-index: 1000;
z-index: 900;
outline: none;
}

.multiselect--active {
z-index: 1001;
z-index: 901;
}

.multiselect * {
Expand Down
Loading

0 comments on commit e727be1

Please sign in to comment.