diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.scss b/app/assets/stylesheets/bootstrap_and_overrides.css.scss index f291db6..16c23d4 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.scss +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.scss @@ -9,110 +9,16 @@ @import "bootstrap/functions"; -//YorkU Colors -/* 2021 YorkU colours */ -/* http://toolbox.info.yorku.ca/visual-identity/colours/ */ -$york-grey-dark: #686260; -$york-grey-medium: #B7AEA9; -$york-grey-pewter: #D6CFCA; -$york-grey-light: #E8E4DF; -$york-grey-lighter: #FAFAFA; -$york-red-pms-186: #E31837; -$york-red-medium: #B82025; -$york-red-dark: #8C0000; -$york-light-blue: #ACE6F8; -$york-bright-blue: #3AC2EF; - -// Custom theme colors -$primary: $york-red-pms-186; -$secondary: $york-grey-dark; -$success: #2e8540 !default; //#35B01C !default; //$green !default; $success: #3AC2EF; -$info: darken($york-light-blue, 50%); -$warning: #ffc107; -$danger: $york-red-medium; -$light: $york-grey-lighter; -$dark: $york-grey-dark; - -// Additional custom styles -$border-radius: .25rem; -$btn-border-radius: .25rem; -$btn-padding-y: .5rem; -$btn-padding-x: 1rem; -$btn-font-weight: 400; - -$theme-colors: ( - 'primary': $primary, - 'secondary': $secondary, - 'success': $success, - 'info': $info, - 'warning': $warning, - 'danger': $danger, - 'light': $light, - 'dark': $dark, -); - -$yorku-colors: ( - 'york-grey-dark': $york-grey-dark, - 'york-grey-medium': $york-grey-medium, - 'york-grey-pewter': $york-grey-pewter, - 'york-grey-light': $york-grey-light, - 'york-grey-lighter': $york-grey-lighter, - 'york-red-pms-186': $york-red-pms-186, - 'york-red-medium': $york-red-medium, - 'york-red-dark': $york-red-dark, - 'york-light-blue': $york-light-blue, - 'york-bright-blue': $york-bright-blue -); - -// Merge the maps -$theme-colors: map-merge($theme-colors, $yorku-colors); -$theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value"); - +/* Custom theme colors go here */ +/* Set your own primary/secondary/info/success etc. colors here */ +/* e.g. $primary: #e31837 */ @import "bootstrap/variables"; @import "bootstrap/mixins"; @import "bootstrap"; // Headings customization -.container { - - h1, .h1 { - color: $black; - font-weight: 700; - } - - h2, .h2 { - color: $primary; - font-weight: 600; - } - - h3, .h3 { - color: darken($info, 30%); - font-weight: 500; - } - - h4, .h4, h5, .h5, h6, .h6 { - color: $secondary; - font-weight: 400; - } - - // Subheadings customization - .subheading { - color: $secondary; - font-weight: 300; - font-size: 1.25rem; // Adjust as needed - } -} -// Key-Value pairs in forms -.dl-horizontal dt { - font-weight: 500; - color: $primary; -} - -.dl-horizontal dd { - color: $secondary; -} - +.container { } .page-header { margin-bottom: 10px; } @@ -120,28 +26,35 @@ $theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value"); margin-top: 10px; } -// Custom styles can go here, if needed -.record-data { - margin-top: 10px; - margin-bottom: 10px; - tr { - td:nth-child(1) { - @extend .lead; - // font-size: $small-font-size; - font-size: 1rem; - color: $secondary; - } - td:nth-child(2) { - // color: $secondary; - font-weight: 600; - } +////////////////////////////////////////// +// Custom styles can go here, if needed // +////////////////////////////////////////// + +.settings-content div { + margin-top: 0; + margin-bottom: 1rem; + font-size: 1.25rem; +} + +.thesis, .data-grid { + h4 { + font-size: 1.25rem; + font-weight: 300; + color: $secondary; + } + p { + font-weight: bold; } } +.navbar-brand { + font-weight: 700; + color: #e31837; + // color: #af0d1a; +} + +/* Simple Form basic styles */ .simple_form { - // background-color: lighten($york-grey-pewter, 8%); - // background-color: $york-grey-pewter; - background-color: $light; padding: 0.875rem; } .simple_form .form-control { diff --git a/app/views/documents/_document.html.erb b/app/views/documents/_document.html.erb index 78c296e..1c2ac99 100644 --- a/app/views/documents/_document.html.erb +++ b/app/views/documents/_document.html.erb @@ -1,36 +1,37 @@
-
+
<%= link_to_unless_current edit_student_thesis_document_path(@student, @thesis, document) do %> - + <% end %>
-
- " title="<%= File.basename(document.file_url) %>"> +
+
+ +
+ " title="<%= File.basename(document.file_url) %>"> <%= URI.decode_www_form_component(File.basename(document.file_url)) %> <% if document.name %> <%= document.name %>     <% end %> - -
-
-
+ +
<% unless block_thesis_changes?(@thesis) %> <% if document.usage != 'licence' %> - <%= link_to edit_student_thesis_document_path(@student, @thesis, document), class: "btn btn-sm btn-info mx-2", title: "Edit File" do %> + <%= link_to edit_student_thesis_document_path(@student, @thesis, document), class: "btn btn-info mx-2 my-2", title: "Edit File" do %> Edit file <% end %> <% end %> - <%= link_to document.file_url, class: 'btn btn-sm btn-success mx-2', title: "Download file" do %> + <%= link_to document.file_url, class: 'btn btn-secondary mx-2 my-2', title: "Download file" do %> Download [<%=number_to_human_size document.file.file.size rescue nil%>] <% end %> <% unless block_thesis_changes?(@thesis) %> - <%= link_to [@student, @thesis, document], data: { confirm: 'Are you sure?' }, class: "btn btn-sm btn-danger mx-2", :method => :delete do %> + <%= link_to [@student, @thesis, document], data: { confirm: 'Are you sure?' }, class: "btn btn-danger mx-2 my-2", :method => :delete do %> Delete <% end %> <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index de85b1a..b0b77e0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,64 +1,76 @@ - - <%= content_for?(:title) ? yield(:title) : "Untitled" %> - <%= stylesheet_link_tag "application" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tag %> - <%= yield(:head) %> + <%= content_for?(:title) ? yield(:title) : "Untitled" %> + <%= stylesheet_link_tag "application", media: "all" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tag %> + <%= yield(:head) %> + - -
- <% if AppSettings.app_maintenance=="true" %> -
-
-
-

