Skip to content
This repository was archived by the owner on Mar 13, 2023. It is now read-only.

Commit 96475d0

Browse files
committed
update translation file and homepage style
1 parent a6c2799 commit 96475d0

File tree

12 files changed

+99375
-110
lines changed

12 files changed

+99375
-110
lines changed

public/css/admin.css

Lines changed: 16721 additions & 5 deletions
Large diffs are not rendered by default.

public/css/public.css

Lines changed: 16323 additions & 2 deletions
Large diffs are not rendered by default.

public/js/admin.js

Lines changed: 46746 additions & 1 deletion
Large diffs are not rendered by default.

public/js/public.js

Lines changed: 19051 additions & 1 deletion
Large diffs are not rendered by default.

public/mix-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"/js/admin.js": "/js/admin.js?id=9a98de465bd9263eeb44",
3-
"/css/admin.css": "/css/admin.css?id=1f4590f4a3f74a5cee19",
4-
"/css/public.css": "/css/public.css?id=1db82db9ab97446293b0",
5-
"/js/public.js": "/js/public.js?id=0aae02c88b7c8512fff0",
2+
"/js/admin.js": "/js/admin.js?id=f11e07b2e99c79982184",
3+
"/css/admin.css": "/css/admin.css?id=70b017753472afabb246",
4+
"/css/public.css": "/css/public.css?id=cc3b2d032038996abbaa",
5+
"/js/public.js": "/js/public.js?id=5a2145fe4119eda16940",
66
"/components/simplemde/simplemde.js": "/components/simplemde/simplemde.js?id=fd052f831c01ff10535c",
77
"/components/simplemde/simplemde.css": "/components/simplemde/simplemde.css?id=b8697c785bbf0627fb05",
88
"/components/ckeditor/ckeditor.js": "/components/ckeditor/ckeditor.js?id=97ee1c198f0241ec57cc",

resources/lang/en.json

Lines changed: 440 additions & 24 deletions
Large diffs are not rendered by default.

resources/scss/public/_base.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,6 @@ footer.footer {
486486
height: 2px;
487487
background-color: $white;
488488
}
489-
490-
@include media-breakpoint-up(lg) {
491-
}
492489
}
493490

494491
/* Return on top */
@@ -516,3 +513,11 @@ footer.footer {
516513
opacity: 1;
517514
}
518515
}
516+
517+
section {
518+
padding: 15px;
519+
520+
@include media-breakpoint-up(lg) {
521+
padding: 0;
522+
}
523+
}

