diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 78bbf01b9..1be0d3f4f 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -11,6 +11,12 @@ "en" : "Edit" } }, + "dashboard.grid.rename" : { + "used-in" : [ "src/uxbox/main/ui/dashboard/project.cljs:60", "src/uxbox/main/ui/dashboard/grid.cljs:91" ], + "translations" : { + "en" : "Rename" + } + }, "dashboard.grid.empty-files" : { "used-in" : [ "src/uxbox/main/ui/dashboard/grid.cljs:114" ], "translations" : { diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss index 166842729..f3c5b66ab 100644 --- a/frontend/resources/styles/common/framework.scss +++ b/frontend/resources/styles/common/framework.scss @@ -499,7 +499,7 @@ input[type="checkbox"]:focus { // Element-name input.element-name { - background-color: $color-gray-10; + background-color: $color-white; border: 1px solid $color-gray-40; border-radius: $br-small; color: $color-gray-60; diff --git a/frontend/resources/styles/main/partials/library-bar.scss b/frontend/resources/styles/main/partials/library-bar.scss index ab5623440..a7a2c1492 100644 --- a/frontend/resources/styles/main/partials/library-bar.scss +++ b/frontend/resources/styles/main/partials/library-bar.scss @@ -47,26 +47,27 @@ } .library-elements { + border-top: 1px solid $color-gray-10; display: flex; flex-direction: column; height: calc(95% - 1rem); margin-bottom: $size-4; overflow-y: auto; - padding-bottom: 20px; + padding: $size-4 0; li { align-items: center; cursor: pointer; display: flex; flex-shrink: 0; - padding: $size-4 $size-2; + padding: $size-2; svg { border-radius: 3px; fill: $color-black; margin-right: 8px; - height: $size-4; - width: $size-4; + height: $size-3; + width: $size-3; } span.element-title { @@ -78,15 +79,9 @@ } &.recent-projects { - border-top: 1px solid $color-gray-10; - svg { fill: $color-white; } - - span { - font-size: $fs15; - } } & .edit-wrapper { @@ -142,6 +137,7 @@ .projects-row { align-items: center; display: flex; + margin-top: 1rem; padding: $size-2; span { diff --git a/frontend/resources/styles/main/partials/main-bar.scss b/frontend/resources/styles/main/partials/main-bar.scss index 5b5d5990a..3ae31ac5b 100644 --- a/frontend/resources/styles/main/partials/main-bar.scss +++ b/frontend/resources/styles/main/partials/main-bar.scss @@ -83,7 +83,6 @@ color: $color-black; display: flex; font-size: $fs15; - font-weight: normal; } .main-bar-icon { diff --git a/frontend/src/uxbox/main/ui/dashboard/grid.cljs b/frontend/src/uxbox/main/ui/dashboard/grid.cljs index a1f748802..60c043007 100644 --- a/frontend/src/uxbox/main/ui/dashboard/grid.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/grid.cljs @@ -98,7 +98,7 @@ i/actions] [:& context-menu {:on-close on-menu-close :show (:menu-open @local) - :options [[(t locale "dashboard.grid.edit") on-edit] + :options [[(t locale "dashboard.grid.rename") on-edit] [(t locale "dashboard.grid.delete") on-delete]]}]]])) ;; --- Grid diff --git a/frontend/src/uxbox/main/ui/dashboard/project.cljs b/frontend/src/uxbox/main/ui/dashboard/project.cljs index 6a3ef3154..74175bc74 100644 --- a/frontend/src/uxbox/main/ui/dashboard/project.cljs +++ b/frontend/src/uxbox/main/ui/dashboard/project.cljs @@ -58,7 +58,7 @@ [:div.main-bar-icon {:on-click on-menu-click} i/arrow-down] [:& context-menu {:on-close on-menu-close :show (:menu-open @local) - :options [[(t locale "dashboard.grid.edit") on-edit] + :options [[(t locale "dashboard.grid.rename") on-edit] [(t locale "dashboard.grid.delete") on-delete]]}] (if (:edition @local) [:input.element-name {:type "text"