dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- New map option for inline system region names, closed #947

Browse Source 
- Upgraded "[_jsPlumb_](http://jsplumb.github.io/jsplumb/home.html)" js lib `v2.9.3` → `v2.13.1`
- Moved endpoint `/api/universe/systems` into new REST structure 'GET /api/rest/SystemSearch'
This commit is contained in:
Mark Friedrich
2020-04-24 21:56:05 +02:00
parent 2ffb9ffc76
commit 7cc66f1591
35 changed files with 3004 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sass/_variables.scss
View File

@@ -170,27 +170,27 @@ $btn-border-radius-base: 2px;
$btn-default-color: $gray-lightest;
$btn-default-bg: $gray-light;
$btn-default-border: darken($gray-light, 5%);
$btn-default-border: lighten($gray-light, 2%);
$btn-primary-color: $gray-lightest;
$btn-primary-bg: $brand-primary;
$btn-primary-border: darken($btn-primary-bg, 2%);
$btn-primary-border: lighten($btn-primary-bg, 2%);
$btn-success-color: $gray-lightest;
$btn-success-bg: $brand-success;
$btn-success-border: darken($btn-success-bg, 5%);
$btn-success-border: lighten($btn-success-bg, 2%);
$btn-info-color: $gray-lightest;
$btn-info-bg: $brand-info;
$btn-info-border: darken($btn-info-bg, 5%);
$btn-info-border: lighten($btn-info-bg, 2%);
$btn-warning-color: $gray-lightest;
$btn-warning-bg: $orange-dark;
$btn-warning-border: darken($btn-warning-bg, 5%);
$btn-warning-border: lighten($btn-warning-bg, 2%);
$btn-danger-color: $gray-lightest;
$btn-danger-bg: $brand-danger;
$btn-danger-border: darken($btn-danger-bg, 5%);
$btn-danger-border: lighten($btn-danger-bg, 2%);
$btn-link-disabled-color: $gray-light;

4
sass/bootstrap/_mixins.scss
View File