resources/scss/public/pages/_home.scss

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ section.partners {
2929
display: flex;
3030
align-items: center;
3131
padding: 15px 0;
32-
margin-bottom: 70px;
32+
margin-bottom: 20px;
3333

3434
.partners__list {
3535
.partner {
@@ -50,15 +50,61 @@ section.partners {
5050
}
5151

5252
section.posts-events {
53-
margin-bottom: 90px;
54-
5553
.lastest-post {
5654
@include make-col-ready();
57-
display: none;
5855

5956
.block_header {
6057
margin-bottom: 0;
6158
}
59+
60+
.lastest-post__title {
61+
margin-bottom: 35px;
62+
color: $primary;
63+
font-size: 2rem;
64+
}
65+
66+
.last-posts {
67+
display: grid;
68+
grid-template-columns: repeat(1, 1fr);
69+
grid-column-gap: 20px;
70+
71+
.last_post {
72+
border: 1px solid $gray-300;
73+
background-color: $white;
74+
padding: 15px 12px;
75+
margin-bottom: 20px;
76+
transition: all 0.13s ease-in;
77+
78+
&:hover {
79+
@include material-box-shadow;
80+
}
81+
82+
.last-post__date {
83+
font-size: 14px;
84+
}
85+
86+
.last-post__title {
87+
color: $primary;
88+
margin-top: 10px;
89+
margin-bottom: 7px;
90+
}
91+
92+
.last-post__summary {
93+
margin-bottom: 8px;
94+
font-size: 15px;
95+
}
96+
97+
.last-post__author {
98+
span { color: $gray-900 !important; }
99+
font-size: 14px;
100+
font-weight: 600;
101+
}
102+
}
103+
}
104+
105+
.btn {
106+
float: right;
107+
}
62108
}
63109

64110
.next-event {
@@ -75,7 +121,7 @@ section.posts-events {
75121

76122
@include media-breakpoint-up(lg) {
77123
.lastest-post {
78-
@include make-col(8);
124+
//@include make-col(8);
79125
display: block;
80126

81127
.lastest-post__title {
@@ -135,7 +181,6 @@ section.posts-events {
135181
}
136182

137183
section.tutorial-intro {
138-
margin: 50px 0;
139184
.tutorial__thumb, .tutorial__content {
140185
@include make-col-ready();
141186
}
@@ -167,7 +212,6 @@ section.tutorial-intro {
167212
}
168213

169214
section.package-intro {
170-
margin: 50px 0;
171215
.package__thumb, .package__content {
172216
@include make-col-ready();
173217
}
@@ -257,7 +301,8 @@ section.slack {
257301
}
258302

259303
section.sponsors {
260-
margin: 75px 0;
304+
margin-top: 20px;
305+
margin-bottom: 50px;
261306
text-align: center;
262307

263308
.sponsors__title {
@@ -286,6 +331,7 @@ section.sponsors {
286331
}
287332

288333
@include media-breakpoint-up(lg) {
334+
margin-top: 50px;
289335
.sponsors_list {
290336
.sponsor {
291337
.jc_sponsor {
@@ -300,7 +346,7 @@ section.sponsors {
300346
}
301347

302348
section.events {
303-
margin-bottom: 80px;
349+
margin-bottom: 50px;
304350

305351
.event_header {
306352
position: relative;

resources/views/vendor/core/public/_sidebar.blade.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@
77
</a>
88
</div>
99
<div class="slide-nav__search">
10-
<form action="#" class="search">
11-
@csrf
10+
<form action="javascript:;" class="search">
1211
<input type="text" placeholder="Search" name="q">
1312
<button type="submit"><i class="fa fa-search"></i></button>
1413
</form>
1514
</div>
1615
<ul class="slide-main-nav">
17-
16+
<li class="menu__item"><a href="{{ Route::has($lang.'::index-news') ? route($lang.'::index-news') : '/' }}">{{ __('Blog') }}</a></li>
17+
<li class="menu__item"><a href="{{ TypiCMS::homeUrl(). '/forums' }}">{{ __('Forum') }}</a></li>
18+
<li class="menu__item"><a href="{{ Route::has($lang.'::index-tutorials') ? route($lang.'::index-tutorials') : '/' }}">{{ __('Tutoriels') }}</a></li>
19+
<li class="menu__item"><a href="{{ Route::has($lang.'::index-packages') ? route($lang.'::index-packages') : '/' }}">{{ __('Packages') }}</a></li>
20+
{{--<li class="menu__item"><a href="{{ Route::has($lang.'::index-events') ? route($lang.'::index-events') : '/' }}">{{ __('Events') }}</a></li>--}}
1821
</ul>
1922
<ul class="slide-nav-social">
2023
<li><a href="https://www.facebook.com/laravelcm" target="_blank"><i class="fa fa-facebook"></i> Facebook</a></li>

resources/views/vendor/core/public/master.blade.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ function gtag(){dataLayer.push(arguments);}
8383

8484
@section('skip-links')
8585
<a href="#main" class="skip-to-content">@lang('db.Skip to content')</a>
86-
<a href="#site-nav" class="d-block d-md-none btn-offcanvas" data-toggle="offcanvas" title="@lang('db.Open navigation')" aria-label="@lang('db.Open navigation')" role="button" aria-controls="navigation" aria-expanded="false"><span class="fa fa-bars fa-fw" aria-hidden="true"></span></a>
8786
@show
8887

8988
@include('core::_navbar')

0 commit comments

Comments
 (0)