Skip to content

Commit

Permalink
GitLens joins GitKraken!
Browse files Browse the repository at this point in the history
  • Loading branch information
eamodio committed Oct 8, 2021
1 parent 75089a6 commit e0163ad
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 6 deletions.
14 changes: 13 additions & 1 deletion README.md
Expand Up @@ -4,6 +4,18 @@
[![](https://aka.ms/vsls-badge)](https://aka.ms/vsls-gitlens)
[![](https://img.shields.io/badge/vscode--dev--community-gitlens-blue.svg?logo=slack&labelColor=555555)](https://vscode-slack.amod.io)

<p align="center">
<br />
<a
title="Learn more about GitKraken and GitLens joining forces!"
href="https://www.gitkraken.com/blog/gitkraken-acquires-gitlens-for-visual-studio-code"
target="_blank"
alt="Learn more about GitKraken and GitLens joining forces!"
>
<img src="https://raw.githubusercontent.com/eamodio/vscode-gitlens/main/images/docs/gk+gl.png" alt="GitKraken and GitLens are joining forces!" />
</a>
</p>

<p align="center">
<br />
<a title="Learn more about GitLens" href="https://gitlens.amod.io"><img src="https://raw.githubusercontent.com/eamodio/vscode-gitlens/main/images/docs/gitlens-logo.png" alt="GitLens Logo" /></a>
Expand All @@ -18,7 +30,7 @@

# GitLens

[GitLens](https://gitlens.amod.io 'Learn more about GitLens') is an [open-source](https://github.com/eamodio/vscode-gitlens 'Open GitLens on GitHub') extension for [Visual Studio Code](https://code.visualstudio.com) created by [Eric Amodio](https://www.amod.io 'Learn more about Eric').
[GitLens](https://gitlens.amod.io 'Learn more about GitLens') is an [open-source](https://github.com/eamodio/vscode-gitlens 'Open GitLens on GitHub') extension for [Visual Studio Code](https://code.visualstudio.com).

GitLens simply helps you **better understand code**. Quickly glimpse into whom, why, and when a line or code block was changed. Jump back through history to **gain further insights** as to how and why the code evolved. Effortlessly explore the history and evolution of a codebase.

Expand Down
Binary file added images/docs/gk+gl-banner.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/docs/gk+gl.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 11 additions & 1 deletion src/webviews/apps/scss/welcome.scss
Expand Up @@ -40,7 +40,7 @@ header {

.container {
display: grid;
grid-template-areas: 'header header' 'hero hero' 'content sidebar';
grid-template-areas: 'banner banner' 'header header' 'hero hero' 'content sidebar';
grid-template-columns: repeat(1, 1fr min-content);
margin: 1em auto;
grid-gap: 1em 3em;
Expand All @@ -52,6 +52,16 @@ header {
}
}

.banner {
grid-area: banner;
margin: 1em;
display: flex;

img {
border-radius: 8px;
}
}

.content__area {
grid-area: content;
font-size: 1.4rem;
Expand Down
15 changes: 11 additions & 4 deletions src/webviews/apps/welcome/welcome.html
Expand Up @@ -20,6 +20,16 @@
/> -->

<div class="container">
<div class="banner">
<a
title="Learn more about GitKraken and GitLens joining forces!"
href="https://www.gitkraken.com/blog/gitkraken-acquires-gitlens-for-visual-studio-code"
target="_blank"
alt="Learn more about GitKraken and GitLens joining forces!"
>
<img src="#{root}/images/docs/gk+gl-banner.png" alt="GitKraken and GitLens are joining forces!" />
</a>
</div>
<header>
<a class="header__link" title="Learn more about GitLens" href="https://gitlens.amod.io">
<div class="header__logo">
Expand All @@ -44,10 +54,7 @@ <h1>Git<span class="header__logo--highlight">Lens</span></h1>
<a class="bold" title="Open GitLens on GitHub" href="https://github.com/eamodio/vscode-gitlens"
>open-source</a
>
extension for Visual Studio Code created by
<a class="bold" title="Learn more about Eric" href="https://www.amod.io/?utm_source=gitlens"
>Eric Amodio</a
>.
extension for Visual Studio Code.
</p>
<p>
GitLens simply helps you <b>better understand code</b>. Quickly glimpse into whom, why, and when a
Expand Down

0 comments on commit e0163ad

Please sign in to comment.