Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 4 additions & 68 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ a:hover, a:active, a:focus {
border-color: lightgrey;
}


.table-header {
background-color: #e5e7e9;
color: #3b3b3b;
Expand All @@ -80,6 +79,10 @@ input[type="text"], input[type="date"], input[type="time"], select {
box-sizing: border-box;
}

input::placeholder, select::placeholder {
color: #757575;
}

input[type="text"], select {
width: 100%;
}
Expand Down Expand Up @@ -108,18 +111,6 @@ label {
padding: 8px;
}

.btn-danger,
.btn-primary,
.btn-secondary {
box-shadow: none !important;
color: white !important;
}

.btn-link:hover {
text-decoration: none;
}


.desc {
max-width: 100px;
}
Expand Down Expand Up @@ -217,61 +208,6 @@ label {
}
}

.form-group.required label:after {
content: "*";
color: #ee0000;
margin-left: 0.25rem;
}

a, a:link, a:visited {
box-shadow: inset 0 -4px 0 #FDB515;
transition: background 0.25s ease-in-out, color 0.25s ease-in-out;
text-decoration: none;
color: black;

&.no-link-style {
box-shadow: none;
}

li & {
box-shadow: inset 0 -2px 0 #FDB515;

.navbar-nav & {
box-shadow: none;
}
}
}

a:hover, a:active, a:focus {
background: #FDB515;

&.no-link-style {
background: none;
}
}

.tblheader {
font-weight: bold;
color: blue;
}

// Some of the styles above were butchering Bootstrap buttons in tables
.btn-danger,
.btn-primary,
.btn-secondary {
box-shadow: none !important;
color: white !important;
}

.btn-link:hover {
text-decoration: none;
}

.btn.btn-primary:disabled {
background-color: lightgrey;
border-color: lightgrey;
}

.page {
padding-left: 2px;
padding-right: 2px;
Expand Down
4 changes: 2 additions & 2 deletions app/views/forms/insert_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= form_with(url: items_path, local: true, multipart: true) do |form| %>
<div class="form-group required">
<%= form.label(:item_type, 'Item type:') %>
<%= form.select(:item_type, options_for_select(@item_type_layout), { prompt: 'Select a type' }, { required: true }) %>
<%= form.select(:item_type, options_for_select(@item_type_layout), { prompt: 'Select a type' }, { required: true, class: 'form-select' }) %>
</div>

<div class="form-group required">
Expand Down Expand Up @@ -37,7 +37,7 @@

<div class="form-group required">
<%= form.label(:location, 'Held at location:') %>
<%= form.select(:location, options_for_select(@locations_layout), { prompt: 'Select a location' }, { required: true }) %>
<%= form.select(:location, options_for_select(@locations_layout), { prompt: 'Select a location' }, { required: true, class: 'form-select' }) %>
</div>

<div style="padding-top: 8px; padding-bottom: 8px;">
Expand Down
4 changes: 2 additions & 2 deletions app/views/forms/search_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

<div>
<%= form.label(:item_type, 'Item type:') %>
<%= form.select(:item_type, item_type_options, include_blank: true) %>
<%= form.select(:item_type, item_type_options, { include_blank: true }, { class: 'form-select' }) %>
</div>
<div>
<%= form.label(:keyword, 'Keywords:') %>
<%= form.text_field :keyword, placeholder: 'Enter search terms separated by spaces' %>
</div>
<div>
<%= form.label(:location, 'Location:') %>
<%= form.select(:location, location_options, include_blank: true) %>
<%= form.select(:location, location_options, { include_blank: true }, { class: 'form-select' }) %>
</div>

<fieldset>
Expand Down
2 changes: 1 addition & 1 deletion app/views/home/admin_users.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<%= form_with(url: user_insert_path, local: true) do |form| %>

<%= form.label(:user_role, 'User role:') %> <span style="color: #ee0000"> * </span>
<%= form.select(:user_role, options_for_select(User::ROLES), include_blank: true, required: true) %>
<%= form.select(:user_role, options_for_select(User::ROLES), { include_blank: true }, { required: true, class: 'form-select' }) %>

<%= form.label(:user_name, 'User name:') %><span style="color: #ee0000"> * </span>
<%= form.text_field :user_name, placeholder: 'John Smith', required: true %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/items/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= form.hidden_field(:id, value: @item.id) %> <%# TODO: just do this the Rails way %>
<div class="form-group required">
<%= form.label(:item_type, 'Item type:') %>
<%= form.select(:item_type, options_for_select(@item_type_layout, @item.item_type), {}, { required: true }) %>
<%= form.select(:item_type, options_for_select(@item_type_layout, @item.item_type), {}, { required: true, class: 'form-select' }) %>
</div>

<div class="form-group required">
Expand Down Expand Up @@ -38,7 +38,7 @@

<div class="form-group required">
<%= form.label(:location, 'Held at location:') %>
<%= form.select(:location, options_for_select(@locations_layout, @item.location), {}, { required: true }) %>
<%= form.select(:location, options_for_select(@locations_layout, @item.location), {}, { required: true, class: 'form-select' }) %>
</div>

<div style="padding-top: 8px; padding-bottom: 8px;">
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<%= form_with(url: user_path, method: :put, local: true) do |form| %>

<%= form.label(:user_role, "User role:") %>
<%= form.select(:user_role, options_for_select(User::ROLES, @user.user_role)) %>
<%= form.select(:user_role, options_for_select(User::ROLES, @user.user_role), {}, { class: 'form-select' }) %>

<%= form.label(:user_name, "User name:") %>
<%= form.text_field :user_name, value: @user.user_name %>
Expand Down