Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 source/articles/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: "TryRuby Articles"
<div class="row">
<div class="col-lg-8">
<% blog.articles.each do |article| %>
<h2><%= link_to article.title, article.url %></h2>
<h2 class="mt-4"><%= link_to article.title, article.url %></h2>
<p><%= article.data.the_summary %></p>
<% end %>
</div>
Expand Down
1 change: 1 addition & 0 deletions source/images/header-ruby-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 18 additions & 12 deletions source/layouts/_navbar.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<nav class="tryruby-navbar navbar navbar-expand-lg navbar-light">
<div class="container justify-content-between">
<a class="tryruby-brand navbar-brand" href="/">
<img src="/images/header-ruby-logo.svg" height="40" width="40" alt="" />
Try Ruby
</a>

Expand Down Expand Up @@ -36,6 +37,11 @@
About
</a>
</li>
</ul>
</div>

<div class="tryruby-navbar-links collapse navbar-collapse">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<button
class="nav-link btn dropdown-toggle language-menu-toggle"
Expand Down Expand Up @@ -67,84 +73,84 @@
data-change-lang="en"
aria-controls="tryruby-content"
>
English
English (en)
</button>
<button
class="dropdown-item"
data-change-lang="nl"
aria-controls="tryruby-content"
>
Nederlands
Nederlands (nl)
</button>
<button
class="dropdown-item"
data-change-lang="es"
aria-controls="tryruby-content"
>
Español
Español (es)
</button>
<button
class="dropdown-item"
data-change-lang="pt-br"
aria-controls="tryruby-content"
>
Português do Brasil
Português do Brasil (pt)
</button>
<button
class="dropdown-item"
data-change-lang="ja"
aria-controls="tryruby-content"
>
日本語
日本語 (ja)
</button>
<button
class="dropdown-item"
data-change-lang="ru"
aria-controls="tryruby-content"
>
Русский
Русский (ru)
</button>
<button
class="dropdown-item"
data-change-lang="ua"
aria-controls="tryruby-content"
>
Українська
Українська (ua)
</button>
<button
class="dropdown-item"
data-change-lang="mk"
aria-controls="tryruby-content"
>
Македонски
Македонски (mk)
</button>
<button
class="dropdown-item"
data-change-lang="zh"
aria-controls="tryruby-content"
>
中文
中文 (zh)
</button>
<button
class="dropdown-item"
data-change-lang="de"
aria-controls="tryruby-content"
>
Deutsch
Deutsch (de)
</button>
<button
class="dropdown-item"
data-change-lang="tr"
aria-controls="tryruby-content"
>
Türkçe
Türkçe (tr)
</button>
<button
class="dropdown-item"
data-change-lang="fr"
aria-controls="tryruby-content"
>
Français
Français (fr)
</button>
</div>
</li>
Expand Down
78 changes: 46 additions & 32 deletions source/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
:root {
--background-color: rgb(255, 255, 248);
--text-color: #333;
--light-color: rgb(84, 83, 83);
--primary-color: #d45f61;
--dark-primary-color: #a74243;
--primary-outline-color: #d45f6133;
--light-primary-color: rgb(213, 189, 189);
--secondary-color: #b5b5a9;
--text-color: #1c1917;
--background-color: #f1eee4;
--primary-color: #e62923;
--secondary-color: #d8c28e;
--dark-secondary-color: #929288;
--success-color: #53884d;

--nav-background-color: #fff;
--nav-border-color: #e7e5e4;
--nav-link-color: #1c1917;

--button-primary-text-color: #fff;
--button-primary-color: #e62923;
--button-primary-hover-color: #e62923;

--code-light-background-color: rgba(255, 255, 255, .4);
--code-editor-border-color: #e2d1aa;
}

// Body

.tryruby-page {
min-height: 100vh;

// Grain on background
background-color: var(--background-color);
background-image: url("data:image/png;base64,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");

font: 1.2em Georgia, serif;
font: 1.2em "Plus Jakarta Sans", "Noto Sans JP", ui-sans-serif, system-ui, -apple-system, sans-serif;
color: var(--text-color);
}

// Navigation

.tryruby-navbar {
background: var(--code-light-background-color);
background: var(--nav-background-color);
border-bottom: 1px solid var(--nav-border-color);

// Override bootstrap
box-shadow: none;
Expand All @@ -49,10 +52,19 @@

.tryruby-navbar-links {
flex-grow: 0;
font-size: .75em;
font-weight: bold;
}

.navbar-light .navbar-nav .nav-link,
.nav-link {
color: var(--nav-link-color);
padding-inline: 1rem;
}

.language-menu-toggle {
background: transparent;
border: 1px solid var(--nav-border-color);

svg {
margin-top: -5px;
Expand All @@ -64,9 +76,6 @@

a {
color: var(--primary-color);
&:hover {
color: var(--dark-primary-color);
}
}

h1 {
Expand Down Expand Up @@ -98,32 +107,37 @@ h3 {
font-size: 1.75rem;
}

.btn {
padding-top: .55em;
}

.btn-primary {
border-radius: 1rem;
font-family: sans-serif;
background-color: var(--primary-color);
border-color: var(--primary-color);
color: var(--button-primary-text-color);
background-color: var(--button-primary-color);
border-color: var(--button-primary-color);

&:focus,
&:focus:not(:focus-visible),
&:hover,
&:active {
background-color: var(--dark-primary-color) !important;
border-color: var(--dark-primary-color) !important;
box-shadow: 0 0 0 .25rem var(--primary-outline-color);
background-color: var(--button-primary-hover-color) !important;
border-color: var(--button-primary-hover-color) !important;
}
}

.btn-secondary {
font-family: sans-serif;
background-color: var(--secondary-color);
border-color: var(--secondary-color);
border-radius: 1rem;

&,
&:focus,
&:focus:not(:focus-visible),
&:hover,
&:active {
background-color: var(--dark-secondary-color) !important;
border-color: var(--dark-secondary-color) !important;
background-color: var(--secondary-color) !important;
border-color: var(--secondary-color) !important;
}
}

Expand All @@ -136,15 +150,14 @@ h3 {
&:hover,
&:active {
border-color: var(--primary-color);
box-shadow: 0 0 0 .25rem var(--primary-outline-color);
}
}

// Text

blockquote {
padding: .5rem .5rem .5rem .75rem;
border-left: .5rem solid var(--light-color);
border-left: .5rem solid var(--secondary-color);
background: transparent;

& > :last-child {
Expand Down Expand Up @@ -231,14 +244,15 @@ pre {
cursor: text;

.CodeMirror {
background: white;
padding: .25em;
border-radius: 3px;
border-radius: .5rem;
}
}

.tryruby-code--editor {
.CodeMirror {
border: 1px solid transparent;
border: 1px solid var(--code-editor-border-color);
transition: border-color .2s ease-in-out;
}
.CodeMirror-focused {
Expand All @@ -248,7 +262,7 @@ pre {

.tryruby-code--output {
.CodeMirror {
background-color:var(--code-light-background-color);
background-color: var(--code-light-background-color);
}
}

Expand All @@ -266,7 +280,7 @@ pre {
background: var(--success-color);
}
.tryruby-output-red {
background: var(--dark-primary-color)
background: var(--primary-color)
}

// Buttons
Expand Down