diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss index 64604d3bf..c75a2cd8a 100644 --- a/app/assets/stylesheets/base/layout.scss +++ b/app/assets/stylesheets/base/layout.scss @@ -276,7 +276,7 @@ --content-padding-y: var(--su-7); } - @media (min-width: $breakpoint-xl) { + @media (min-width: $breakpoint-l) { --content-padding-x: var(--su-9); } } diff --git a/app/assets/stylesheets/components/avatars.scss b/app/assets/stylesheets/components/avatars.scss index c72e1e948..1713eac68 100644 --- a/app/assets/stylesheets/components/avatars.scss +++ b/app/assets/stylesheets/components/avatars.scss @@ -133,30 +133,6 @@ } } } - - @media (min-width: $breakpoint-xl) { - .xl\:crayons-#{$name} { - &--l { - width: var(--su-7); - height: var(--su-7); - } - - &--xl { - width: var(--su-8); - height: var(--su-8); - } - - &--2xl { - width: var(--su-9); - height: var(--su-9); - } - - &--3xl { - width: var(--su-10); - height: var(--su-10); - } - } - } } @include avatar-logo('avatar', 100%, var(--card-color-tertiary)); diff --git a/app/assets/stylesheets/config/_generator.scss b/app/assets/stylesheets/config/_generator.scss index b427014e4..7cc92b351 100644 --- a/app/assets/stylesheets/config/_generator.scss +++ b/app/assets/stylesheets/config/_generator.scss @@ -296,119 +296,35 @@ ( 'top', 'top', - ( - 'auto': auto, - 'unset': unset, - '0': 0, - '1': var(--su-1), - '2': var(--su-2), - '3': var(--su-3), - '4': var(--su-4), - '100': 100% - ), - (), - true - ), - ( - '-top', - 'top', - ( - '1': calc(var(--su-1) * -1), - '2': calc(var(--su-2) * -1), - '3': calc(var(--su-3) * -1), - '4': calc(var(--su-4) * -1), - '100': -100% - ), - (), + ('auto': auto, 'unset': unset, '0': 0, '100': 100%), + $spacing-units, true ), + ('-top', 'top', ('100': -100%), $negative-spacing-units, true), ( 'bottom', 'bottom', - ( - 'auto': auto, - 'unset': unset, - '0': 0, - '1': var(--su-1), - '2': var(--su-2), - '3': var(--su-3), - '4': var(--su-4), - '100': 100% - ), - (), - true - ), - ( - '-bottom', - 'bottom', - ( - '1': calc(var(--su-1) * -1), - '2': calc(var(--su-2) * -1), - '3': calc(var(--su-3) * -1), - '4': calc(var(--su-4) * -1), - '100': -100% - ), - (), + ('auto': auto, 'unset': unset, '0': 0, '100': 100%), + $spacing-units, true ), + ('-bottom', 'bottom', ('100': -100%), $negative-spacing-units, true), ( 'left', 'left', - ( - 'auto': auto, - 'unset': unset, - '0': 0, - '1': var(--su-1), - '2': var(--su-2), - '3': var(--su-3), - '4': var(--su-4), - '100': 100% - ), - (), - true - ), - ( - '-left', - 'left', - ( - '1': calc(var(--su-1) * -1), - '2': calc(var(--su-2) * -1), - '3': calc(var(--su-3) * -1), - '4': calc(var(--su-4) * -1), - '100': -100% - ), - (), + ('auto': auto, 'unset': unset, '0': 0, '100': 100%), + $spacing-units, true ), + ('-left', 'left', ('100': -100%), $negative-spacing-units, true), ( 'right', 'right', - ( - 'auto': auto, - 'unset': unset, - '0': 0, - '1': var(--su-1), - '2': var(--su-2), - '3': var(--su-3), - '4': var(--su-4), - '100': 100% - ), - (), - true - ), - ( - '-right', - 'right', - ( - '1': calc(var(--su-1) * -1), - '2': calc(var(--su-2) * -1), - '3': calc(var(--su-3) * -1), - '4': calc(var(--su-4) * -1), - '100': -100% - ), - (), + ('auto': auto, 'unset': unset, '0': 0, '100': 100%), + $spacing-units, true ), + ('-right', 'right', ('100': -100%), $negative-spacing-units, true), ('z', 'z-index', $z-indexes, (), false), ( 'overflow', diff --git a/app/assets/stylesheets/config/_import.scss b/app/assets/stylesheets/config/_import.scss index 645b5d7b4..66d09be4b 100644 --- a/app/assets/stylesheets/config/_import.scss +++ b/app/assets/stylesheets/config/_import.scss @@ -25,17 +25,9 @@ $colors: ( 'base-0': var(--base-0), 'base-inverted': var(--base-inverted), 'accent-brand': var(--accent-brand), - 'accent-brand-darker': var(--accent-brand-darker), - 'accent-brand-lighter': var(--accent-brand-lighter), 'accent-success': var(--accent-success), - 'accent-success-darker': var(--accent-success-darker), - 'accent-success-lighter': var(--accent-success-lighter), 'accent-warning': var(--accent-warning), - 'accent-warning-darker': var(--accent-warning-darker), - 'accent-warning-lighter': var(--accent-warning-lighter), 'accent-danger': var(--accent-danger), - 'accent-danger-darker': var(--accent-danger-darker), - 'accent-danger-lighter': var(--accent-danger-lighter), ); //////////////////////////////////////////////////////////////////////////////////// @@ -47,13 +39,11 @@ $colors: ( $breakpoint-s: 640px; $breakpoint-m: 768px; $breakpoint-l: 1024px; -$breakpoint-xl: 1280px; $breakpoints: ( 's': $breakpoint-s, 'm': $breakpoint-m, 'l': $breakpoint-l, - 'xl': $breakpoint-xl, ); //////////////////////////////////////////////////////////////////////////////////// @@ -178,7 +168,7 @@ $z-indexes: ( @each $name, $value in $values { .#{$prefix}#{$separator}#{$name} { @each $property in $properties { - #{$property}: $value !important; + #{$property}: $value; } } } @@ -188,7 +178,7 @@ $z-indexes: ( // initialize-generator() // -// Initilize generators. +// Initialize generators. // // @param {list} $breakpoints All our responsiveness breakpoints. // @param {list} $classes All the parameters required by generate-classes(). @@ -225,7 +215,7 @@ $z-indexes: ( // @param {integer} $level Visual elevation level: 0-4 // @param {color} $bg Background color // @param {color} $border Border and shadow colors -// @param {color} $color Contnet color +// @param {color} $color Content color @mixin generate-box( $level: 1, diff --git a/app/assets/stylesheets/crayons.scss b/app/assets/stylesheets/crayons.scss index 9c6cc4938..919a12df2 100644 --- a/app/assets/stylesheets/crayons.scss +++ b/app/assets/stylesheets/crayons.scss @@ -1,6 +1,5 @@ @import 'config/variables'; @import 'config/colors'; -@import 'config/generator'; @import 'base/reset'; @import 'base/main'; @@ -33,3 +32,5 @@ @import 'components/tabs'; @import 'components/tags'; @import 'components/tooltips'; + +@import 'config/generator'; diff --git a/app/assets/stylesheets/views/mod-actions.scss b/app/assets/stylesheets/views/mod-actions.scss index 8899a0870..be07a5cc1 100644 --- a/app/assets/stylesheets/views/mod-actions.scss +++ b/app/assets/stylesheets/views/mod-actions.scss @@ -30,22 +30,6 @@ } } -.mod-actions-menu-btn { - position: fixed; - bottom: var(--su-7); - margin-bottom: env(safe-area-inset-bottom); - right: var(--su-7); - z-index: var(--z-elevate); - cursor: pointer; - border-radius: 50px; - - @media (max-width: $breakpoint-m) { - bottom: calc(var(--header-height) + var(--su-3)); - right: var(--su-3); - padding: 0; - } -} - .mod-container { display: flex; flex-direction: column; diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index fbcbc1058..714765244 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -130,10 +130,4 @@ class PagesController < ApplicationController redirect_to "/notifications" end end - - def crayons - @page = Page.find_by(slug: "crayons") - render :show if @page - set_surrogate_key_header "crayons_page" - end end diff --git a/app/javascript/.storybook/preview.js b/app/javascript/.storybook/preview.js index f61c6cd4e..602932c19 100644 --- a/app/javascript/.storybook/preview.js +++ b/app/javascript/.storybook/preview.js @@ -3,8 +3,8 @@ import { addDecorator, addParameters } from '@storybook/preact'; import { DocsPage, DocsContainer } from '@storybook/addon-docs/blocks'; import '../../assets/stylesheets/minimal.scss'; -import '../../assets/stylesheets/crayons.scss'; import '../../assets/stylesheets/views.scss'; +import '../../assets/stylesheets/crayons.scss'; import '../../assets/javascripts/lib/xss'; import '../../assets/javascripts/utilities/timeAgo'; import './storybook.scss'; diff --git a/app/javascript/actionsPanel/initializeActionsPanelToggle.js b/app/javascript/actionsPanel/initializeActionsPanelToggle.js index f4cb50fa6..0a8c62f1e 100644 --- a/app/javascript/actionsPanel/initializeActionsPanelToggle.js +++ b/app/javascript/actionsPanel/initializeActionsPanelToggle.js @@ -6,13 +6,10 @@ export function initializeActionsPanel(user, path) { `; const modActionsMenuIconHTML = ` -