@@ -509,12 +509,12 @@
&.active:not(.toggle-on):not(.toggle-off) {
color: $color;
background-color: lighten($background, 6%);
border-color: lighten($border, 10%);
border-color: lighten($border, 6%);
}
.open & { &.dropdown-toggle {
color: $color;
background-color: lighten($background, 6%);
border-color: lighten($border, 10%);
border-color: lighten($border, 6%);
} }
&:active,
&.active {

30
sass/layout/_main.scss
View File

@@ -452,6 +452,7 @@ select:active, select:hover {
// smaller and less padding
padding-left: 3px;
padding-right: 3px;
line-height: 22px;
&:first-child{
padding-left: 0;
@@ -461,6 +462,23 @@ select:active, select:hover {
padding-right: 0;
}
}
// custom "remove" X icon for multi select
.select2-selection__choice__remove {
display: flex !important; // overwrite default
align-items: center;
justify-content: center;
font-size: 0; // hide default char
&:before {
font-family: "Font Awesome 5 Free";
content: "\f00d";
font-weight: bold;
display: inline-block;
margin-right: 3px;
font-size: 12px;
}
}
}
.select2{
@@ -1007,6 +1025,11 @@ table{
width: 150px;
transition-duration: 180ms;
will-change: transform;
.panel-heading {
text-align: right;
padding: 6px 15px; // overwrite default
}
}
.pf-menu-left{
@@ -1179,10 +1202,7 @@ table{
transparent 75%,
transparent);
background-size: 25px 25px;
-webkit-animation: move 2.5s linear infinite;
-moz-animation: move 2.5s linear infinite;
-ms-animation: move 2.5s linear infinite;
animation: move 2.5s linear infinite;
animation: move 6s linear infinite;
}
.pf-system-info-rally{
@@ -1964,7 +1984,7 @@ code {
.container-fluid{
padding-left: 0; // overwrite default
padding-right: 0; // verwrite default
padding-right: 0; // overwrite default
}
}

91
sass/layout/_map.scss
View File

@@ -228,6 +228,12 @@ $mapBubbleWidth: 30px;
}
}
.pf-map-region {
.pf-system-head-region {
display: block !important;
}
}
// class gets applied to body tag if system/connection gets dragged
// to prevent cursor "flicker" we need to change the cursor for "neighbored" elements
.jtk-drag-select{
@@ -318,10 +324,10 @@ $mapBubbleWidth: 30px;
}
.pf-system-head{
padding: 0 3px 0 3px;
padding: 0 3px 0 4px;
cursor: pointer;
font-family: Arial, sans-serif; // fix for element width on custom font family
font-weight: bold;
font-family: Oxygen, Arial, sans-serif;
font-weight: bold; // fix for element width on custom font family
white-space: nowrap;
backface-visibility: hidden; // fixed blurry text on system scale() -> requires display: inline-block; transform: translateY(0); for child nodes
@@ -331,6 +337,7 @@ $mapBubbleWidth: 30px;
min-width: 50px;
color: $gray-lighter;
margin-right: 2px;
letter-spacing: 0.03em;
-webkit-font-smoothing: antialiased;
transform: translateY(0); // fixed "blurry" text in scaled parent
}
@@ -376,25 +383,54 @@ $mapBubbleWidth: 30px;
// ================================================================================================================
.pf-system-head-info{
display: flex;
justify-content: space-between;
flex-wrap: nowrap;
color: lighten($gray-light, 10%);
font-size: 10px;
line-height: 10px;
padding-right: 1px; // bring right aligned text in line with wh "effect" icon
margin-bottom: 2px;
transform: translateY(0); // fixed "blurry" text in scaled parent
min-width: 100%; // required for text "truncate" inside
max-width: 0; // required for text "truncate" inside
[class^="pf-system-sec-"]{
cursor: help;
}
}
.pf-system-head-info-left{
flex: 1;
.pf-system-head-info-left,
.pf-system-head-info-right, {
display: inline-flex;
flex: 1 1 auto;
min-width: 0; // required for text "truncate" inside
&:empty{
display: none;
}
> * {
line-height: inherit;
text-align: inherit;
}
.pf-system-head-region{
display: none; // triggered by map option
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.pf-system-head-info-right{
flex: 1;
text-align: right;
.pf-system-head-info-left {
> *:not(:first-child){
margin-left: 5px;
}
}
.pf-system-head-info-right {
justify-content: flex-end;
> *:not(:last-child){
margin-right: 3px;
}
}
// ================================================================================================================
@@ -617,7 +653,8 @@ $mapBubbleWidth: 30px;
@include transition(stroke 0.18s ease-out, opacity 0.18s ease-out);
will-change: all;
path{
path {
shape-rendering: geometricPrecision; // maybe better render quality ?!
@include transition(stroke 0.18s ease-out);
}
@@ -645,6 +682,7 @@ $mapBubbleWidth: 30px;
path:nth-child(2){
stroke: darken($pink-darker, 8%);
stroke-dasharray: 2px, 8px, 2px, 8px;
}
&.jtk-hover{
@@ -667,6 +705,7 @@ $mapBubbleWidth: 30px;
path:nth-child(2){
stroke: $teal-lighter;
stroke-dasharray: 15px, 10px, 5px, 10px, 5px, 10px;
}
&.jtk-hover{
@@ -720,11 +759,35 @@ $mapBubbleWidth: 30px;
}
}
.pf-map-connection-wh-size-s,
.pf-map-connection-wh-size-s {
path:first-child {
stroke-width: 7px;
stroke-dasharray: 3px, 10px;
stroke-linecap: square;
}
path:nth-child(2) {
stroke-width: 3px;
}
}
.pf-map-connection-wh-size-m {
path:nth-child(2){
stroke-linecap: square !important; // smoother look for "inner" path
path:first-child {
stroke-dasharray: 20px, 4px;
stroke-linecap: butt;
}
}
.pf-map-connection-wh-size-xl {
path:first-child {
stroke-width: 9px;
}
path:nth-child(2) {
stroke-width: 5px;
}
}

4
sass/library/bootstrap-checkbox/_awesome-bootstrap-checkbox.scss
View File

@@ -14,7 +14,7 @@ $check-icon: fa-content($fa-var-check) !default;
border-color: $color;
}
&::after{
color: #fff;
color: $gray-lightest;
}
}
}
@@ -87,6 +87,7 @@ $check-icon: fa-content($fa-var-check) !default;
&:focus + label::before{
// @include tab-focus(); // no outline frame for Pathfinder
border-color: $teal-lighter;
}
&:checked + label::after{
@@ -217,6 +218,7 @@ $check-icon: fa-content($fa-var-check) !default;
&:focus + label::before{
// @include tab-focus(); // no outline frame for Pathfinder
border-color: $teal-lighter;
}
&:checked + label::after{

3
sass/library/select2/_multiple.scss vendored
View File

@@ -10,7 +10,8 @@
-webkit-user-select: none;
.select2-selection__rendered {
display: inline-block;
//display: inline-block;
display: block;
overflow: hidden;
padding-left: 8px;
text-overflow: ellipsis;

5
sass/library/select2/theme/pathfinder/_layout.scss vendored
View File

@@ -53,14 +53,15 @@
}
.select2-results__option {
padding: 3px 6px;
padding: 2px 6px;
min-height: 24px; // options with empty string '' should not collapse
line-height: 22px;
> .clearfix.pf-result-image [class*="col-"]{
line-height: 22px; // options with images need more height
img {
height: 22px;
display: block; // otherwise parent col- is 22,xx subpixel
}
}

5
sass/library/select2/theme/pathfinder/_multiple.scss vendored
View File

@@ -41,7 +41,7 @@
float: left;
margin-right: 5px;
margin-top: 5px;
margin-top: 3px;
padding: 0 5px;
color: $gray-dark;
@@ -84,7 +84,8 @@
&.select2-container--focus {
.select2-selection--multiple {
border: solid $teal-lighter 1px;
border-color: $input-border-focus;
box-shadow: inset -1px 1px 5px 0 rgba(0, 0, 0, 0.8) !important;
outline: 0;
}
}

6
sass/library/select2/theme/pathfinder/_single.scss vendored
View File

@@ -5,7 +5,8 @@
height: 32px;
&:focus {
border: 1px solid $teal-lighter;
border-color: $input-border-focus;
box-shadow: inset -1px 1px 5px 0 rgba(0, 0, 0, 0.8) !important;
}
.select2-selection__rendered {
@@ -81,8 +82,9 @@
&.select2-container--disabled {
.select2-selection--single {
background-color: #eee;
background-color: $input-bg-disabled;
cursor: default;
pointer-events: none;
.select2-selection__clear {
display: none;

4
sass/library/summernote/_summernote.scss
View File

@@ -439,9 +439,11 @@
}
.note-editor.note-frame .note-statusbar .note-resizebar {
display: flex;
flex-direction: column;
width: 100%;
height: 9px;
padding-top: 1px;
//padding-top: 1px;
cursor: ns-resize
}