diff --git a/app/views/devise/registrations/_password_details.html.erb b/app/views/devise/registrations/_password_details.html.erb index 561f8d7..a5b7937 100644 --- a/app/views/devise/registrations/_password_details.html.erb +++ b/app/views/devise/registrations/_password_details.html.erb @@ -5,21 +5,21 @@ <%= hidden_field_tag :skip_personal_details, "true" %>
- <%= f.label(:current_password, _('Current Password'), class: 'required') %> + <%= f.label(:current_password, _('Current password'), class: 'required') %> <%= f.password_field(:current_password, class: 'left-indent required input-medium') %>
- <%= f.label(:password, _('New Password'), class: 'required') %> + <%= f.label(:password, _('New password'), class: 'required') %> <%= f.password_field(:password, class: 'left-indent required input-medium', id: 'user_new_password') %>
- <%= f.label(:password_confirmation, _('Password Confirmation'), class: 'required') %> + <%= f.label(:password_confirmation, _('Password confirmation'), class: 'required') %> <%= f.password_field(:password_confirmation, class: 'left-indent required input-medium') %> diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb index ee0941f..6a483ba 100644 --- a/app/views/devise/registrations/_personal_details.html.erb +++ b/app/views/devise/registrations/_personal_details.html.erb @@ -17,24 +17,24 @@
<%= f.label(:email, _('Email'), class: 'required') %> - <%= f.email_field(:email, class: 'left-indent required input-medium', + <%= f.email_field(:email, class: 'left-indent required input-large', title: _('Please enter your current password below when changing your email address.'), value: @user.email) %>
- <%= f.label(:firstname, _('First Name'), class: 'required') %> + <%= f.label(:firstname, _('First name'), class: 'required') %> <%= f.text_field(:firstname, class: 'input-small required left-indent', value: @user.firstname) %>
- <%= f.label(:surname, _('Last Name'), class: 'required') %> + <%= f.label(:surname, _('Last name'), class: 'required') %> <%= f.text_field(:surname, class: 'input-small required left-indent', value: @user.surname) %>
- <%= f.label(:recovery_email, _('Recovery Email'), class: 'required') %> - <%= f.email_field(:recovery_email, class: 'left-indent required input-medium', + <%= f.label(:recovery_email, _('Recovery email'), class: 'required') %> + <%= f.email_field(:recovery_email, class: 'left-indent required input-large', title: _('This email will be used to recover your account if you change institutions'), value: @user.recovery_email) %> <%= f.label(:password, _('Password'), class: 'required') %> - <%= f.password_field(:password, class: 'left-indent required input-medium') %> + <%= f.password_field(:password, class: 'left-indent required input-large') %>
@@ -56,14 +56,14 @@ default_selection: @default_org, models: @orgs, attribute: 'name', - classes: 'left-indent input-medium'} %> + classes: 'left-indent input-large'} %> <% other_organisations = Org.where("parent_id IS ? AND is_other = ?", nil, true).pluck(:id) %>
- <%= f.label _('Organisation Name'), for: :other_organisation %> + <%= f.label _('Organisation name'), for: :other_organisation %> <%= f.text_field :other_organisation, :autocomplete => "off", :class => 'left-indent input-medium has-tooltip', 'data-toggle' => "tooltip", 'data-container' => "body", 'title' => _('Please enter the name of your organisation.') %>
@@ -74,7 +74,7 @@ <%= f.label(:language_id, _('Language')) %> <%= select_tag("user[language_id]", options_from_collection_for_select(@languages, "id", "name", lang_id), - class: 'input-small left-indent') %> + class: 'input-small') %> <% end %> @@ -88,7 +88,7 @@ <% else %> <%= label_tag(:scheme_name, scheme.name.capitalize ) %> <% end %> -
+
<%= render partial: "external_identifier_#{scheme.name}", locals: { scheme: scheme, id: current_user.identifier_for(scheme)} %> @@ -112,7 +112,7 @@ locals: {id: 'update', val: 'Save', disabled_initially: true, - classes: 'small-input-button left-indent', + classes: 'small-input-button', tooltip: _('Enter all of the required information above')} %>
diff --git a/app/views/plans/_edit_details.html.erb b/app/views/plans/_edit_details.html.erb index fb852a3..6a72d8e 100644 --- a/app/views/plans/_edit_details.html.erb +++ b/app/views/plans/_edit_details.html.erb @@ -5,7 +5,7 @@
<%= f.label "#{_('Project Title')}", for: :title, class: 'required' %> - <%= f.text_field :title, class: "input-extra-large left-indent required", 'data-toggle': "tooltip", + <%= f.text_field :title, class: "input-large left-indent required", 'data-toggle': "tooltip", 'data-content': _('If applying for funding, state the name exactly as in the grant proposal.') %>
@@ -19,7 +19,7 @@
<%= f.label "#{_('Funder')}", for: :funder_name %> - <%= f.text_field :funder_name, class: "input-extra-large left-indent" %> + <%= f.text_field :funder_name, class: "input-large left-indent" %>
@@ -42,7 +42,7 @@
<%= f.label _('ID'), for: :identifier %> - <%= f.text_field :identifier, class: 'input-medium left-indent', 'data-toggle': "tooltip", + <%= f.text_field :identifier, class: 'input-small left-indent', 'data-toggle': "tooltip", 'data-content': _('A pertinent ID as determined by the funder and/or institution.') %>
@@ -54,12 +54,12 @@
<%= f.label _('Name'), for: :principal_investigator, 'aria-label': _('Principal Investigator Name') %> - <%= f.text_field :principal_investigator, class: 'input-medium left-indent' %> + <%= f.text_field :principal_investigator, class: 'input-small left-indent' %>
<%= f.label _('ORCID ID'), for: :principal_investigator_identifier, 'aria-label': _('Principal Investigator ORCID ID') %> - <%= f.text_field :principal_investigator_identifier, class: 'input-medium left-indent' %> + <%= f.text_field :principal_investigator_identifier, class: 'input-small left-indent' %>
@@ -80,7 +80,7 @@
<%= f.label _('Name'), for: :data_contact, 'aria-label': _('Data Contact Name') %> - <%= f.text_field :data_contact, class: 'input-medium left-indent' %> + <%= f.text_field :data_contact, class: 'input-small left-indent' %>
diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb index 6c63e36..0147e38 100644 --- a/app/views/plans/new.html.erb +++ b/app/views/plans/new.html.erb @@ -15,7 +15,7 @@ <%= _('What research project are you planning?') %>
- <%= f.text_field(:title, class: 'left-indent', + <%= f.text_field(:title, class: 'left-indent input-large', 'data-toggle': 'tooltip', 'data-content': _('If applying for funding, state the project title exactly as in the proposal.')) %> <%= check_box_tag(:is_test, "1", false, class: 'left-indent') %> @@ -36,7 +36,7 @@ attribute: 'name', tooltip: _('Please select a valid research organisation from the list.'), error: _('You must select a research organisation from the list.'), - classes: 'input-full-width'} %> + classes: 'input-large'} %>
@@ -63,7 +63,7 @@ attribute: 'name', tooltip: _('Please select a valid funding organisation from the list.'), error: _('You must select a funding organisation from the list.'), - classes: 'input-full-width'} %> + classes: 'input-large'} %>

