From c9beb6e41dd3c1e898778d118b50bea78c8853c5 Mon Sep 17 00:00:00 2001 From: p3rcypj Date: Fri, 3 Nov 2023 10:59:55 +0000 Subject: [PATCH] Merge from 3dbio-community:master --- .../stylesheets/main_frame/main_style.css | 91 +++++++++++++++++++ .../stylesheets/webserver/main.css.scss | 10 +- app/lib/global_tools/global_sites.rb | 2 +- app/views/layouts/main.html.haml | 1 + 4 files changed, 98 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/main_frame/main_style.css b/app/assets/stylesheets/main_frame/main_style.css index ad7567048..bca8d1980 100644 --- a/app/assets/stylesheets/main_frame/main_style.css +++ b/app/assets/stylesheets/main_frame/main_style.css @@ -634,6 +634,15 @@ div#controls{ /* Send feedback partial */ #zammad-feedback-form { + -webkit-appearance: button; + margin: 0; + font-size: 15px; + line-height: 1.5; + font-family: Lato, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + line-height: inherit; + overflow: visible; + cursor: pointer; + text-transform: none; position: fixed; right: 1em; bottom: 0; @@ -644,4 +653,86 @@ div#controls{ font-weight: 600; border-radius: 0.3rem 0.3rem 0 0; z-index: 999; + box-sizing: border-box; +} + +.zammad-form-control { + height: calc(1.5em + 0.75rem + 2px); + padding: 0.375rem 0.75rem; + font-size: 1rem; + font-weight: 400; + line-height: 1.5; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: 0.25rem; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + font-family: Lato, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; +} + +.zammad-form-modal .zammad-form-modal-body label { + margin-top: 18px; + display: inline-block; + margin-bottom: 0.5rem; +} + +.zammad-form-modal .zammad-form-modal-body { + max-width: 600px !important; + font-family: Lato, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; +} + +.zammad-form-modal .zammad-form-modal-body form.zammad-form button[type="submit"] { + -webkit-appearance: button; + background: #607d8b; + border: 0; + color: #fff; + font-weight: 600; + border-radius: 0.3rem; + cursor: pointer; + display: inline-block; + text-align: center; + vertical-align: middle; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + padding: 0.375rem 0.75rem; + font-size: 1rem; + line-height: 1.5; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + text-transform: none; + overflow: visible; + margin-top: 18px; + margin: 0; + font-family: inherit; + box-sizing: border-box; +} + +.zammad-form-modal .zammad-form-modal-body textarea.form-control { + height: auto; + display: block; + width: 100%; + box-sizing: border-box; + padding: 0.375rem 0.75rem; + font-size: 1rem; + font-weight: 400; + line-height: 1.5; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: 0.25rem; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + overflow: auto; + resize: vertical; + margin: 0; + font-family: inherit; +} + +.zammad-form-modal .zammad-form-modal-body form.zammad-form h2 { + font-size: 1.25em; + margin-top: 0; + margin-bottom: 0; + font-weight: 500; + line-height: 1.2; } \ No newline at end of file diff --git a/app/assets/stylesheets/webserver/main.css.scss b/app/assets/stylesheets/webserver/main.css.scss index 594630ead..da6f20f51 100644 --- a/app/assets/stylesheets/webserver/main.css.scss +++ b/app/assets/stylesheets/webserver/main.css.scss @@ -325,11 +325,11 @@ a:hover { } .citation { - font-size: 1rem; - .authors { - font-size: 0.75rem; - color: #212529 !important; - } + font-size: 1rem; + .authors { + font-size: 0.75rem; + color: #212529 !important; + } } .form-check-input { diff --git a/app/lib/global_tools/global_sites.rb b/app/lib/global_tools/global_sites.rb index ba5a64edc..71ad42fc2 100644 --- a/app/lib/global_tools/global_sites.rb +++ b/app/lib/global_tools/global_sites.rb @@ -1,7 +1,7 @@ module GlobalTools module GlobalSites - GS_BaseUrl = "https://bionotes-service.cnb.csic.es/" + GS_BaseUrl = "http://rinchen-dos.cnb.csic.es/" GS_EnsemblServer = "http://rest.ensembl.org/" GS_UniServer = "http://www.uniprot.org/" GS_SIFTSUrl = "http://ftp.ebi.ac.uk/pub/databases/msd/sifts/xml/" diff --git a/app/views/layouts/main.html.haml b/app/views/layouts/main.html.haml index 673e62b57..7a05b9290 100644 --- a/app/views/layouts/main.html.haml +++ b/app/views/layouts/main.html.haml @@ -5,6 +5,7 @@ %meta{:name => "keywords", :content => "bioinformatics, proteins, PDB, emdb, Uniprot"} %title= title = csrf_meta_tag + = stylesheet_link_tag("https://fonts.googleapis.com/css?family=Lato:400,700,400italic&display=swap") = stylesheet_link_tag('main_frame/main_style.css') = stylesheet_link_tag('main_frame/upload_data.css') = stylesheet_link_tag('main_frame/remove_annotations.css')