diff --git a/resources/public/images/svg/align-center.svg b/resources/public/images/svg/align-center.svg new file mode 100644 index 000000000..6c560a725 --- /dev/null +++ b/resources/public/images/svg/align-center.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/resources/public/images/svg/align-justify.svg b/resources/public/images/svg/align-justify.svg new file mode 100644 index 000000000..5463ad47d --- /dev/null +++ b/resources/public/images/svg/align-justify.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/resources/public/images/svg/align-left.svg b/resources/public/images/svg/align-left.svg new file mode 100644 index 000000000..cb761ae1f --- /dev/null +++ b/resources/public/images/svg/align-left.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/public/images/svg/align-right.svg b/resources/public/images/svg/align-right.svg new file mode 100644 index 000000000..2f8b89b0e --- /dev/null +++ b/resources/public/images/svg/align-right.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/resources/public/images/svg/arrow.svg b/resources/public/images/svg/arrow.svg index 5933d675b..3f4c3f96c 100644 --- a/resources/public/images/svg/arrow.svg +++ b/resources/public/images/svg/arrow.svg @@ -1,17 +1 @@ - - - - - - - - image/svg+xml - - - - - - - - - + \ No newline at end of file diff --git a/resources/public/images/svg/palette.svg b/resources/public/images/svg/palette.svg index 77c741048..c416ec938 100644 --- a/resources/public/images/svg/palette.svg +++ b/resources/public/images/svg/palette.svg @@ -1,55 +1 @@ - - - - - - - - - - image/svg+xml - - - - - - - - + \ No newline at end of file diff --git a/resources/public/images/svg/pencil.svg b/resources/public/images/svg/pencil.svg index 35729c812..cce64e240 100644 --- a/resources/public/images/svg/pencil.svg +++ b/resources/public/images/svg/pencil.svg @@ -1,17 +1 @@ - - - - - - - - image/svg+xml - - - - - - - - - + \ No newline at end of file diff --git a/resources/public/images/svg/plus.svg b/resources/public/images/svg/plus.svg index 61f3bbfcd..af397b01d 100644 --- a/resources/public/images/svg/plus.svg +++ b/resources/public/images/svg/plus.svg @@ -1,17 +1 @@ - - - - - - - - image/svg+xml - - - - - - - - - + \ No newline at end of file diff --git a/resources/public/images/svg/puzzle-plus.svg b/resources/public/images/svg/puzzle-plus.svg deleted file mode 100644 index e177ee5b3..000000000 --- a/resources/public/images/svg/puzzle-plus.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/resources/public/images/svg/radius.svg b/resources/public/images/svg/radius.svg new file mode 100644 index 000000000..1c4de5972 --- /dev/null +++ b/resources/public/images/svg/radius.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/public/index.html b/resources/public/index.html index 1f9b6f2d1..58f9dac42 100644 --- a/resources/public/index.html +++ b/resources/public/index.html @@ -6,6 +6,6 @@
- + diff --git a/resources/public/styles/framework.scss b/resources/public/styles/framework.scss index be86c5de6..670d98833 100644 --- a/resources/public/styles/framework.scss +++ b/resources/public/styles/framework.scss @@ -649,6 +649,98 @@ input[type=checkbox]:checked + label{ } +// Input slidebar + +input[type=range] { + background-color: transparent; + -webkit-appearance: none; + margin: 10px 0; + width: 100%; +} +input[type=range]:focus { + outline: none; +} +input[type=range]::-webkit-slider-runnable-track { + width: 100%; + height: 8px; + cursor: pointer; + animate: 0.2s; + box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d; + background: darken($color-gray-darker, 12%); + border-radius: 25px; + border: 0px solid #000101; +} +input[type=range]::-webkit-slider-thumb { + box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d; + border: 0px solid #000000; + height: 24px; + width: 8px; + border-radius: 7px; + background: $color-gray-lighter; + cursor: pointer; + -webkit-appearance: none; + margin-top: -8px; +} +input[type=range]:focus::-webkit-slider-runnable-track { + background: darken($color-gray-darker, 12%); +} +input[type=range]::-moz-range-track { + width: 100%; + height: 8px; + cursor: pointer; + animate: 0.2s; + box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d; + background: darken($color-gray-darker, 12%); + border-radius: 25px; + border: 0px solid #000101; +} +input[type=range]::-moz-range-thumb { + box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d; + border: 0px solid #000000; + height: 24px; + width: 8px; + border-radius: 7px; + background: $color-gray-lighter; + cursor: pointer; +} +input[type=range]::-ms-track { + width: 100%; + height: 8px; + cursor: pointer; + animate: 0.2s; + background: transparent; + border-color: transparent; + border-width: 39px 0; + color: transparent; +} +input[type=range]::-ms-fill-lower { + background: darken($color-gray-darker, 12%); + border: 0px solid #000101; + border-radius: 50px; + box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d; +} +input[type=range]::-ms-fill-upper { + background: darken($color-gray-darker, 12%); + border: 0px solid #000101; + border-radius: 50px; + box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d; +} +input[type=range]::-ms-thumb { + box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d; + border: 0px solid #000000; + height: 24px; + width: 8px; + border-radius: 7px; + background: $color-gray-lighter; + cursor: pointer; +} +input[type=range]:focus::-ms-fill-lower { + background: darken($color-gray-darker, 12%); +} +input[type=range]:focus::-ms-fill-upper { + background: darken($color-gray-darker, 12%); +} + // Scroll bar (chrome) ::-webkit-scrollbar { diff --git a/resources/public/styles/main.scss b/resources/public/styles/main.scss index 2c8341b04..72ea0a9f8 100644 --- a/resources/public/styles/main.scss +++ b/resources/public/styles/main.scss @@ -41,3 +41,4 @@ @import 'partials/dashboard-grid'; @import 'partials/activity-bar'; @import 'partials/lightbox'; +@import 'partials/color-palette'; diff --git a/resources/public/styles/partials/color-palette.scss b/resources/public/styles/partials/color-palette.scss new file mode 100644 index 000000000..f0461797f --- /dev/null +++ b/resources/public/styles/partials/color-palette.scss @@ -0,0 +1,208 @@ +.color-palette { + align-items: center; + background-color: $color-white; + border-top: 1px solid $color-gray-lighter; + bottom: 0; + box-sizing: border-box; + display: flex; + left: 0; + padding: 1rem; + position: absolute; + width: 100%; + z-index: 10; + .right-arrow, + .left-arrow { + cursor: pointer; + svg { + fill: $color-gray-light; + height: 30px; + margin: 0 .5rem; + width: 30px; + } + &:hover { + svg { + fill: $color-gray-darker; + } + } + } + .left-arrow { + transform: rotate(180deg); + } +} +.color-palette-actions { + display: flex; + flex-direction: column; + flex-shrink: 0; + margin-right: .5rem; + width: 200px; + .color-palette-buttons { + align-items: center; + display: flex; + justify-content: space-around; + } +} + +.btn-palette { + align-items: center; + border: 2px solid $color-gray-lighter; + border-radius: 50%; + cursor: pointer; + display: flex; + flex-shrink: 0; + justify-content: center; + padding: .6rem; + svg { + fill: $color-gray-lighter; + height: 20px; + width: 20px; + } + &:hover { + border-color: $color-gray-dark; + svg { + fill: $color-gray-dark; + } + } + &.current { + background-color: $color-primary; + border-color: $color-white; + svg { + fill: $color-white; + } + } +} + +.color-palette-content { + align-items: center; + display: flex; + width: 100%; +} + +.color-cell { + align-items: center; + cursor: pointer; + display: flex; + flex-direction: column; + flex-shrink: 0; + margin: 0 .6rem; + position: relative; + .color { + background-color: $color-gray-lighter; + border: 3px solid $color-white; + border-radius: 50%; + flex-shrink: 0; + margin-bottom: .4rem; + padding: 1.5rem; + } + .color-text { + color: $color-gray-light; + font-size: $fs12; + } + &.current { + .color { + border-color: $color-gray-darker; + } + .color-text { + color: $color-gray-darker; + font-weight: bold; + } + &::before { + background-color: $color-gray-darker; + border-radius: 3px; + color: $color-white; + content: "selected"; + font-size: $fs10; + left: 12px; + padding: 1px 4px; + position: absolute; + top: 38px; + } + } + &:hover { + .color { + border-color: $color-gray-darker; + } + .color-text { + color: $color-gray-darker; + } + } + &.add-color { + margin-left: 1.5rem; + .color { + align-items: center; + background-color: $color-white; + border: 3px dashed $color-gray-lighter; + cursor: pointer; + display: flex; + justify-content: center; + margin-bottom: 1rem; + padding: .6rem; + svg { + fill: $color-gray-lighter; + height: 30px; + width: 30px; + } + } + .color-text { + font-weight: bold; + } + &:hover { + .color { + border-color: $color-gray; + svg { + fill: $color-gray; + } + } + .color-text { + color: $color-gray-dark; + } + } + } +} + +.close-palette { + align-self: flex-start; + cursor: pointer; + flex-shrink: 0; + svg { + fill: $color-gray-light; + height: 25px; + transform: rotate(45deg); + width: 25px; + } + &:hover { + svg { + fill: $color-danger; + } + } +} + +.color-tooltip { + background-color: $color-white; + border: 1px solid $color-gray-lighter; + border-radius: 3px; + left: -102px; + padding: 1rem; + position: absolute; + top: -85%; + z-index: 11; + .row-flex { + position: relative; + .input-text { + font-size: $fs12; + margin: 0 .5rem; + max-width: 100px; + } + &::after { + background-color: $color-white; + bottom: -32px; + border-bottom: 1px solid $color-gray-lighter; + border-right: 1px solid $color-gray-lighter; + content: ""; + height: 20px; + left: 105px; + position: absolute; + transform: rotate(45deg); + width: 20px; + } + } +} diff --git a/resources/public/styles/partials/element-options.scss b/resources/public/styles/partials/element-options.scss index bd98289a7..24a7ce051 100644 --- a/resources/public/styles/partials/element-options.scss +++ b/resources/public/styles/partials/element-options.scss @@ -127,6 +127,80 @@ svg { fill: $color-white; } + + } + + } + +} + +.color-th { + background-color: $color-gray-light; + border-radius: 50%; + cursor: pointer; + flex-shrink: 0; + height: 25px; + margin: 5px 4px 0 4px; + width: 25px; + &.palette-th { + align-items: center; + background-color: $color-gray-darker; + border: 2px solid $color-gray-light; + display: flex; + justify-content: center; + svg { + fill: $color-gray-light; + height: 18px; + width: 18px; + } + &:hover { + border-color: $color-primary; + svg { + fill: $color-primary; + } + } + } +} + +.border-element { + align-items: center; + display: flex; + flex-direction: column; + margin: 5px 2% 0 2%; + svg { + fill: $color-gray-light; + height: 12px; + width: 12px; + } + &.top-left { + svg { + transform: rotate(270deg); + } + } + &.bottom-left { + svg { + transform: rotate(180deg); + } + } + &.bottom-right { + svg { + transform: rotate(90deg); + } + } +} + +.align-icons { + cursor: pointer; + svg { + fill: $color-gray-light; + height: 20px; + margin: 5px 7px 0 7px; + width: 20px; + } + &:hover, + &.current { + svg { + fill: $color-primary; } } } diff --git a/resources/public/templates/.#main.html b/resources/public/templates/.#main.html deleted file mode 120000 index d75db8a7d..000000000 --- a/resources/public/templates/.#main.html +++ /dev/null @@ -1 +0,0 @@ -dialelo@rocinante.975:1436437812 \ No newline at end of file