Browse Source

Merge pull request #73 from synrc/add-new-nitro-src

fix: changed src files
SunRiseGG 3 years ago
parent
commit
0543a9cc48

+ 15 - 1
priv/css/sortable.css

@@ -103,4 +103,18 @@ body {
   top: 1px;
   top: 1px;
   right: 5px;
   right: 5px;
   cursor: default;
   cursor: default;
-}
+}
+
+.add-btn {
+  position: absolute;
+  top: 8px;
+  right: 10px;
+  background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M7.99992 1.33325C4.31992 1.33325 1.33325 4.31992 1.33325 7.99992C1.33325 11.6799 4.31992 14.6666 7.99992 14.6666C11.6799 14.6666 14.6666 11.6799 14.6666 7.99992C14.6666 4.31992 11.6799 1.33325 7.99992 1.33325ZM7.33325 4.66658V7.33325H4.66658V8.66658H7.33325V11.3333H8.66658V8.66658H11.3333V7.33325H8.66658V4.66658H7.33325ZM2.66659 7.99992C2.66659 10.9399 5.05992 13.3333 7.99992 13.3333C10.9399 13.3333 13.3333 10.9399 13.3333 7.99992C13.3333 5.05992 10.9399 2.66659 7.99992 2.66659C5.05992 2.66659 2.66659 5.05992 2.66659 7.99992Z' fill='%23757575'/%3E%3C/svg%3E%0A");
+  background-repeat: no-repeat;
+  cursor: pointer;
+  color: transparent;
+  min-width: 16px;
+  max-width: 16px;
+  height: 16px;
+  background-color: #ffffff;
+}

+ 1 - 1
src/elements/combo/element_comboLookup.erl

@@ -10,7 +10,7 @@ proto(#comboSelect{delegate=Module}=Msg) -> Module:proto(Msg).
 render_element(#comboLookup{id=Id, style=Style, value = Val, bind = Object,
 render_element(#comboLookup{id=Id, style=Style, value = Val, bind = Object,
   feed = Feed, disabled = Disabled, delegate = Module} = Data) ->
   feed = Feed, disabled = Disabled, delegate = Module} = Data) ->
   nitro:render(
   nitro:render(
-    #panel{id=form:atom([lookup, Id]), class=[dropdown],
+    #link{id=form:atom([lookup, Id]), class=[dropdown],
            body=[#input{id=Id, disabled = Disabled, type="comboLookup",
            body=[#input{id=Id, disabled = Disabled, type="comboLookup",
                         autocomplete = "off",
                         autocomplete = "off",
                         onkeyup = nitro:jse("comboLookupKeyup('"
                         onkeyup = nitro:jse("comboLookupKeyup('"

+ 2 - 3
src/elements/combo/element_comboLookupEdit.erl

@@ -22,8 +22,7 @@ render_element(#comboLookupEdit{id=Id, input=Input, disabled=Disabled, validatio
               case Multiple of
               case Multiple of
                 true ->
                 true ->
                   #link{
                   #link{
-                    class = [button, sgreen],
-                    style = "min-width: 40px; text-align: center; height: fit-content; margin-left: 5px;",
+                    class = [add-btn],
                     onclick = nitro:jse("addSortableItemFrom('#" ++ ListId ++ "', '" ++ InputId ++ "')"),
                     onclick = nitro:jse("addSortableItemFrom('#" ++ ListId ++ "', '" ++ InputId ++ "')"),
                     body = <<"+">>};
                     body = <<"+">>};
                 false -> []
                 false -> []
@@ -39,4 +38,4 @@ render_element(#comboLookupEdit{id=Id, input=Input, disabled=Disabled, validatio
             case Multiple of
             case Multiple of
               true -> #sortable_list{id = ListId, values = Values, closeable = true, disabled = Disabled};
               true -> #sortable_list{id = ListId, values = Values, closeable = true, disabled = Disabled};
               false -> []
               false -> []
-            end ]}).
+            end ]}).

+ 1 - 2
src/elements/combo/element_comboLookupVec.erl

@@ -22,8 +22,7 @@ render_element(#comboLookupVec{id=Id, input=Input, disabled=Disabled, validation
               _ ->
               _ ->
                 [ Input,
                 [ Input,
                   #link{
                   #link{
-                    class = [button, sgreen],
-                    style = "min-width: 40px; text-align: center; height: fit-content; margin-left: 5px;",
+                    class = ['add-btn'],
                     onclick = nitro:jse("addSortableItemFrom('#" ++ ListId ++ "', '" ++ InputId ++ "')"),
                     onclick = nitro:jse("addSortableItemFrom('#" ++ ListId ++ "', '" ++ InputId ++ "')"),
                     body = <<"+">>} ] end },
                     body = <<"+">>} ] end },
         % TODO: Add validation for each list_item and/or "+" button
         % TODO: Add validation for each list_item and/or "+" button