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

(#360) Styles to Support the Use Cases > Server #361

Merged
merged 1 commit into from
Nov 3, 2023
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ Choco-theme contains many external libraries in which it depends on for various
| typeahead.js | :heavy_minus_sign: | :clock3: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: |
| jQuery Validation | :heavy_check_mark: | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :grey_question: | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: |
| jQuery Validation Unobtrusive | :heavy_check_mark: | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :grey_question: | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: |
| Balance Text | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: |

### Custom JavaScript and TypeScript

Expand Down
2 changes: 1 addition & 1 deletion getting-started/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"homepage": "https://github.com/chocolatey/chocolatey.org#readme",
"devDependencies": {
"choco-theme": "0.5.14"
"choco-theme": "0.5.15"
},
"resolutions": {
"glob-parent": "^6.0.2",
Expand Down
2 changes: 2 additions & 0 deletions js/init/chocolatey-org.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Alert, Button, Carousel, Collapse, Modal, Offcanvas, Tab } from 'bootstrap';
import { atcb_init } from 'add-to-calendar-button'; // eslint-disable-line camelcase
import balanceText from 'balance-text';
import '../lib/prism.min.js';
import '../chocolatey-alerts.js';
import '../chocolatey-announcements.js';
Expand Down Expand Up @@ -28,3 +29,4 @@ import '../chocolatey-terminal.js';
import '../chocolatey-theme-toggle.js';
import '../chocolatey-toggle-fade-show.js';
atcb_init();
balanceText();
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "choco-theme",
"version": "0.5.14",
"version": "0.5.15",
"description": "The global theme for Chocolatey Software.",
"repository": {
"type": "git",
Expand Down Expand Up @@ -35,6 +35,7 @@
"add-to-calendar-button": "^1.18.8",
"anchor-js": "^4.3.1",
"babelify": "^10.0.0",
"balance-text": "^3.3.1",
"bootstrap": "5.2.3",
"browserify": "^17.0.0",
"canvas-confetti": "^1.5.1",
Expand Down
8 changes: 8 additions & 0 deletions scss/_backgrounds-headers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ a.circle.text-bg-theme-contrast:hover {
background: $primary-opacity-90 !important;
}

.bg-danger-opacity {
background: var(--choco-theme-red-light) !important;
}

.bg-success-opacity {
background: var(--choco-theme-green-light) !important;
}

.bg-gradient-body-elevation-1 {
background-image: linear-gradient(-180deg, var(--choco-theme-background), var(--choco-theme-elevation-1));
}
Expand Down
8 changes: 4 additions & 4 deletions scss/_terminal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
font-size: calc(1.325rem + .9vw);
}

.terminal-cursor {
.terminal-cursor:not(.terminal-sm-cursor) {
height: calc(1.325rem + .9vw);
}
}
Expand All @@ -31,7 +31,7 @@
font-size: calc(1.375rem + 1.5vw);
}

.terminal-cursor {
.terminal-cursor:not(.terminal-sm-cursor) {
height: calc(1.375rem + 1.5vw);
}
}
Expand All @@ -43,7 +43,7 @@
font-size: 3.4rem;
}

.terminal-cursor {
.terminal-cursor:not(.terminal-sm-cursor) {
height: 3.4rem;
}
}
Expand All @@ -55,7 +55,7 @@
font-size: 4rem;
}

.terminal-cursor {
.terminal-cursor:not(.terminal-sm-cursor) {
height: 4rem;
}
}
Expand Down
24 changes: 23 additions & 1 deletion scss/_text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@
word-break: keep-all;
}

/* Plugin looks for elements with class named "balance-text" */
.balance-text {
text-wrap: balance; /* Apply (proposed) CSS style */
}

.text-shiny {
--text-shiny-shine: #{$primary};
--text-shiny-color: var(--choco-theme-text);
Expand All @@ -64,11 +69,28 @@
background-clip: text;
background-size: 260% auto;
-webkit-text-fill-color: transparent;
animation: text-shine 2.5s ease-out;
animation: text-shine 3s ease-out .5s;
}

@keyframes text-shine {
to {
background-position: -200%;
}
}

.fade-in {
opacity: 0;
animation-name: fade-in;
animation-duration: .25s;
animation-timing-function: ease-in;
animation-fill-mode: forwards;
}

@keyframes fade-in {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
8 changes: 0 additions & 8 deletions scss/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,6 @@
}

/* Borders */
.border:not(.border-primary),
.border-bottom,
.border-top,
.border-start,
.border-end {
border-color: var(--choco-theme-border) !important;
}

hr {
color: var(--choco-theme-border);
opacity: 1;
Expand Down
3 changes: 3 additions & 0 deletions scss/variables/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,9 @@ $input-btn-padding-y-sm: 0;
$input-btn-padding-x-sm: 6px;
$btn-font-weight: 700;

// Borders
$border-color: var(--choco-theme-border);

// Close Button
$btn-close-bg: none;
$btn-close-color: var(--choco-theme-contrast);
Expand Down