From 1c168234b85492f619166b05cfdfa8d956177633 Mon Sep 17 00:00:00 2001 From: Juan de la Cruz Date: Sat, 20 Feb 2016 21:41:49 +0100 Subject: [PATCH] add new options and history icons --- resources/public/images/svg/options.svg | 1 + resources/public/images/svg/undo-history.svg | 69 +------------------ .../styles/partials/sidebar-sitemap.scss | 2 +- .../public/styles/partials/workspace-bar.scss | 2 +- src/uxbox/ui/icons.cljs | 22 ++++++ src/uxbox/ui/workspace/header.cljs | 13 ++-- 6 files changed, 35 insertions(+), 74 deletions(-) create mode 100644 resources/public/images/svg/options.svg diff --git a/resources/public/images/svg/options.svg b/resources/public/images/svg/options.svg new file mode 100644 index 0000000000..153440bdeb --- /dev/null +++ b/resources/public/images/svg/options.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/public/images/svg/undo-history.svg b/resources/public/images/svg/undo-history.svg index 7cff3ecd10..52fb6b71a4 100644 --- a/resources/public/images/svg/undo-history.svg +++ b/resources/public/images/svg/undo-history.svg @@ -1,68 +1 @@ - - - - - - - - - - - image/svg+xml - - - - - - - - - - - + diff --git a/resources/public/styles/partials/sidebar-sitemap.scss b/resources/public/styles/partials/sidebar-sitemap.scss index 64e050ca39..f97ce5940d 100644 --- a/resources/public/styles/partials/sidebar-sitemap.scss +++ b/resources/public/styles/partials/sidebar-sitemap.scss @@ -83,7 +83,7 @@ a { svg { - fill: $medium-ui-icons; + fill: $soft-ui-icons; height: 15px; margin-left: $x-small; width: 15px; diff --git a/resources/public/styles/partials/workspace-bar.scss b/resources/public/styles/partials/workspace-bar.scss index 8ad0b8c47a..240f0c8d6f 100644 --- a/resources/public/styles/partials/workspace-bar.scss +++ b/resources/public/styles/partials/workspace-bar.scss @@ -86,7 +86,7 @@ .options-btn { align-items: center; - border-right: 1px solid $soft-ui-border; + border-right: 4px double $soft-ui-border; display: flex; margin: 0; diff --git a/src/uxbox/ui/icons.cljs b/src/uxbox/ui/icons.cljs index b8fcecf2a1..d96fdcda65 100644 --- a/src/uxbox/ui/icons.cljs +++ b/src/uxbox/ui/icons.cljs @@ -583,3 +583,25 @@ [:path {:d "M374.19.027c-35.65-.26-69.825 17.04-93.205 43.46C265.015 59.3 246.795 74 235.798 93.89c-5.152 18.457 15.536 39.06 33.81 31.036 12.228-5.787 20.932-16.63 30.895-25.454 16.225-15.904 31.61-34.625 53.268-43.215 30.63-9.51 68.027 2.75 83.552 31.696 16.133 27.356 11.406 65.9-12.983 86.953-33.688 33.49-65.99 68.54-101.818 99.774-25.676 17.24-62.493 13.964-85.182-6.894-9.892-7.803-24.664-13.51-36.066-5.384-13.15 8.622-16.047 29.624-4.153 40.557 15.934 16.298 36.916 27.65 59.094 32.784 40.133 9.484 85.672-1.555 114.365-32.063 33.077-32.28 66.63-64.146 97.863-98.234 23.05-23.964 33.835-58.702 31.156-91.463-2.703-43.764-31.228-84.958-71.533-102.67-16.87-7.71-35.484-11.684-53.878-11.29zm-159.287 160.62c-39.02-.334-76.686 19.59-100.835 49.885-31.172 33.42-67.206 62.36-94.8 98.98-26.99 41.084-25.46 98.636 3.545 138.487 27.244 38.817 78.07 59.338 124.213 49.595 24.726-4.464 47.814-17.325 65.234-35.184 17.525-16.416 34.998-33.22 49.954-51.994 8.832-16.433-6.032-38.576-24.5-37.36-12.405.645-20.594 11.537-29.6 18.688-19.153 17.818-35.794 39.82-60.066 51.035-30.55 10.52-68.22-1.292-84.668-29.788-16.56-26.438-13.142-64.302 9.985-85.88 34.068-34.218 67.15-69.52 103.268-101.62 26.303-18.273 64.672-14.35 87.647 7.61 10.006 7.95 25.88 12.004 36.363 2.663 12.257-9.775 13.275-30.916.403-40.685-22.72-22.32-54.41-34.652-86.143-34.433z"}]]])) + +(def options + (html + [:svg + {:viewBox "0 0 500.00001 500.00001" + :height "500" + :width "500"} + [:g + [:path + {:d + "M208.508 0a61.44 61.44 0 0 0-61.44 61.44 61.44 61.44 0 0 0 61.44 61.443 61.44 61.44 0 0 0 61.44-61.442A61.44 61.44 0 0 0 208.51 0zM0 39.44v44h120.602a92.16 92.16 0 0 1-2.762-22 92.16 92.16 0 0 1 2.78-22H0zm299.398 0a92.16 92.16 0 0 1 2.762 22 92.16 92.16 0 0 1-2.78 22H500v-44H299.398zM390 188.56A61.44 61.44 0 0 0 328.56 250 61.44 61.44 0 0 0 390 311.44 61.44 61.44 0 0 0 451.44 250 61.44 61.44 0 0 0 390 188.56zM0 228v44h300.602a92.16 92.16 0 0 1-2.762-22 92.16 92.16 0 0 1 2.78-22H0zm479.398 0a92.16 92.16 0 0 1 2.762 22 92.16 92.16 0 0 1-2.78 22H500v-44h-20.602zM126 377.117a61.44 61.44 0 0 0-61.44 61.442A61.44 61.44 0 0 0 126 500a61.44 61.44 0 0 0 61.44-61.44A61.44 61.44 0 0 0 126 377.116zM0 416.56v44h36.602a92.16 92.16 0 0 1-2.762-22 92.16 92.16 0 0 1 2.78-22H0zm215.398 0a92.16 92.16 0 0 1 2.762 22 92.16 92.16 0 0 1-2.78 22H500v-44H215.398z"}]]])) + +(def undo-history + (html + [:svg + {:viewBox "0 0 500.00001 500.00001" + :height "500" + :width "500"} + [:g + [:path + {:d + "M267.393 23.48c-88.18.946-172.42 59.717-204.148 141.947-5.39 13.265-9.62 26.997-12.712 40.976-14.833 1.077-31.187-2.467-45.38 3.705-7.584 5.314-6.272 17.125.517 22.538 18.722 23.626 37.06 47.815 58.234 69.276 9.942 5.903 22.776-.814 27.466-10.445 17.49-22.46 36.883-43.903 51.21-68.53 1.854-10.235-9.626-17.808-18.924-16.114-7.377-.535-14.79.508-22.153-.325 16.96-71.22 83.185-127.703 156.316-133.257 61.472-5.76 125.65 23.543 160.772 74.893 34.636 49.37 42.33 116.303 17.738 171.66-22.51 52.993-72.073 93.513-128.673 104.138-53.846 10.76-112.327-5.19-153.14-42.24-6.707-5.932-13.56-13.615-23.355-13.318-14.056-1.012-26.422 12.118-25.292 25.986.046 8.412 5.87 14.975 11.957 20.033 62.64 61.81 163.483 79.47 243.9 44.304 64.723-27.22 115.68-85.82 131.714-154.412 15.942-64.328 2.593-135.65-37.515-188.706C413.59 58.192 343.202 21.59 271.52 23.476c-1.377-.01-2.752-.01-4.127.003zm5 74.84c-14.593.034-25.925 15.445-22.93 29.44-.267 43.316-1.854 80.763.57 124.006 0 16.022 12.657 22.41 31.217 22.41 37.45.106 75.065 1.907 112.41-1.264 16.298-4.748 21.17-28.12 9.398-39.846-6.213-7.357-16.492-8.592-25.47-7.432l-79.22-.735c-.82-37.02 1.053-74.177-2.314-111.09-3.368-9.633-13.656-15.794-23.662-15.49z"}]]])) diff --git a/src/uxbox/ui/workspace/header.cljs b/src/uxbox/ui/workspace/header.cljs index a7b22cadb1..ebaa2efd78 100644 --- a/src/uxbox/ui/workspace/header.cljs +++ b/src/uxbox/ui/workspace/header.cljs @@ -60,7 +60,7 @@ [:div.workspace-options [:ul.options-btn [:li.tooltip.tooltip-bottom - {:alt "Shapes (Ctrl + Shift + F)" + {:alt "Shapes (Ctrl + Shift + S)" :class (when (contains? flags :drawtools) "selected") :on-click (partial toggle :drawtools)} i/shapes] @@ -70,15 +70,20 @@ :on-click (partial toggle :icons)} i/icon-set] [:li.tooltip.tooltip-bottom - {:alt "Elements (Ctrl + Shift + L)" + {:alt "Layers (Ctrl + Shift + L)" :class (when (contains? flags :layers) "selected") :on-click (partial toggle :layers)} i/layers] [:li.tooltip.tooltip-bottom - {:alt "Element options" + {:alt "Element options (Ctrl + Shift + O)" :class (when (contains? flags :element-options) "selected") :on-click (partial toggle :element-options)} - i/logo-icon]] + i/options] + [:li.tooltip.tooltip-bottom + {:alt "History (Ctrl + Shift + H)" + :class (when (contains? flags :element-options)) + :on-click (partial toggle :element-options)} + i/undo-history]] [:ul.options-btn [:li.tooltip.tooltip-bottom {:alt "Undo (Ctrl + Z)"} i/undo]