-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
include changes from develop branch and fixed theses_test.rb
- Loading branch information
Showing
31 changed files
with
717 additions
and
134 deletions.
There are no files selected for viewing
160 changes: 153 additions & 7 deletions
160
app/assets/stylesheets/bootstrap_and_overrides.css.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,157 @@ | ||
| /************************/ | ||
| /*** YORKU CSS START ***/ | ||
| /************************/ | ||
| // Import Bootstrap's default functions first | ||
| // then add your custom variables | ||
| // then import variables, mixins | ||
| // then import bootstrap | ||
| // then add your custom css | ||
|
|
||
| @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"); | ||
|
|
||
|
|
||
| @import "bootstrap/variables"; | ||
| @import "bootstrap/mixins"; | ||
| @import "bootstrap"; | ||
| $color_h6: #d2452a; | ||
| $color_h6_green: #009900; | ||
| h6 { | ||
| color: $color_h6; | ||
|
|
||
| // 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; | ||
| } | ||
|
|
||
| h6.green{ | ||
| color: $color_h6_green; | ||
| border-bottom: 1px solid rgb(228, 228, 228); | ||
| .dl-horizontal dd { | ||
| color: $secondary; | ||
| } | ||
|
|
||
| .page-header { | ||
| margin-bottom: 10px; | ||
| } | ||
| .student-view { | ||
| 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; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .simple_form { | ||
| // background-color: lighten($york-grey-pewter, 8%); | ||
| // background-color: $york-grey-pewter; | ||
| background-color: $light; | ||
| padding: 0.875rem; | ||
| } | ||
| .simple_form .form-control { | ||
| font-size: 1.1rem; | ||
| margin-bottom: 10px; | ||
| } | ||
| .simple_form .form-text { | ||
| margin-bottom: 0.25rem; | ||
| } | ||
| .container section { | ||
| padding-top: 15px; | ||
| padding-bottom: 15px; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <% primary = false if local_assigns[:primary].nil? %> | ||
| <div class="modal fade" id="<%= primary ? 'primary-file' : 'supplemental-embargo-files' %>" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-hidden="true"> | ||
| <div class="modal-dialog"> | ||
| <div class="modal-content"> | ||
| <div class="modal-header"> | ||
| <% if primary %> | ||
| <h1 class="modal-title fs-5" id="primary-file">Upload Primary File</h1> | ||
| <% else %> | ||
| <h1 class="modal-title fs-5" id="supplemental-files">Upload Supplementary File</h1> | ||
| <% end %> | ||
| <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button> | ||
| </div> | ||
| <%= simple_form_for [@student, @thesis, Document.new], html: { class: "document", multipart: true, id: "new_document_#{primary}" }, authenticity_token: true, remote: true do |f| %> | ||
| <div class="modal-body"> | ||
| <div class="alert alert-secondary" role="alert"> | ||
| <% if primary %> | ||
| <p>Your primary file should be in <strong>PDF format.</strong></p> | ||
| <% else %> | ||
| <% if "#{AppSettings.student_supplementary_embargo_upload_files}" != '' %> | ||
| <%= raw(AppSettings.student_supplementary_embargo_upload_files) %> | ||
| <% else %> | ||
| <p>File size must be limited to acceptable formats include:</p> | ||
| <ul> | ||
| <li><strong>Documents:</strong> Portable Document Format (.pdf), Text (.txt), Hypertext Markup Language (.html, .htm), Open Document Format (.odt, .odp, .ods).</li> | ||
| <li><strong>Images:</strong> Portable Network Graphics format (.png), Tagged Image File format (.tif), JPEG (.jpg)</li> | ||
| <li><strong>Data:</strong> Comma-separated values (.csv) or other delimited text, Extensible Markup Language (.xml)</li> | ||
| <li><strong>Video:</strong> 8-10 bit uncompressed AVI (.avi)</li> | ||
| <li><strong>Audio:</strong> Free Lossless Audio Codec or WAVE (.flac or .wav)</li> | ||
| </ul> | ||
| <% end %> | ||
| <% end %> | ||
| </div> | ||
| <% f.input :name, required: false, input_html: { class: "span4", autocomplete: "off"} %> | ||
| <%= f.input :file, required: true, as: :file %> | ||
| <% if primary %> | ||
| <%= f.hidden_field :usage, value: :thesis %> | ||
| <%= f.hidden_field :supplemental, value: false %> | ||
| <% else %> | ||
| <%= f.input :usage, label: "Document type", collection: Document.usages.keys.map(&:to_sym).reject { |usage| usage == :licence or usage == :thesis }, required: true, label_html: { class: 'pt-2' } %> | ||
| <%= f.hidden_field :supplemental, value: true %> | ||
| <% end %> | ||
|
|
||
| </div> | ||
| <div class="modal-footer"> | ||
| <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button> | ||
| <%= f.button :submit, "Upload", class: "btn btn-primary" %> | ||
| </div> | ||
| <% end %> | ||
| </div> | ||
| </div> | ||
| </div> |
Oops, something went wrong.