Skip to content

Commit

Permalink
Merge pull request #128 from movableink/nicksteffens/sc-86339/tailwin…
Browse files Browse the repository at this point in the history
…d-config/color-updates

Nicksteffens/sc 86339/tailwind config/color updates
  • Loading branch information
nicksteffens authored Jul 25, 2023
2 parents cefd86c + 45c8fc2 commit cb3c864
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 27 deletions.
17 changes: 1 addition & 16 deletions .storybook/preview-head.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,4 @@
<script src="./testem.js"></script>
<script src="./assets/vendor.js"></script>
<script>runningTests = true; Ember.testing=true;</script>
<script src="./assets/dummy.js"></script>
<script>
(function() {
var srcUrl = null;
var host = location.hostname || 'localhost';
var defaultPort = location.protocol === 'https:' ? 443 : 80;
var port = 9999;
var path = '';
var prefixURL = '';
var src = srcUrl || prefixURL + '/_lr/livereload.js?port=' + port + '&host=' + host + path;
var script = document.createElement('script');
script.type = 'text/javascript';
script.src = location.protocol + '//' + host + ':9999' + src;
document.getElementsByTagName('head')[0].appendChild(script);
}());
</script>
<script src="./assets/dummy.js"></script>
2 changes: 1 addition & 1 deletion addon/components/fluid-drawer.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{{! This element is the actual root of the drawer }}
<div
class="bg-neutral-100 fixed right-0 top-0 h-screen max-h-screen w-1/4 max-w-1/2 min-w-250 px-4 border-t-8 border-violet-500 shadow-lg overflow-y-scroll z-10"
class="bg-neutral-100 fixed right-0 top-0 h-screen max-h-screen w-1/4 max-w-1/2 min-w-250 px-4 border-t-8 border-purple-500 shadow-lg overflow-y-scroll z-10"
...attributes
>
<div class="flex sticky top-0 py-3 bg-neutral-100">
Expand Down
8 changes: 4 additions & 4 deletions app/styles/fluid/components/on-off-switch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@
}

&.on {
background: theme('colors.aqua.400');
border-color: theme('colors.aqua.500');
background: theme('colors.lightblue.400');
border-color: theme('colors.lightblue.500');
span {
left: calc(2.5rem - 0.1rem);
border-color: theme('colors.aqua.500');
border-color: theme('colors.lightblue.500');
}
&.pressed {
background: theme('colors.aqua.500');
background: theme('colors.lightblue.500');
}
.liquid-child:nth-child(1) {
color: theme('colors.neutral.100');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@movable/eslint-config": "^2.0.0",
"@movable/eslint-config-ember": "^1.0.1",
"@movable/prettier-config": "^1.0.0",
"@movable/tailwind-config": "^2.6.3",
"@movable/tailwind-config": "^3.1.0",
"@movable/template-lint-plugin": "^3.0.2",
"@mozaic-ds/postcss-sass": "4.0.0-next.0",
"@percy/cli": "^1.16.0",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3064,7 +3064,7 @@ __metadata:
"@movable/eslint-config": ^2.0.0
"@movable/eslint-config-ember": ^1.0.1
"@movable/prettier-config": ^1.0.0
"@movable/tailwind-config": ^2.6.3
"@movable/tailwind-config": ^3.1.0
"@movable/template-lint-plugin": ^3.0.2
"@mozaic-ds/postcss-sass": 4.0.0-next.0
"@percy/cli": ^1.16.0
Expand Down Expand Up @@ -3170,10 +3170,10 @@ __metadata:
languageName: node
linkType: hard

"@movable/tailwind-config@npm:^2.6.3":
version: 2.6.3
resolution: "@movable/tailwind-config@npm:2.6.3"
checksum: 87ed364057ff472e239e22f58bf05c1827640daf390e0401999f56328515a2c10e8b5fdf206a4d17b32c112f1267111fc87e15fe1dc050a22888855157f33447
"@movable/tailwind-config@npm:^3.1.0":
version: 3.1.0
resolution: "@movable/tailwind-config@npm:3.1.0"
checksum: 5270e08e1d721a48d0f77e0dae533213734248eba15bd9b02dd67ce02db704027cc3d5aa3dbda51755fc01c03290738d989ebaf3af85a4c717f78fe102d05fb3
languageName: node
linkType: hard

Expand Down

0 comments on commit cb3c864

Please sign in to comment.