- <%= _('or') %> -

diff --git a/app/views/plans/share.html.erb b/app/views/plans/share.html.erb index 7347bb0..2e713ca 100644 --- a/app/views/plans/share.html.erb +++ b/app/views/plans/share.html.erb @@ -30,8 +30,8 @@
-

<%= _('Set plan visibility') %>

-

<%= _('Public or organisational visibility is intended for finished plans. You must answer at least one question to enable these options.') %>

+

<%= _('Set plan visibility') %>

+

<%= _('Public or organisational visibility is intended for finished plans. You must answer at least one question to enable these options.') %>

<%= form_for @plan, html: {method: :put, class: "roadmap-form"} do |f| %>
@@ -54,13 +54,13 @@
<% end %> -

<%= _('Manage collaborators')%>

+

<%= _('Manage collaborators')%>

-

<%= _('Invite specific people to read, edit, or administer your plan. Invitees will receive an email notification that they have access to this plan.') %>

+

<%= _('Invite specific people to read, edit, or administer your plan. Invitees will receive an email notification that they have access to this plan.') %>

<% if @plan.roles.any? then %> - +
@@ -98,7 +98,7 @@
<%= _('Email address')%>
<% end %> -

<%= _('Invite collaborators') %>

+

<%= _('Invite collaborators') %>

