Skip to content

Commit

Permalink
Add pulsar styling to dropdowns and modals, and include Pulsar in the…
Browse files Browse the repository at this point in the history 
… dev environment
  • Loading branch information
@Stanton
Stanton committed Nov 30, 2023
1 parent 12ba360 commit e80ce1d
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 76 deletions.
3 changes: 3 additions & 0 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
"twig/twig": "^2.0",
"jadu/twig-attribute-parser": "^1.0",
"jadu/twig-helper-options-modifier": "^1.0"
},
"require-dev": {
"jadu/pulsar": "^14.0"
}
}
56 changes: 47 additions & 9 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions dist/js/bundle.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

$loader = new Twig_Loader_Filesystem($templateDir);
$loader->addPath($baseDir . '/', 'src');
$loader->addPath($baseDir . '/vendor/jadu/pulsar/views/', 'pulsar');

$twig = new Twig_Environment($loader,
array(
Expand Down
82 changes: 25 additions & 57 deletions skins/ui/pulsar/skin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
box-sizing: content-box;
color: #000;
cursor: auto;
font-family: "proxima_novalight", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-size: 16px;
font-style: normal;
font-weight: normal;
Expand All @@ -25,7 +26,6 @@
color: inherit;
cursor: inherit;
direction: inherit;

font-size: inherit;
font-style: inherit;
font-weight: inherit;
Expand Down Expand Up @@ -243,9 +243,7 @@ button::-moz-focus-inner {
color: #fff;
cursor: pointer;
display: inline-block;

font-style: normal;
font-weight: bold;
letter-spacing: normal;
line-height: 24px;
margin: 0;
Expand All @@ -264,40 +262,28 @@ button::-moz-focus-inner {
color: rgba(255, 255, 255, 0.5);
cursor: not-allowed;
}
.tox .tox-button:focus:not(:disabled) {
background-color: #364082;
background-image: none;
border-color: #364082;
box-shadow: none;
color: #fff;
}
.tox .tox-button:hover:not(:disabled) {
background-color: #364082;
background-image: none;
border-color: #364082;
box-shadow: none;
color: #fff;
}
.tox .tox-button:active:not(:disabled) {
background-color: #2f3770;
background-image: none;
border-color: #2f3770;
box-shadow: none;
color: #fff;
.tox .tox-button:active:not(:disabled),
.tox .tox-button:focus:not(:disabled) {
background-color: #fd0 !important;
box-shadow: 0 0 0 2px #1e1e1e !important;
color: #1e1e1e !important;
}
.tox .tox-button--secondary {
background-color: #ebebeb;
background-color: #fff;
background-image: none;
background-position: 0 0;
background-repeat: repeat;
border-color: #ebebeb;
border-radius: 0px;
border-style: solid;
border-width: 1px;
border: 0;
box-shadow: none;
color: #000;
font-style: normal;
font-weight: bold;
letter-spacing: normal;
outline: none;
padding: 4px 16px;
Expand All @@ -306,29 +292,11 @@ button::-moz-focus-inner {
}
.tox .tox-button--secondary[disabled] {
background-color: #ebebeb;
background-image: none;
border-color: #ebebeb;
box-shadow: none;
color: rgba(34, 47, 62, 0.5);
}
.tox .tox-button--secondary:focus:not(:disabled) {
background-color: #dedede;
background-image: none;
border-color: #dedede;
box-shadow: none;
color: #000;
}
.tox .tox-button--secondary:hover:not(:disabled) {
background-color: #dedede;
background-image: none;
border-color: #dedede;
box-shadow: none;
color: #000;
}
.tox .tox-button--secondary:active:not(:disabled) {
background-color: #d1d1d1;
background-color: #fff;
background-image: none;
border-color: #d1d1d1;
box-shadow: none;
color: #000;
}
Expand Down Expand Up @@ -1130,7 +1098,7 @@ button::-moz-focus-inner {
background-color: #fafafa;
}
.tox .tox-dialog {
background-color: #fafafa;
background-color: #fff;
border-color: #7e7e7e;
border-radius: 0px;
box-shadow: 0 0 0 12px rgba(62, 73, 148, 0.3);
Expand All @@ -1155,11 +1123,11 @@ button::-moz-focus-inner {
}
.tox .tox-dialog__header {
align-items: center;
background-color: #fafafa;
border-bottom: none;
border-bottom: 1px solid #e5e5e5;
color: #000;
display: flex;
font-size: 16px;
font-family: "code_pro_bold", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
font-size: 24px;
justify-content: space-between;
padding: 15px;
position: relative;
Expand Down Expand Up @@ -1343,8 +1311,7 @@ button::-moz-focus-inner {
}
.tox .tox-dialog__footer {
align-items: center;
background-color: #fafafa;
border-top: 1px solid #7e7e7e;
border-top: 1px solid #e5e5e5;
display: flex;
justify-content: space-between;
padding: 20px;
Expand Down Expand Up @@ -1506,6 +1473,7 @@ body.tox-dialog__disable-scroll {
overflow: hidden;
}
.tox .tox-editor-header {
border-bottom: 1px solid #7e7e7e;
z-index: 1;
}
.tox:not(.tox-tinymce-inline) .tox-editor-header {
Expand Down Expand Up @@ -1652,7 +1620,7 @@ body.tox-dialog__disable-scroll {
display: block;
font-style: normal;
font-weight: normal;
line-height: 1.3;
line-height: 1.6;
padding: 0 8px 0 0;
text-transform: none;
white-space: nowrap;
Expand Down Expand Up @@ -2069,9 +2037,8 @@ body.tox-dialog__disable-scroll {
}
.tox .tox-menu {
background-color: #fafafa;
border: 1px solid #7e7e7e;
border-radius: 0px;
box-shadow: 0 4px 8px 0 rgba(34, 47, 62, 0.1);
box-shadow: 0 0 0 6px rgba(62, 73, 148, 0.3);
display: inline-block;
overflow: hidden;
vertical-align: top;
Expand All @@ -2098,7 +2065,7 @@ body.tox-dialog__disable-scroll {
margin: 0;
}
.tox .tox-menubar {
background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%237e7e7e'/%3E%3C/svg%3E") left 0 top 0 #fafafa;
/* background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%237e7e7e'/%3E%3C/svg%3E") left 0 top 0 #fafafa; */
background-color: #fafafa;
display: flex;
flex: 0 0 auto;
Expand All @@ -2114,7 +2081,6 @@ body.tox-dialog__disable-scroll {
align-items: center;
background: transparent;
border: 0;
border-radius: 3px;
box-shadow: none;
color: #000;
display: flex;
Expand Down Expand Up @@ -2577,6 +2543,9 @@ body.tox-dialog__disable-scroll {
justify-content: flex-end;
overflow: hidden;
}
.tox .tox-statusbar__right-container {
height: 16px;
}
.tox .tox-statusbar__path {
display: flex;
flex: 1 1 auto;
Expand Down Expand Up @@ -2658,7 +2627,6 @@ body.tox-dialog__disable-scroll {
align-items: center;
background: transparent;
border: 0;
border-radius: 3px;
box-shadow: none;
color: #000;
display: flex;
Expand Down Expand Up @@ -2848,7 +2816,7 @@ body.tox-dialog__disable-scroll {
.tox .tox-toolbar,
.tox .tox-toolbar__primary,
.tox .tox-toolbar__overflow {
background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='%237e7e7e'/%3E%3C/svg%3E") left 0 top 0 #fafafa;
border-top: 1px solid #ddd;
background-color: #fafafa;
display: flex;
flex: 0 0 auto;
Expand All @@ -2871,7 +2839,7 @@ body.tox-dialog__disable-scroll {
}
.tox .tox-menubar + .tox-toolbar,
.tox .tox-menubar + .tox-toolbar-overlord .tox-toolbar__primary {
border-top: 1px solid #7e7e7e;
/* border-top: 1px solid #7e7e7e; */
margin-top: -1px;
}
.tox .tox-toolbar--scrolling {
Expand Down Expand Up @@ -2909,10 +2877,10 @@ body.tox-dialog__disable-scroll {
flex-wrap: nowrap;
}
.tox:not([dir=rtl]) .tox-toolbar__group:not(:last-of-type) {
border-right: 1px solid #7e7e7e;
border-right: 1px solid #ddd;
}
.tox[dir=rtl] .tox-toolbar__group:not(:last-of-type) {
border-left: 1px solid #7e7e7e;
border-left: 1px solid #ddd;
}
.tox .tox-tooltip {
display: inline-block;
Expand Down

0 comments on commit e80ce1d

Please sign in to comment.