Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

commited for git merge training #979

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

commited for git merge training #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab4e89d
commited for git merge training
yuvarajraghu Mar 16, 2023
9000b52
ted gor git training - conflict resolve
yuvarajraghu Mar 16, 2023
b477058
ticket-id - brand_name -locale - demo for git operation
yuvarajraghu Mar 16, 2023
231f999
Git training demo - git merge conflict
yuvarajraghu Mar 17, 2023
b20fec9
branch 2 - merge -conflict to resolve - demo
yuvarajraghu Mar 17, 2023
6d8a897
Merge branch 'new_git_branch' into new_branch2
yuvarajraghu Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/css/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ details.flash {
.octicon { fill: currentColor; }

.site-header {
padding-top: 2px;
padding-top: 4px;
padding-bottom: 2px;

.site-header-menu {
Expand Down
9 changes: 8 additions & 1 deletion assets/css/page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ iframe[src^="//player.vimeo"]{
margin: 1em;
padding: 1em;
opacity: .9;
color: $mono-bright;
text-decoration: none;
font-size: 5em;
border-left: 20px solid transparent;
border-right: 10px solid transparent;
border-top: 20px solid $mono-light;
bottom: 20px;
}

&:hover{
Expand Down Expand Up @@ -66,7 +73,7 @@ header{
}

.nav{
line-height: 50px;
line-height: 200px;
text-align: center;

li{
Expand Down
7 changes: 7 additions & 0 deletions homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="border-bottom border-top py-6 color-bg-subtle text-center">
<div class="container-lg py-6 p-responsive">
<h1>{{ page.title }}</h1>
{% if page.description %}<p class="col-12 col-md-6 mx-auto">{{ page.description }}</p>{% endif %}
{% include translation_buttons.html %}
</div>
</div>