diff --git a/Dockerfile b/Dockerfile index 3e8df2b..0eead4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ COPY Gemfile /akkounts/Gemfile COPY Gemfile.lock /akkounts/Gemfile.lock COPY package.json /akkounts/package.json RUN bundle install +RUN gem install foreman RUN npm install -g yarn RUN yarn install diff --git a/app/assets/stylesheets/components/buttons.css b/app/assets/stylesheets/components/buttons.css index a89203b..da79cec 100644 --- a/app/assets/stylesheets/components/buttons.css +++ b/app/assets/stylesheets/components/buttons.css @@ -6,12 +6,16 @@ .btn-md { @apply btn; - @apply py-2.5 px-5 shadow-md; + @apply py-3 px-6; } .btn-sm { @apply btn; - @apply py-1 px-2 text-sm shadow-sm; + @apply py-1 px-2 text-sm; + } + + .btn-icon { + @apply px-3; } .btn-gray { @@ -28,4 +32,8 @@ @apply bg-red-600 hover:bg-red-700 text-white focus:ring-red-500 focus:ring-opacity-75; } + + input[type=text]:disabled { + @apply text-gray-700; + } } diff --git a/app/components/main_simple_component.html.erb b/app/components/main_simple_component.html.erb index b72b31d..beacf7b 100644 --- a/app/components/main_simple_component.html.erb +++ b/app/components/main_simple_component.html.erb @@ -1,5 +1,5 @@
-
+
<%= content %>
diff --git a/app/components/main_with_sidenav_component.html.erb b/app/components/main_with_sidenav_component.html.erb index efdc28b..86225ff 100644 --- a/app/components/main_with_sidenav_component.html.erb +++ b/app/components/main_with_sidenav_component.html.erb @@ -1,6 +1,6 @@
-
+