Skip to content

Commit

Permalink
Merge pull request #1443 from jadu/develop
Browse files Browse the repository at this point in the history
Develop > Main
  • Loading branch information
Stanton authored Sep 9, 2022
2 parents a099393 + 6f582bb commit bf86d8e
Show file tree
Hide file tree
Showing 11 changed files with 65 additions and 69 deletions.
61 changes: 0 additions & 61 deletions CHANGELOG.md

This file was deleted.

2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ module.exports = function(grunt) {
bump: {
options: {
updateConfigs: ['pkg'],
files: ['pulsar.json', 'package.json', 'composer.json', 'bower.json', 'VERSION'],
files: ['pulsar.json', 'package.json', 'VERSION'],
commit: true,
commitMessage: 'Release v%VERSION%',
commitFiles: ['-a'],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Watch a Jadu Academy session presented by Paul Stanton, Pulsar Product Owner whi

## Documentation

Documentation is available online at [https://jadu.github.io/pulsar/](https://jadu.github.io/pulsar/), we welcome any feedback on areas which may need improvement.
Documentation is available online at [https://jadu.github.io/pulsar/docs](https://jadu.github.io/pulsar/docs), we welcome any feedback on areas which may need improvement.

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "11.0.0-beta.1"
"version": "13.0.6"
}
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jadu-pulsar",
"version": "11.0.0-beta.1",
"version": "13.0.6",
"repository": {
"type": "git",
"url": "https://github.com/jadu/pulsar.git"
Expand Down
2 changes: 1 addition & 1 deletion pulsar.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "pulsar",
"version": "11.0.0-beta.1",
"version": "13.0.6",
"base_path": "/"
}
1 change: 0 additions & 1 deletion stylesheets/_component.forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,6 @@ fieldset {
.form__group--#{$variant}.form__group--#{$variant} .form__control:not(.checkbox):not(.radio),
.form__group--#{$variant}.form__group--#{$variant} .control__label + .controls > .form__control:not(.checkbox):not(.radio),
.form__group--#{$variant}.form__group--#{$variant} .control__label + .controls > .form__control + .select2 {
max-width: 100%;
width: #{$width};
}
}
Expand Down
13 changes: 13 additions & 0 deletions stylesheets/_component.icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,20 @@
.icon-exchange::before { content: '\f362'; } // exchange-alt
.icon-external-link-sign::before { content: '\f360'; } // external-link-square-alt
.icon-file-text::before { content: '\f15c'; } // file-alt
.icon-file-movie::before { content: '\f1c8'; } // file-video
.icon-file-zip::before { content: '\f1c6'; } // file-zipper
.icon-flag-alt::before { content: '\f024'; font-weight: 400; } // flag
.icon-file-o::before { content: '\f15b'; font-weight: 400; } // file
.icon-file-code-o::before { content: '\f1c9'; font-weight: 400; } // file-code
.icon-file-text-o::before { content: '\f15c'; font-weight: 400; } // file-lines
.icon-file-word-o::before { content: '\f1c2'; font-weight: 400; } // file-word
.icon-file-powerpoint-o::before { content: '\f1c4'; font-weight: 400; } // file-powerpoint
.icon-file-excel-o::before { content: '\f1c3'; font-weight: 400; } // file-excel
.icon-file-pdf-o::before { content: '\f1c1'; font-weight: 400; } // file-pdf
.icon-file-image-o::before { content: '\f1c5'; font-weight: 400; } // file-image
.icon-file-zip-o::before { content: '\f1c6'; font-weight: 400; } // file-zip
.icon-file-movie-o::before { content: '\f1c8'; font-weight: 400; } // file-word
.icon-file-audio-o::before { content: '\f1c7'; font-weight: 400; } // file-audio
.icon-download-alt::before { content: '\f019'; } // download
.icon-double-angle-left::before { content: '\f100'; } // angle-double-left
.icon-double-angle-right::before { content: '\f101'; } // angle-double-right
Expand Down
22 changes: 21 additions & 1 deletion stylesheets/_component.signin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ $signin-panel-mobile-width: 300px;
&.checkbox {
height: 22px;
margin: 0 1em 0 0;
padding: 0;

// check position
&::before {
Expand All @@ -364,6 +365,26 @@ $signin-panel-mobile-width: 300px;
}
}

.signin option,
.signin .select2 * {
color: color(text) !important;
}

.signin .select2-container {
margin: 0 auto 1em;
}

.signin .select2-selection__choice__remove,
.select2-selection__choice__remove:hover {
color: transparent !important;
}

.signin .select2-selection {
border: 0;
color: color(text, placeholder) !important;
outline: 2px solid rgba(0, 0, 0, .5);
}

.signin__code1.signin__code1,
.signin__code2.signin__code2 {
@extend .signin__input;
Expand Down Expand Up @@ -636,5 +657,4 @@ $signin-panel-mobile-width: 300px;
width: 100% !important;
}
// scss-lint:enable SelectorFormat

// scss-lint:enable UrlFormat
25 changes: 25 additions & 0 deletions views/lexicon/tabs/icons.html.twig

Large diffs are not rendered by default.

0 comments on commit bf86d8e

Please sign in to comment.