Attention!

- <%= AppSettings.app_maintenance_message %> -
-
+
+ <% if AppSettings.app_maintenance == "true" %> + <% end %> -
-
-
-
- <%= image_tag("yorklogo.gif", alt: "York University - Graduate Studies" )%> -

Faculty of Graduate Studies

-
+
+
+
+ <%= image_tag("yorklogo.gif", alt: "York University - Graduate Studies", class: "img-fluid") %> +
+
+
Faculty of Graduate Studies
+
Electronic Thesis Dissertation Application
+
+
- <%= render :template=> "layouts/navbar" %> - -
- <% flash.each do |name, msg| %> -
" role="alert"> - <%= name.capitalize %>: <%= msg %> - -
- <% end %> -
- <%= content_tag :h1, yield(:title) if show_title? && !content_for?(:title_html) %> - <%= yield (:title_html) if content_for?(:title_html)%> + +
+
+ <%= render :template => "layouts/navbar" %> + <% if AppSettings.app_maintenance == "true" %> + + <% end %> -
-
"> - <%= yield %> -
- <% if content_for?(:sidebar) %> -
- <%= yield (:sidebar) %> -
- <% end %> + <% flash.each do |name, msg| %> + + <% end %> + +
+ <%= content_tag :h1, yield(:title) if show_title? && !content_for?(:title_html) %> + <%= yield (:title_html) if content_for?(:title_html)%>
-
Electronic Thesis Dissertation Submission Program (ETD) - York University Libraries
-
-
-
- - \ No newline at end of file + + +
+
+
+ <%= yield %> +
+ <% if content_for?(:sidebar) %> + + <% end %> +
+
+ + +
+

Electronic Thesis Dissertation Submission Application (ETD) - York University Libraries

+
+ + <%= yield(:scripts) %> +
+ + \ No newline at end of file diff --git a/app/views/layouts/navbar.html.erb b/app/views/layouts/navbar.html.erb index 3bf7edb..0ed9d9f 100644 --- a/app/views/layouts/navbar.html.erb +++ b/app/views/layouts/navbar.html.erb @@ -1,5 +1,6 @@