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

Overlapping/css #1335

Closed
wants to merge 14 commits into from
Closed

Overlapping/css #1335

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c31cab2
html updated
thisiskaransgit Jul 30, 2023
827ed80
css styles removed
thisiskaransgit Jul 30, 2023
3e07f6a
overlapping styles removed
thisiskaransgit Jul 30, 2023
c3db1e6
update styles
thisiskaransgit Aug 2, 2023
964c30e
resolving styles issues
thisiskaransgit Aug 2, 2023
c1d3d96
feat: updated stylesheets
thisiskaransgit Aug 5, 2023
2f20a48
Merge branch 'master' into overlapping/css
thisiskaransgit Aug 5, 2023
5b14429
updated features.scss
thisiskaransgit Aug 6, 2023
bf9efb1
Merge branch 'master' into overlapping/css
thisiskaransgit Aug 6, 2023
5d5c6a2
Merge branch 'master' into overlapping/css
thisiskaransgit Aug 7, 2023
5a2f294
Merge branch 'master' into overlapping/css
thisiskaransgit Aug 14, 2023
578d97d
Merge branch 'master' into overlapping/css
thisiskaransgit Aug 15, 2023
1bad99f
update
thisiskaransgit Aug 15, 2023
4c481ac
Merge branch 'master' into overlapping/css
thisiskaransgit Aug 23, 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
21 changes: 3 additions & 18 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,16 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

{% seo %} {% feed_meta %} {% if jekyll.environment == 'production' %}
<link rel="stylesheet" href="{{ site.baseurl }}/css/stellarnav.css" />
{% else %}
<link rel="stylesheet" href="{{ site.baseurl }}/css/stellarnav.css" />
{% endif %}
<link rel="stylesheet" href="{{ site.baseurl }}/css/screen.css" />
<link rel="icon" type="image/png" href="{{ site.baseurl }}/favicon.ico" />
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Open+Sans"
/>

<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.css"
/>
<link rel="stylesheet" href="{{ site.baseurl }}/css/subscribe.css" />

{% if page.title == 'Programs' or page.title == 'CNCF' or page.title ==
'LFX' or page.title == 'Google Summer of Code 2019' or
page.title == 'Google Summer of Code' or page.title == 'GSOD2020' or
page.title == 'MLH' %}
<link rel="stylesheet" href="{{ site.baseurl }}/css/program.css" />
{% endif %}
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Open+Sans"
/>
<meta name="twitter:card" content="summary_large_image" />
<meta property="twitter:title" content="Meshery" />
<meta name="twitter:site" content="@mesheryio" />
Expand Down
12 changes: 2 additions & 10 deletions _includes/home-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@

<!-- 1. Add latest jQuery and fancybox files -->
<link
type="text/css"
rel="stylesheet"
href="{{ site.baseurl }}/integrations/main.css"
/>
<style>
a {
color: black;
Expand Down Expand Up @@ -85,16 +78,15 @@
</style>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/slick/slick.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">

<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/[email protected]/dist/jquery.fancybox.min.css" />
<script src="https://cdn.jsdelivr.net/gh/fancyapps/[email protected]/dist/jquery.fancybox.min.js"></script>
<style>
h2.sub-text{
font-family: "Qanelas Soft", "Open Sans", sans-serif;
-webkit-font-smoothing: antialiased;
}</style>
<a id="button-scroll-to-up" style="text-decoration: none; color: white;"></a>

<img id="button-scroll-to-up" src="{{ site.baseurl }}/assets/images/button-scroll-to-up.svg" alt="scroll to top" />
<section class="hero" style="padding-bottom: 1rem">
<div class="text-container">
<h1 style="margin: 0rem 0rem 1rem 0rem;">the <span class="special-text" style="animation-delay: .5s;"> extensible</span> Kubernetes manager</h1>
Expand Down
3 changes: 2 additions & 1 deletion _includes/subscribe.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<style>
.form-container {
padding: 4rem 0rem;
background-color: $brand-color;
background-color: var(--brand-secondary-color);
text-align: center;
}
@media (min-width: 555px) and (max-width: 603px) {
Expand All @@ -33,6 +33,7 @@
justify-content: center;
text-align: center;
}
}

