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.

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

[Site] [Dark Mode] Update import catalog modal according to theme #1203 #1247

Merged
merged 21 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bed4e29
[Site] [Dark Mode] Update import catalog modal according to theme #1203
vaibhav-xp Jul 2, 2023
ceabab8
Merge branch 'master' of https://github.com/meshery/meshery.io into v…
vaibhav-xp Jul 4, 2023
0af918c
Merge branch 'master' of https://github.com/meshery/meshery.io into v…
vaibhav-xp Jul 10, 2023
0fdad43
fixed coming color issue
vaibhav-xp Jul 11, 2023
1260c50
Merge branch 'master' of https://github.com/meshery/meshery.io into v…
vaibhav-xp Jul 11, 2023
4797962
Merge branch 'master' into vaibhav-xt
vaibhav-xp Jul 17, 2023
6aaeeb0
Merge branch 'meshery:master' into vaibhav-xt
vaibhav-xp Jul 18, 2023
7b76a29
import catalog close button padding fixed
vaibhav-xp Jul 18, 2023
1987a78
Merge branch 'master' of https://github.com/meshery/meshery.io into v…
vaibhav-xp Jul 23, 2023
70766b2
Merge branch 'master' of https://github.com/meshery/meshery.io into v…
vaibhav-xp Jul 26, 2023
dac03d3
Merge branch 'master' of https://github.com/meshery/meshery.io into v…
vaibhav-xp Jul 27, 2023
1293589
Merge branch 'master' into vaibhav-xt
vaibhav-xp Jul 27, 2023
4659c35
Merge branch 'vaibhav-xt' of https://github.com/vaibhav-xt/meshery.io…
vaibhav-xp Jul 27, 2023
0579fdc
Merge branch 'master' of https://github.com/meshery/meshery.io into v…
vaibhav-xp Jul 28, 2023
176383e
modified changes
vaibhav-xp Jul 28, 2023
e58d2c4
added hyperlinks to heading
vaibhav-xp Jul 29, 2023
215eb73
fixed pattern-id-overlay
vaibhav-xp Jul 29, 2023
4b374b8
Update _includes/help-modal.html
Chadha93 Aug 10, 2023
e9a561b
Update _includes/help-modal.html
Chadha93 Aug 10, 2023
d587f3f
Update _includes/help-modal.html
Chadha93 Aug 16, 2023
808d772
Update _includes/help-modal.html
Chadha93 Aug 16, 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
4 changes: 2 additions & 2 deletions _includes/coming-soon.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="card link">
<div class="card-inner">
<div class="front" style="background:rgba(0, 0, 0, 0.7)">
<div class="front">
<h4 class="overlay-text">{{pattern.name}}</h4>
<h5 class="pattern-name">Coming Soon...</h5>
<h5>Coming Soon...</h5>
<img class="pattern-image-overlay" src="{{pattern.image}}" />
<h6 class="pattern-id-overlay">
<img class="smp-overlay" src="{{site.baseurl}}/assets/images/logos/service-mesh-pattern.svg"
Expand Down
9 changes: 8 additions & 1 deletion _includes/help-modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
.tabcontent {
padding: 6px 12px;
border-top: none;
background-color: var(--integrations-bg);
}

/* Modal Content/Box */
Expand All @@ -60,6 +61,7 @@
float: right;
font-size: 28px;
font-weight: bold;
/* margin-right: 10px; */
}

.closed:hover,
Expand All @@ -75,14 +77,16 @@
<div class="help-modal-content">

<div class="tab">
<span class="closed" style=" padding: 4px 4px">&times;</span>
<span class="closed" style=" padding: 4px 10px">&times;</span>
<button class="tablinks active" onclick="openTab(event, 'MesheryUI')">Meshery UI</button>
<button class="tablinks" onclick="openTab(event, 'MesheryCLI')">Meshery CLI</button>
</div>

<!-- Tab content -->
<div id="MesheryUI" class="tabcontent">
<h3>Meshery UI</h3>
<p>To install Meshery follow the steps mentioned in the <a href="https://docs.meshery.io/installation/quick-start#install-meshery">docs</a></p>
Chadha93 marked this conversation as resolved.
Show resolved Hide resolved

<!-- <a href="{{ site.baseurl }}/assets/images/screens/pattern-import.mp4"
data-fancybox="images" data-caption="Import your patterns"> -->
<div style="text-align: center;">
Expand All @@ -99,6 +103,9 @@ <h3>Meshery UI</h3>

<div id="MesheryCLI" class="tabcontent" style="display: none;">
<h3>Meshery CLI</h3>
<p>To use mesheryctl follow the steps mentioned in the <a href="https://docs.meshery.io/installation/mesheryctl">docs</a></p>
Chadha93 marked this conversation as resolved.
Show resolved Hide resolved

<!-- <h3>Meshery CLI</h3> -->
<p>1. Apply a pattern file. </p>
<div id="start-pattern" class="highlight-code">
<p class="code-box" style="height: 40px; line-height: 15px; color: white"><code style="position: absolute;">
Expand Down
6 changes: 4 additions & 2 deletions _sass/catalog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
font-size: 18px;
font-weight: 400;
}
.tabcontent h3{
color: var(--color-secondary-dark);
}
/* CARD-STYLES */
.card {
position: relative;
Expand Down Expand Up @@ -99,7 +102,6 @@
position: absolute;
top: 40%;
left: 50%;
color: white;
font-size: 19px;
transform: translate(-50%, -50%);
-ms-transform: translate(-50%, -50%);
Expand All @@ -112,7 +114,6 @@
right: 0;
padding-top: 10px;
margin-right: 14px;
color: white;
opacity: 0.7;
}
.catalog {
Expand Down Expand Up @@ -276,6 +277,7 @@ p {
text-align: center;
padding: 15px 0 15px 0;
}

.pattern-id {
position: absolute;
bottom: .5rem;
Expand Down
2 changes: 1 addition & 1 deletion _sass/elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ h3 {
color: var(--color-secondary-dark);
}

h4{
h4, h5, h6{
color: var(--color-secondary-dark);
}

Expand Down
5 changes: 0 additions & 5 deletions _sass/programs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
margin: 2rem 0rem;
}

h5 {
color: var(--color-secondary-dark) !important;
}


.program-heading {
background: transparent !important;
padding-bottom: 2rem !important;
Expand Down