Skip to content

Commit

Permalink
final theme changes
Browse files Browse the repository at this point in the history
  • Loading branch information
evanaronson committed Nov 25, 2024
1 parent b76bcf0 commit aa00500
Show file tree
Hide file tree
Showing 25 changed files with 98 additions and 108 deletions.
26 changes: 25 additions & 1 deletion components/home/modules/ROOT/pages/index.adoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
= Documentation
= Aragon Developer Portal

Explore our guides and examples to learn how.

== The modular governance stack

Explanation here

=== Aragon OSx

Docs here

=== Plugin marketplace

Governance logic is encapsulated in reusable contracts called _plugins_.

Plugins are granted specific permissions depending what you want them to do. In practice, they often act as governing bodies or decision-making processes. For example, a token voting plugin or multisig plugin define all of their unique governance logic within the plugin itself. This “separation of concerns” keeps the protocol focused and ultimately more flexible.

The core plugins currently supported by Aragon are:
* *Token Voting*: Proposals are created for token holders and delegates to vote on proposals, with execution decided using a simple majority rule.
* *Multisig*: Proposals are created for designated addresses to approve, with execution decided by whether a minimum number of approvers is met.
* *Admin*: Proposals are created by designated addresses and immediately executed.
* *Staged Proposal Processor*: Proposals are created and progress through any number of stages, with other plugins either voting to approve or veto the proposal. The SPP plugin is essentially a cross-plugin state manager that enables governance processes with multiple stages and multiple governing bodies.

=== Governance Tooling

Other description here.
1 change: 1 addition & 0 deletions components/osx/index.adoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
= Documentation

Explore our guides and examples to learn how.
zz
9 changes: 8 additions & 1 deletion playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ site:
content:
sources:
- url: .
branches: feature/new-way
branches: feature/new-way-theming
start_path: components/home
- url: .
branches: feature/new-way
Expand All @@ -31,6 +31,13 @@ content:
- url: https://github.com/aragon/gov-ui-kit
branches: feat/documentation-antora
start_path: docs
- url: https://github.com/aragon/gov-app-template
branches: feat/documentation-antora
start_path: docs
- url: https://github.com/aragon/admin-plugin
branches: feat/docs
start_path: docs


ui:
bundle:
Expand Down
2 changes: 1 addition & 1 deletion ui/src/css/article.scss
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@

a {
text-decoration: none;
text-transform: uppercase;
/* text-transform: uppercase; */
font-size: var(--guk-font-size-base);
color: var(--guk-color-neutral-500);
}
Expand Down
8 changes: 4 additions & 4 deletions ui/src/css/components/cards.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* grid layout */

.sectionbody{
background-color: var(--guk-color-neutral-0); /* White background */
border: 1px solid var(--guk-color-neutral-100); /* Slightly darker grey border */
border-radius: var(--guk-border-rounded-xl); /* Rounded edges */
padding: var(--guk-space-6);
/* background-color: var(--guk-color-neutral-0);
border: 1px solid var(--guk-color-neutral-100);
border-radius: var(--guk-border-rounded-xl);
padding: var(--guk-space-6); */
}

