diff --git a/app/assets/stylesheets/admins.css.scss b/app/assets/stylesheets/admins.css.scss deleted file mode 100644 index 984fabc..0000000 --- a/app/assets/stylesheets/admins.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the admins controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/callbacks.css.scss b/app/assets/stylesheets/callbacks.css.scss deleted file mode 100644 index e4c4d53..0000000 --- a/app/assets/stylesheets/callbacks.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the callbacks controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/sessions.css.scss b/app/assets/stylesheets/sessions.css.scss deleted file mode 100644 index 7bef9cf..0000000 --- a/app/assets/stylesheets/sessions.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the sessions controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/stock.css.scss b/app/assets/stylesheets/stock.css.scss deleted file mode 100644 index f5d1f77..0000000 --- a/app/assets/stylesheets/stock.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the stock controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/stock_entry.css.scss b/app/assets/stylesheets/stock_entry.css.scss new file mode 100644 index 0000000..616d137 --- /dev/null +++ b/app/assets/stylesheets/stock_entry.css.scss @@ -0,0 +1,22 @@ +#stock_entry { + border: 1px solid #ccc; + background-color: #F5F5F5; + padding: 20px; + + border-radius: 8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + + table { + margin-bottom: 20px; + border-spacing: 10px; + border-collapse: separate; + tr:last-child td { + border-top: 1px dashed; + padding-top: 10px; + } + td { + /* padding: 10px; */ + } + } +} diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss index 8e82fd4..4321f82 100644 --- a/app/assets/stylesheets/users.css.scss +++ b/app/assets/stylesheets/users.css.scss @@ -4,12 +4,12 @@ //signin -.sign-in{ - .checkbox label{ - padding-left: 0px; +.sign-in { + .checkbox label { + padding-left: 0px; } - #user_remember_me{ - margin-left: 10px; + #user_remember_me { + margin-left: 10px; } } @@ -17,7 +17,7 @@ padding: 0px; min-height: 280px; border: 3px solid #333; - .header{ + .header { border-bottom: 3px solid #333; text-align: center; color: #fff; @@ -26,19 +26,19 @@ margin: 0px; } - .caption{ - .avatar{ + .caption { + .avatar { float: right; height: 70px; width: 70px; } } - .footer{ + .footer { width:80%; border-top: 1px dashed #333; margin:10%; margin-bottom: 5px; - .btn{ + .btn { width:100%; margin-top:10px; margin-bottom:0px; diff --git a/app/assets/stylesheets/welcome.css.scss b/app/assets/stylesheets/welcome.css.scss deleted file mode 100644 index 77ce11a..0000000 --- a/app/assets/stylesheets/welcome.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the welcome controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/views/products/stock_entry.html.haml b/app/views/products/stock_entry.html.haml index d6cbc76..16f229d 100644 --- a/app/views/products/stock_entry.html.haml +++ b/app/views/products/stock_entry.html.haml @@ -1,5 +1,5 @@ .row - .col-md-6.col-md-offset-3 + #stock_entry.col-md-6.col-md-offset-3 = form_for @product do |f| %table %tr @@ -8,9 +8,8 @@ %tr %td Purchase %td - %input.form-control.new_stock{ type: :number, data: { increment: true, target: "#product_stock" }} + %input.form-control.new_stock{ type: :number, autofocus: true, data: { increment: true, target: "#product_stock" }} %tr %td New stock %td= f.number_field :stock, data:{ default: f.object.stock }, class: "form-control" - %tr - %td= f.submit "Update stock" + = f.submit "Update stock", class: "btn btn-primary form-control"