</style>
{% endif %}
Expand Down
6 changes: 1 addition & 5 deletions _sass/catalog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,7 @@

}

p {
font-family: "Qanelas Soft", "Open Sans", "sans-serif";
-webkit-font-smoothing: antialiased;
font-size: 1.1rem;
}

.inner-span {
font-size: 16px;
position: relative;
Expand Down
85 changes: 73 additions & 12 deletions _sass/elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

html {
background: $coolgray;
background: var(--background-light);
}

html, body {
Expand Down Expand Up @@ -43,10 +43,6 @@ img {
// width: 100%;
}

h1 strong, h2 strong {
font-weight: 700;
}

h1 {
font-weight: 300;
font-size: 2.3em;
Expand All @@ -66,10 +62,7 @@ span.special-text{
font-weight: 500;
opacity: 0;
}
.div-skew{
// width: fit-content;
display: inline-block;
}


h2 {
font-weight: 300;
Expand All @@ -91,22 +84,37 @@ h3 {
h4{
color: var(--color-secondary-dark);
}
.box-shadow-primary{
box-shadow: var(--box-shadow-primary);
}

p{
font-family: "Qanelas Soft", "Open Sans", "sans-serif";
font-size: 1.1em;
}

address{
font-family: 1.38em;
}

p, address {
font-size: 1.38em;
color: var(--color-grey-light);
margin-bottom: 20px;
font-weight: 300;
line-height: 1.4em;
}


p.grey-bg-text{
color: var(--color-secondary-medium);
}

ul{
color: var(--color-secondary-dark);
color: var(--color-secondary-light);
li{
list-style: disc;
color: var(--color-secondary-light);
}
}

li.heading{
Expand All @@ -115,11 +123,63 @@ li.heading{
text-align: center;
}

.button{
background-color: var(--brand-color-primary) !important;
border-radius: 0.25rem;
color: #fff;
display: inline-block;
font-size: 1rem;
padding: 1rem 2rem;
text-align: center;
text-decoration: none !important;
margin-left: 6px;
border: 0;
box-shadow: var(--box-shadow-primary);
cursor: pointer;
transition: all .4s;


&:hover{
background: #00B39F !important;
transform: translateY(-2px);
color: #fff
}
}

.bg-grey-300{
background: var(--background-light-cards);
box-shadow: var(--box-shadow-primary);
background-color: #f1f5f9;
width: auto;
margin: 3%;
padding: 20px;
border-radius: 0.25rem;
display: flex;
flex-direction: column;
}

.mailing-row{
display: inline;
}

.mailing-btn {
align-self: flex-end;
margin-top: auto;
}

@media (min-width: 600px){
.bg-grey-300 {
width: 43%;
margin: 2%;
}
}
@media (min-width: 600px){
.mailing-row {
display: inline-flex;
width: 100%;
justify-content: center;
}
}
@keyframes glow {
from {
text-shadow: 0 0 20px #2d9da9;
Expand All @@ -139,4 +199,5 @@ li.heading{
opacity: 1;
transform: skewX(0deg);
}
}
}

3 changes: 3 additions & 0 deletions _sass/features.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
@include flex-flow(wrap);
padding: 50px 0 30px 0;

ul li{
list-style: none;
}
.feature {
list-style: none;
padding: 0;
Expand Down
1 change: 1 addition & 0 deletions _sass/forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
box-shadow: var(--box-shadow-primary);
& p{
color: var(--color-primary-light) !important;
text-align: center;
}
}
.button a, input[type=submit] {
Expand Down
22 changes: 0 additions & 22 deletions _sass/helpers.scss
View file
Open in desktop

This file was deleted.

Loading