.card-section .sectionbody, .card-section .content {
Expand Down
14 changes: 9 additions & 5 deletions ui/src/css/footer.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
/* footer.scss */

footer.footer {
font-size: 0.7rem;
font-size: var(--guk-size-base);
background-color: var(--guk-color-neutral-0); /* #ffffff */
padding: var(--guk-space-6) var(--guk-space-8); /* 24px 32px */
color: var(--guk-color-neutral-500); /* #616e7c */
border-top: solid 1px rgba(31, 41, 51, 0.10); /* Uses --guk-color-neutral-900 */
border-top: solid 1px var(--guk-color-neutral-100); /* Uses --guk-color-neutral-900 */
}

.footer a {
color: rgba(31, 41, 51, 0.7); /* Semi-transparent using --guk-color-neutral-900 */
color: var(--guk-color-neutral-500); /* Semi-transparent using --guk-color-neutral-900 */
display: inline;
margin-left: var(--guk-space-1-5); /* 6px */
border-left: 1px solid rgba(31, 41, 51, 0.7);
margin-left: var(--guk-space-4); /* 6px */
/* border-left: 1px solid rgba(31, 41, 51, 0.7); */
padding-left: var(--guk-space-1-5); /* 6px */
}

.footer a:hover {
color: var(--guk-color-neutral-800); /* Semi-transparent using --guk-color-neutral-900 */
}
4 changes: 2 additions & 2 deletions ui/src/css/globals/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/* Body Styles */
body {
color: var(--guk-color-neutral-900);
color: var(--guk-color-neutral-600);
font-family: var(--guk-font-family);
font-size: var(--guk-font-size-base); /* 1rem */
line-height: var(--guk-line-height-normal); /* 1.5 */
Expand All @@ -32,7 +32,7 @@ h3,
h4,
h5,
h6 {
color: var(--guk-color-neutral-800);
color: var(--guk-color-neutral-900);
font-family: var(--guk-font-family);
/* font-weight: var(--guk-font-weight-semibold); /* 600 */
line-height: var(--guk-line-height-tight); /* 1.25 */
Expand Down
3 changes: 3 additions & 0 deletions ui/src/css/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
}

.navbar-item {
margin-left: 32px;
margin-right: 0px;
color: var(--guk-color-neutral-500); /* Replaces var(--color-text) */
padding: var(--guk-space-2); /* 8px */
font-family: var(--guk-font-family); /* Replaces var(--heading) */
Expand Down Expand Up @@ -74,6 +76,7 @@
}

.navbar-search-input {
margin-right: 8px;
font-size: var(--guk-font-size-base); /* 1rem */
background-color: var(--guk-color-neutral-0); /* Replaces var(--aluminum-1) */
color: var(--guk-color-neutral-500);
Expand Down
9 changes: 5 additions & 4 deletions ui/src/css/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}

.nav-heading {
margin: .75rem 0;
margin: .75rem 1.3rem;
align-items: center;
}

Expand Down Expand Up @@ -137,16 +137,17 @@ button.collapse-toggle {
.navbar-search {
position: relative;
display: flex;
flex-grow: 1;
/* flex-grow: 1; */
}

.navbar-search-input {
flex-grow: 1;
/* flex-grow: 1; */
width: 20em;
padding: .5rem !important;
}

.navbar-end {
flex-grow: 1;
/* flex-grow: 1; */
display: flex;
justify-content: space-around;
flex-wrap: wrap;
Expand Down
29 changes: 15 additions & 14 deletions ui/src/css/specific/navigation.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
/* navigation.scss */

.nav {
border-right: solid 1px var(--guk-color-neutral-100);
padding: 1rem;
background: var(--guk-color-neutral-0); /* Replaces var(--core-gray) */
color: var(--guk-color-neutral-600); /* Replaces var(--color-text-light) */

a {
text-decoration: none;
color: var(--guk-color-neutral-500);
/* color: var(--guk-color-neutral-600); */
}

.nav-li-active > a {
color: var(--guk-color-neutral-800); /* Replaces var(--core-violet-4) */
border-bottom: 2px solid var(--guk-color-primary-400);
color: var(--guk-color-primary-400); /* Replaces var(--core-violet-4) */
/* border-bottom: 2px solid var(--guk-color-primary-400); */
}
}

Expand All @@ -33,7 +34,7 @@
padding: 0 1rem;
font-size: 0.8em;
font-family: var(--guk-font-family); /* Replaces var(--heading) */
color: var(--guk-color-neutral-400); /* Replaces var(--aluminum-5) */
color: var(--guk-color-neutral-600); /* Replaces var(--aluminum-5) */
letter-spacing: 0.05em;
font-weight: var(--guk-font-weight-semibold); /* Replaces var(--weight-bold) */
text-transform: uppercase;
Expand All @@ -45,27 +46,27 @@
line-height: 1.5rem;*/
margin-left: 1.3rem;
cursor: pointer;
color: var(--guk-color-primary-400);
color: var(--guk-color-neutral-400);

/*

&::before {
display: inline-block;
content: url(../images/icons/arrow_back.svg);
margin-right: 0.3em;
margin-left: -1.3rem;
width: 1rem;
}*/
}
}

.btn-back:hover {
color: var(--guk-color-primary-600);
color: var(--guk-color-neutral-700);
}

.nav-heading {
font-size: 1.3rem;
font-weight: var(--guk-font-weight-normal); /* Replaces var(--weight-medium) */
font-size: 1.2rem;
font-weight: var(--guk-font-weight-semibold); /* Replaces var(--weight-medium) */
font-family: var(--guk-font-family); /* Replaces var(--heading) */
padding: 0 1rem;
/* padding: 0 1rem; */
}

.nav-component-active {
Expand All @@ -78,21 +79,21 @@
}

.nav-component-heading {
color: var(--guk-color-neutral-700); /* Replaces var(--steel-4) */
color: var(--guk-color-neutral-600); /* Replaces var(--steel-4) */
font-family: var(--guk-font-family); /* Replaces var(--heading) */
font-weight: var(--guk-font-weight-normal); /* Replaces var(--weight-medium) */
position: relative;
font-size: 1rem;
}

.nav-link {
color: var(--guk-color-neutral-800);
color: var(--guk-color-neutral-600);
margin-bottom: var(--guk-space-2);
cursor: pointer;
}

.nav-link:hover {
color: var(--guk-color-neutral-800);
color: var(--guk-color-neutral-900);
cursor: pointer;
}

Expand Down
4 changes: 2 additions & 2 deletions ui/src/css/toc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
}

.subheading-list {
border-left: solid 1px var(--guk-color-neutral-200);
margin-left: var(--guk-space-2); /* Equivalent to 8px */
}
}

.toc-title {
/* font-size: inherit; */
font-size: inherit;
font-size: var(--guk-font-size-sm);
margin: 0;
padding: 0;
font-family: var(--guk-font-family); /* Replaces var(--heading) */
Expand Down
4 changes: 2 additions & 2 deletions ui/theme/dist/index.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/theme/dist/index.css.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ui/theme/images/icons/admin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ui/theme/images/icons/gov-app-template.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions ui/theme/images/icons/gov-ui-kit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 1 addition & 9 deletions ui/theme/images/icons/multisig.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit aa00500

Please sign in to comment.