<% new_role = Role.new %> <% new_role.plan = @plan %> <%= form_for new_role, url: {controller: :roles, action: :create }, @@ -116,7 +116,7 @@

<%= f.radio_button :access_level, 1 %> - <%= f.label :access_level, _('Read Only: can view but not make changes'), class: 'checkbox-label regular-text' %> + <%= f.label :access_level, _('Read only: can view but not make changes'), class: 'checkbox-label regular-text' %>
<%= f.radio_button :access_level, 2 %> diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss index 64acab0..e5df827 100644 --- a/lib/assets/stylesheets/dmproadmap/base.scss +++ b/lib/assets/stylesheets/dmproadmap/base.scss @@ -28,10 +28,10 @@ font-size: 40px; margin-left: 15px; } -h2 { font-size: 32px; } -h3 { font-size: 26px; } -h4 { font-size: 20px; } -h5 { font-size: 18px; } +h2 { font-size: 26px; } +h3 { font-size: 20px; } +h4 { font-size: 18px; } +h5 { font-size: 16px; } hr { color: $primary-color; diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss index d3f0e38..848e7e3 100644 --- a/lib/assets/stylesheets/dmproadmap/forms.scss +++ b/lib/assets/stylesheets/dmproadmap/forms.scss @@ -220,7 +220,7 @@ width: 70%; } .input-large { - width: 50%; + width: 350px; /* 50%; */ } .input-medium { width: 30%; @@ -229,7 +229,7 @@ width: 32%; } .input-small { - width: 10%; + width: 150px; /* 10%; */ } /* Used for the jquery autocomplete combobox on side-by-side fieldsets */ .fixed-width-large { @@ -346,8 +346,7 @@ .combobox-container { position: relative; - width: 95%; - min-width: 325px; + width: 370px; /* 95%; */ font-family: $font-family; } @@ -397,21 +396,6 @@ .js-combobox[type=text]::-ms-clear { display: none; width: 0; height: 0; } .js-combobox[type=text]::-ms-reveal { display: none; width: 0; height: 0; } -/* Allows for an auto-complete box in a side-by-side form */ -div.accessible-combobox-smaller { - position: relative; - - .combobox-container { - width: 30%; - } - .js-combobox { - width: 95%; - } - .combobox-suggestions { - width: 98% - } -} - /* ------------------------------------------------ */ /* ------------------------------------------------ */ @@ -623,21 +607,20 @@ #plan_title { display: block; margin-bottom: 5px; - width: 90%; } div.form-left-side { position: relative; clear: both; float: left; - width: 40%; + width: 35%; } div.form-right-side { position: relative; float: left; margin-left: 20px; padding-top: 20px; - width: 45%; + width: 50%; min-width: 400px; label, input { @@ -853,6 +836,15 @@ } } +/* Share plan */ +/* ------------------------------------------------ */ +#collaborator-table { + min-width: 450px; + max-width: 850px; + width: 60%; +} + + /* Org edit */ /* ------------------------------------------------ */ #edit_org_details {