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

Simplify code related to the admin menu #4005

Merged
merged 5 commits into from
Sep 21, 2020
Merged
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
6 changes: 1 addition & 5 deletions app/assets/stylesheets/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,6 @@ $sidebar-active: #f4fcd0;
margin-right: rem-calc(12);
}

.side-menu-and-admin-content {
@include side-menu-and-content;
}

.admin-content {
.proposal-form {
padding-top: 0;
Expand Down Expand Up @@ -652,7 +648,7 @@ code {
border-radius: rem-calc(3);
font-size: rem-calc(16);
font-weight: normal;
margin: $line-height;
margin-bottom: $line-height;
padding: $line-height / 2;

strong {
Expand Down
4 changes: 0 additions & 4 deletions app/assets/stylesheets/dashboard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@
// 01. Dashboard global
// --------------------

.dashboard-menu-and-content {
@include side-menu-and-content;
}

.proposal-title {
display: inline-block;

Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/foundation_and_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
@include foundation-responsive-embed;
@include foundation-label;
@include foundation-media-object;
@include foundation-off-canvas;
@include foundation-orbit;
@include foundation-pagination;
@include foundation-progress-bar;
Expand Down
64 changes: 60 additions & 4 deletions app/assets/stylesheets/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,6 @@ a {
display: table-cell;
}

.off-canvas-content {
box-shadow: none;
}

.uppercase {
text-transform: uppercase;
}
Expand All @@ -449,6 +445,66 @@ a {
margin-top: 0;
}

.menu-and-content {
$side-menu-min-width: 250px;

@include breakpoint(medium) {
display: flex;

> nav {
flex: 25%;
min-width: $side-menu-min-width;

+ * {
flex: 75%;
padding: $line-height !important;
}
}

[for="show_menu"] {
display: none;
}
}

@include breakpoint(small only) {
> nav {
height: 100%;
left: -$side-menu-min-width;
overflow-y: auto;
position: fixed;
top: 0;
transition: left 0.5s ease;
width: $side-menu-min-width;
z-index: 12;

+ * {
padding: $line-height !important;
}
}

[name="show_menu"]:checked + nav,
> nav:focus-within {
left: 0;

+ * {
overflow-x: hidden;

[for="show_menu"]::after {
@include reveal-overlay;
content: "";
cursor: pointer;
display: block;
z-index: 11;
}
}
}
}

[name="show_menu"] {
display: none;
}
}

// 02. Header
// ----------

Expand Down
33 changes: 5 additions & 28 deletions app/assets/stylesheets/mixins.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// Table of Contents
//
// 01. Logo
// 02. Side menu and content
// 03. Orbit bullets
// 04. Direct uploads
// 02. Orbit bullets
// 03. Direct uploads
// ------------------

// 01. Logo
Expand All @@ -22,30 +21,8 @@
}
}

// 02. Side menu and content
// -------------------------

@mixin side-menu-and-content {
display: flex;

> :first-child {
flex: 25%;
min-width: 250px;

> :first-child {
height: 100%;
}
}

> :last-child {
flex: 75%;
overflow-x: auto;
padding: $line-height !important;
}
}

// 03. Orbit bullet
// ----------------
// 02. Orbit bullets
// -----------------

@mixin orbit-bullets {
@include disable-mouse-outline;
Expand All @@ -72,7 +49,7 @@
}
}

// 04. Direct uploads
// 03. Direct uploads
// ------------------

@mixin direct-uploads {
Expand Down
8 changes: 0 additions & 8 deletions app/helpers/admin_helper.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
module AdminHelper
def side_menu
if namespace == "moderation/budgets"
render "/moderation/menu"
else
render "/#{namespace}/menu"
end
end

def namespaced_root_path
"/#{namespace}"
end
Expand Down
Loading