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

Style learn page and overide default button styles for navbar menu #69

Merged
merged 1 commit into from
Sep 19, 2018
Merged

Style learn page and overide default button styles for navbar menu #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 private/sass/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
@import url("https://fonts.googleapis.com/css?family=Dosis:200,300,400,500,600,700,800");

// Must be in capitals!
$title-text: "V-Gerb-Bold";
$title-text: "V-Gerb-Bold", sans-serif;
$main-text: "Dosis", sans-serif;
48 changes: 48 additions & 0 deletions private/sass/learn.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
@import "colors";
@import "fonts";
@import "sizes";

/* Learn Section(s) */

.learn-intro{
text-align: left;
margin: $large $large $medium $large ;
}

.learn-container {
display: flex;
flex-wrap: wrap;
justify-content: space-around;
align-items: center;
margin: $smallest;
}

.holder {
display:flex;
justify-content: center;
align-items: center;
margin: 1%;
width: 30vmin;
height: 30vmin;
border-radius: 50%;
background: $green1;
box-shadow: 0 6px 6px rgba(0, 0, 0, 0.19), 0 3px 3px rgba(0, 0, 0, 0.23);
}

.learn-container * {
padding: 1%;
text-decoration: none;
font-size: 20px;
color: inherit;
}

.Clothing,
.Food,
.Electric,
.Plastic,
.Glass,
.Paper {
width: 25%;
display: block;
margin: auto;
}
40 changes: 33 additions & 7 deletions private/sass/navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ nav{
border-bottom-left-radius: 10px;
}

// XP and XP-BAR STYLING
#xp-section{
display:flex;
align-items:center;
Expand Down Expand Up @@ -53,6 +54,17 @@ appearance: none;
border-radius: 2px;
}

// LEVEL TEXT STYLING
nav > h4{
font-size: $medium;
margin: 0;
}
.level{
margin-left: $small;
margin-right: $small;
}

// AVATAR-PIC and BUTTON STYLING
#avatar-section{
position: fixed;
right: 0;
Expand All @@ -62,17 +74,31 @@ appearance: none;
height: 4rem;
border: $navy1 $small solid;
border-radius: 100%;
margin-right: $smallest;
}
nav > h4{
font-size: $medium;
margin: 0;
.menu-button {
display: inline-block;
height: 3.9rem;
border: none;
padding: 0;
margin: $smallest $smallest 0 0;
border-radius: 50%;
background: $navy1;
cursor: pointer;
transition: background 250ms ease-in-out,
transform 150ms ease;
-webkit-appearance: none;
-moz-appearance: none;
}
.level{
margin-left: $small;
margin-right: $small;
.menu-button:hover,
.menu-button:focus {
box-shadow: 0 0 20px $green1;
}
.menu-button:active {
transform: scale(0.99);
box-shadow: 0 0 20px $orange1;
}

// DROPDOWN MENU STYLING
.popout-menu {
position: absolute;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion private/sass/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

main{
margin-top: $large;
margin-top: $larger;
margin-bottom: $large;
}

Expand Down
50 changes: 50 additions & 0 deletions public/css/learn.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/css/learn.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 30 additions & 7 deletions public/css/navbar.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/navbar.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/style-guide.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 2 additions & 42 deletions public/css/style.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/style.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/views/learn.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div>
<h2>What is zero waste?</h2>
<div class="learn-intro">
<h2>What is </br> zero waste?</h2>
<p>The simple answer: We aim to send nothing to a landfill. We reduce what we need, reuse as much as we can, send
little to be recycled, and compost what we cannot.
</p>
Expand Down
1 change: 1 addition & 0 deletions src/views/partials/header.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/footer.css">
<link rel="stylesheet" href="css/navbar.css">
<link rel="stylesheet" href="css/learn.css">
<link href="https://fonts.googleapis.com/css?family=Gugi" rel="stylesheet">
</head>