Skip to content

Captive admin/update admin with new theme #554

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Captive admin/update admin with new theme #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a216ae
💥 Use css variables instead of scss
cprodhomme Mar 25, 2024
025347e
🚧 Update captive-admin with new captive-theme
cprodhomme Mar 25, 2024
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
16 changes: 8 additions & 8 deletions captive-admin/app/assets/stylesheets/captive-admin/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,36 +25,36 @@
@import 'inputs/select2';

body {
color: $fg-default;
color: var(--fg-default);
@include body-medium;
}
}

.details {
margin-top: $spacer-1;
margin-top: var(--space-1);
@include body-small;

color: $fg-subtle;
color: var(--fg-subtle);
}

.col-actions {
.dropdown_menu_button {
font-size: 0;
margin: 0;
width: $spacer-6;
height: $spacer-6;
width: var(--space-6);
height: var(--space-6);
padding: 0;

&::before {
font-size: $f2;
content: '···';
border: 0;
width: $spacer-6;
height: $spacer-6;
width: var(--space-6);
height: var(--space-6);
left: 0;
top: 0;
text-align: center;
line-height: $spacer-6;
line-height: var(--space-6);
}

&::after {
Expand Down
32 changes: 16 additions & 16 deletions captive-admin/app/assets/stylesheets/captive-admin/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#main_content form {
width: $spacer-13;
padding: $spacer-5 0;
width: var(--space-13);
padding: var(--space-5) 0;
}

form {
Expand All @@ -9,7 +9,7 @@ form {
margin: 0;

&.inputs {
background-color: $bg-subtle;
background-color: var(--bg-subtle);
box-shadow: none;
border-radius: 0;
}
Expand All @@ -19,8 +19,8 @@ form {
display: flex;

li {
margin-left: $spacer-3;
margin-right: $spacer-3;
margin-left: var(--space-3);
margin-right: var(--space-3);

&:first-child {
margin-left: 0;
Expand All @@ -35,18 +35,18 @@ form {

ol > li {
padding: 0;
margin-bottom: $spacer-5;
margin-bottom: var(--space-5);

label {
@include body-medium;

float: none;
width: auto;
margin-bottom: $spacer-1;
margin-bottom: var(--space-1);

abbr {
color: $primary-fg;
padding-left: $spacer-1;
color: var(--primary-fg);
padding-left: var(--space-1);

&[title] {
text-decoration: none;
Expand All @@ -70,8 +70,8 @@ form {
border-color: $border-color;
@include body-large;

border-radius: $border-radius-xs;
padding: $spacer-3;
border-radius: var(--rounded-lg);
padding: var(--space-3);

&:focus {
border: 2px solid $border-color-emphasis;
Expand All @@ -92,7 +92,7 @@ form {
/* Errors */
p.inline-errors {
font-weight: bold;
margin: $spacer-1 0;
margin: var(--space-1) 0;
text-align: right;
}

Expand All @@ -107,7 +107,7 @@ form {

.buttons,
.actions {
padding: $spacer-5 0;
padding: var(--space-5) 0;
margin-top: 0;

input[type='submit'],
Expand Down Expand Up @@ -145,7 +145,7 @@ form {
color: $form-label-color;
@include body-medium;

margin-bottom: $spacer-4;
margin-bottom: var(--space-4);
width: 100%;
font-weight: normal;
}
Expand All @@ -171,7 +171,7 @@ form {

form.filter_form {
.filter_form_field {
padding: $spacer-5 0;
padding: var(--space-5) 0;
margin: 0;
border-bottom: 1px solid $border-color;
display: flex;
Expand All @@ -194,7 +194,7 @@ form.filter_form {
flex: 1;

+ input {
margin-left: $spacer-4;
margin-left: var(--space-4);
}
}
}
Expand Down
30 changes: 15 additions & 15 deletions captive-admin/app/assets/stylesheets/captive-admin/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

#header {
text-shadow: none;
background: $bg-emphasis;
padding: 0 $spacer-6;
background: var(--bg-emphasis);
padding: 0 var(--space-6);

h1 {
color: $fg-on-emphasis;
color: var(--fg-on-emphasis);
padding-left: 0;
height: 60px;
display: flex;
Expand All @@ -37,8 +37,8 @@
li {
&:hover > ul {
display: block;
margin-top: $spacer-2;
padding: $spacer-3 0;
margin-top: var(--space-2);
padding: var(--space-3) 0;
}
}

Expand All @@ -48,7 +48,7 @@

&::before {
content: '';
background-color: $primary-emphasis;
background-color: var(--primary-emphasis);
position: absolute;
bottom: 0;
width: 19px;
Expand All @@ -69,9 +69,9 @@
}

a {
padding: $spacer-2 $spacer-4;
padding: var(--space-2) var(--space-4);
font-weight: bold;
border-radius: $border-radius-m;
border-radius: var(--rounded-2xl);
}

&:hover > a {
Expand All @@ -90,20 +90,20 @@
ul {
@include rounded-all(12px, 12px, 12px, 12px);

background: $bg-default;
background: var(--bg-default);
text-align: left;
box-shadow: $shadow-m;
min-width: $spacer-11;
min-width: var(--space-11);

li {
a {
color: $fg-default;
padding-top: $spacer-3;
padding-bottom: $spacer-3;
color: var(--fg-default);
padding-top: var(--space-3);
padding-bottom: var(--space-3);

&:hover {
background: $bg-subtle;
color: $fg-default;
background: var(--bg-subtle);
color: var(--fg-default);
border-radius: 0;
}
}
Expand Down
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ h5,
h6 {
@include title-family;

color: $fg-default;
color: var(--fg-default);
letter-spacing: 0.5px;
margin-top: 0;
}

p {
margin-bottom: $spacer-4;
margin-bottom: var(--space-4);
}
6 changes: 3 additions & 3 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
@include body-medium;

text-transform: none;
margin-bottom: $spacer-1;
margin-bottom: var(--space-1);

a,
a:link,
a:visited,
a:active {
color: $fg-subtle;
color: var(--fg-subtle);
}

.breadcrumb_sep {
color: $primary-fg;
color: var(--primary-fg);
font-weight: bold;
}
}
12 changes: 6 additions & 6 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_dropdown_menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@
background: none;
border: none;
box-shadow: $shadow-m;
border-radius: $border-radius-s;
border-radius: var(--rounded-xl);
padding: 0;
overflow: hidden;

.dropdown_menu_list {
border: none;
box-shadow: none;
padding: $spacer-3 0;
min-width: $spacer-11;
padding: var(--space-3) 0;
min-width: var(--space-11);

li {
border: none;

a {
padding: $spacer-3 $spacer-4;
padding: var(--space-3) var(--space-4);
text-align: left;
@include body-medium;

&:hover {
background-image: none;
text-shadow: none;
background-color: $bg-subtle;
color: $fg-default;
background-color: var(--bg-subtle);
color: var(--fg-default);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.pagination_information {
color: $fg-subtle;
color: var(--fg-subtle);

b {
color: $fg-default;
color: var(--fg-default);
}
}
2 changes: 1 addition & 1 deletion captive-admin/app/assets/stylesheets/captive-admin/components/_panels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}

.panel {
background: $bg-subtle;
background: var(--bg-subtle);
}

// ----------------------------------- Sidebar Sections
Expand Down
2 changes: 1 addition & 1 deletion captive-admin/app/assets/stylesheets/captive-admin/components/_scopes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.scopes {
li {
.count {
color: $fg-default;
color: var(--fg-default);
}

&:first-child a {
Expand Down
12 changes: 6 additions & 6 deletions captive-admin/app/assets/stylesheets/captive-admin/components/_status_tags.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.status_tag {
border: 1px solid;
border-radius: $border-radius-m;
border-radius: var(--rounded-2xl);
letter-spacing: 0.5px;
padding: $spacer-2 $spacer-3;
padding: var(--space-2) var(--space-3);

&.yes {
background: $success-subtle;
color: $success-fg;
background: var(--success-subtle);
color: var(--success-fg);
}

&.no {
background: $bg-subtle;
color: $fg-muted;
background: var(--bg-subtle);
color: var(--fg-muted);
}
}
Loading