diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 1696e7f..9a92ac7 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -10,7 +10,7 @@ Types of Contributions Report Bugs ~~~~~~~~~~~ -Report bugs at https://github.com/https://github.com/mb-wali/invenio-theme-tugraz.git/issues. +Report bugs at https://github.com/mb-wali/invenio-theme-tugraz/issues. If you are reporting a bug, please include: @@ -41,7 +41,7 @@ Submit Feedback ~~~~~~~~~~~~~~~ The best way to send feedback is to file an issue at -https://github.com/https://github.com/mb-wali/invenio-theme-tugraz.git/issues. +https://github.com/mb-wali/invenio-theme-tugraz/issues. If you are proposing a feature: @@ -114,5 +114,5 @@ Before you submit a pull request, check that it meets these guidelines: 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring. 3. The pull request should work for Python 2.7, 3.5 and 3.6. Check - https://travis-ci.org/https://github.com/mb-wali/invenio-theme-tugraz.git/pull_requests + https://travis-ci.com/github/mb-wali/invenio-theme-tugraz/pull_requests and make sure that the tests pass for all supported Python versions. diff --git a/README.md b/README.md deleted file mode 100644 index 6af632b..0000000 --- a/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# invenio-theme-tugraz -invenio module for TUGRAZ theme. - -## install -```pipenv install git+https://github.com/mb-wali/invenio-theme-tugraz.git@master#egg=invenio_theme_tugraz``` - -## Developing -While developing this module make sure to comment or remove these variables from ```invenio.cfg``` file. -``` -THEME_LOGO="images/logo.svg" -INSTANCE_THEME_FILE = './scss//theme.scss' -INSTANCE_SEARCH_THEME_FILE = './scss//search/theme.scss' -``` diff --git a/README.rst b/README.rst index a73c266..ab86ca9 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ .. - Copyright (C) 2020 mojib wali. + Copyright (C) 2020 Mojib wali. invenio-theme-tugraz is free software; you can redistribute it and/or modify it under the terms of the MIT License; see LICENSE file for more @@ -9,20 +9,11 @@ invenio-theme-tugraz ====================== -.. image:: https://img.shields.io/travis/https://github.com/mb-wali/invenio-theme-tugraz.git.svg - :target: https://travis-ci.org/https://github.com/mb-wali/invenio-theme-tugraz.git +.. image:: https://img.shields.io/travis/inveniosoftware/invenio-app-rdm.svg + :target: https://travis-ci.com/github/mb-wali/invenio-theme-tugraz -.. image:: https://img.shields.io/coveralls/https://github.com/mb-wali/invenio-theme-tugraz.git.svg - :target: https://coveralls.io/r/https://github.com/mb-wali/invenio-theme-tugraz.git - -.. image:: https://img.shields.io/github/tag/https://github.com/mb-wali/invenio-theme-tugraz.git.svg - :target: https://github.com/https://github.com/mb-wali/invenio-theme-tugraz.git/releases - -.. image:: https://img.shields.io/pypi/dm/invenio-theme-tugraz.svg - :target: https://pypi.python.org/pypi/invenio-theme-tugraz - -.. image:: https://img.shields.io/github/license/https://github.com/mb-wali/invenio-theme-tugraz.git.svg - :target: https://github.com/https://github.com/mb-wali/invenio-theme-tugraz.git/blob/master/LICENSE +.. image:: https://img.shields.io/github/license/inveniosoftware/invenio-app-rdm.svg + :target: https://github.com/mb-wali/invenio-theme-tugraz/blob/master/LICENSE invenio module for TUGRAZ theme. diff --git a/docs/conf.py b/docs/conf.py index d162443..18d98a2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -123,7 +123,7 @@ html_theme_options = { 'github_banner': True, 'show_powered_by': False, 'extra_nav_links': { - 'invenio-theme-tugraz@GitHub': 'https://github.com/https://github.com/mb-wali/invenio-theme-tugraz.git', + 'invenio-theme-tugraz@GitHub': 'https://github.com/mb-wali/invenio-theme-tugraz', 'invenio-theme-tugraz@PyPI': 'https://pypi.python.org/pypi/invenio-theme-tugraz/', } } diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less index 6be0bee..f39a2b3 100644 --- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less +++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less @@ -6,232 +6,302 @@ * under the terms of the MIT License; see LICENSE file for more details. */ - #int-menu-q-home-icon { - width: 18px; - height: 18px; - vertical-align: top; - fill: red; +#int-menu-q-home-icon { + width: 18px; + height: 18px; + vertical-align: top; + fill: red; +} - } +/*****logo section******/ +.affiliation-spacer { + display: table-cell; + vertical-align: middle; + width: 100%; +} - /*****logo section******/ - .affiliation-spacer{ - display: table-cell; - vertical-align: middle; - width: 100%; - } - - .affiliation-logo { - display: table-cell; - padding: 0 50px 0 0; - vertical-align: middle; - white-space: nowrap; - } - .affiliation { - background-color: white; - display: table; - margin: 0 auto 80px; - max-width: 1060px; - width: 100%; - text-decoration: none; - - } - - .affiliation-text { - display: table-cell; - font-size: 17px; - padding: 0 0 0 50px; - vertical-align: middle; - white-space: nowrap; - } - - .affiliation-logo-claim { - display: inline-block; - font-size: 12px; - letter-spacing: 2px; - line-height: 17px; - padding: 0 17px 0 0; - text-align: right; - vertical-align: top; - } - - a { - color: inherit; - text-decoration: none; - transition: background-color 0.15s ease 0s, color 0.15s ease 0s; - } - /*****END logo section******/ - - - - .short-menu { - display: table; - height: 49px; - width: 100%; - } - .short-menu-left { - border-right: 1px solid black; - display: table-cell; - text-align: right; - width: 50%; - } - .short-menu-right { - display: table-cell; - vertical-align: top; - width: 50%; - color:#000000; - } - .short-menu-left-search { - display: inline-block; - margin: 12px 9px 6px 0; - color:#000000; - } - .short-menu-right-h { - cursor: pointer; - display: inline-block; - margin: 12px 0 6px 9px; - padding: 5px; - } - - .short-menu-right-main-menu { - display: inline-block; - margin-right: 3px; - vertical-align: top; - width: 21px; - } - svg:not(:root) { - overflow: hidden; - } - - - - /***********MAIN menu*************/ - .header { - min-width: 0; - - position: relative; - width: 100%; - //height: 100%; - } - - .main-menu-box { - box-sizing: border-box; - display: table; - margin: 0 auto; - max-width: 1060px; - padding: 9px 50px 8px; - text-align: left; - width: 100%; - } - - .main-menu-entry { - display: table-cell; - text-align: center; - } - .main-menu-entry a { - box-decoration-break: clone; - padding: 5px 8px; - } - - .main-menu-entry a:hover{ - background-color: #000000; - color: #ffffff; - text-decoration: none; - } - - .affiliation-text a:hover{ - background-color: #000000; - color: #ffffff; - text-decoration : none; - } - - .affiliation-logo :hover{ +.affiliation-logo { + display: table-cell; + padding: 0 50px 0 0; + vertical-align: middle; + white-space: nowrap; +} +.affiliation { + background-color: white; + display: table; + margin: 0 auto 80px; + max-width: 1060px; + width: 100%; text-decoration: none; - } +} - .short-menu-right :hover{ - background-color: #000000; - color: #ffffff; - } +.affiliation-text { + display: table-cell; + font-size: 17px; + padding: 0 0 0 50px; + vertical-align: middle; + white-space: nowrap; +} - .main-menu { - border-bottom: 1px solid #000; - box-sizing: border-box; - height: 39px; - margin-top: -1px; - overflow: hidden; - transition: height 0.3s linear 0s; - } +.affiliation-logo-claim { + display: inline-block; + font-size: 12px; + letter-spacing: 2px; + line-height: 17px; + padding: 0 17px 0 0; + text-align: right; + vertical-align: top; +} - @media (max-width: 767.9px){ +a { + color: inherit; + text-decoration: none; + transition: background-color 0.15s ease 0s, color 0.15s ease 0s; +} +/*****END logo section******/ + +.short-menu { + display: table; + height: 49px; + width: 100%; +} + +.short-menu-left { + border-right: 1px solid black; + display: table-cell; + text-align: right; + width: 50%; +} + +.short-menu-right { + display: table-cell; + width: 50%; + color: #000000; + & div { + & svg { + & g { + stroke: #000; + stroke-linecap: round; + stroke-width: 2; + fill: none; + } + } + } +} + +.short-menu-right :hover { + background-color: #000000; + color: #ffffff; + & svg { + & g { + stroke: #fff; + } + } +} + +.short-menu-left-lang { + display: inline-block; + margin-right: 10px; + font-size: 17px !important; + font-weight: 300; + & a { + padding: 5px; + background-color: transparent; + color: #000; + text-decoration: none; + } +} + +.short-menu-left-lang:hover { + & a { + background-color: #000; + color: #fff; + text-decoration: none; + } +} + +.search-icon-header { + display: inline-block; + & a { + background-color: transparent; + padding: 5px; + text-decoration: none; + & svg { + & g { + stroke-linejoin: round; + stroke: #000; + stroke-miterlimit: 10; + stroke-width: 2; + fill: none; + } + } + } +} + +.search-icon-header:hover { + & a { + background-color: #000; + text-decoration: none; + & svg { + & g { + stroke: #fff; + } + } + } +} + +.short-menu-left-search { + display: inline-block; + margin: 12px 9px 6px 0; + color: #000000; +} + +.short-menu-right-h { + cursor: pointer; + display: inline-block; + margin: 12px 0 6px 9px; + padding: 5px; +} + +.short-menu-right-main-menu { + display: inline-block; + margin-right: 3px; + vertical-align: top; + width: 21px; +} + +.short-menu-icon { + vertical-align: top; + width: 20px; + height: 19px; +} + +svg:not(:root) { + overflow: hidden; +} + +/***********MAIN menu*************/ +.header { + min-width: 0; + + position: relative; + width: 100%; + //height: 100%; +} + +.main-menu-box { + font-size: 16px; + box-sizing: border-box; + display: table; + margin: 0 auto; + max-width: 1060px; + padding: 9px 50px 8px; + text-align: left; + width: 100%; +} + +.main-menu-entry { + display: table-cell; + text-align: center; +} +.main-menu-entry a { + box-decoration-break: clone; + padding: 5px 8px; +} + +.main-menu-entry a:hover { + background-color: #000000; + color: #ffffff; + text-decoration: none; +} + +.affiliation-text a:hover { + background-color: #000000; + color: #ffffff; + text-decoration: none; +} + +.affiliation-logo :hover { + text-decoration: none; +} + +.main-menu { + border-bottom: 1px solid #000; + box-sizing: border-box; + height: 39px; + margin-top: -1px; + overflow: hidden; + transition: height 0.3s linear 0s; +} + +@media (max-width: 767.9px) { .main-menu { height: auto; } - } +} - @media (max-width: 767.9px){ +@media (max-width: 767.9px) { .main-menu-entry { display: table-row; line-height: 1.9em; } - } +} - @media screen and (max-width: 767.9px){ +@media screen and (max-width: 767.9px) { #int-header-logo-img { width: 200px; height: 75px; } - } +} - @media screen and (max-width: 767.9px){ +@media screen and (max-width: 767.9px) { #int-header-logo { padding: 50px 0; text-align: center; - }} + } +} - @media screen and (max-width: 767.9px){ - .affiliation{ +@media screen and (max-width: 767.9px) { + .affiliation { margin: 0; text-align: center; - } - .affiliation-text{ + .affiliation-text { display: none; } - .affiliation-logo-claim{ + .affiliation-logo-claim { display: none; } - .affiliation-spacer{ + .affiliation-spacer { display: none; } +} - } - - @media (max-width: 767.9px){ +@media (max-width: 767.9px) { .main-menu-box { - margin-top:15px; + margin-top: 15px; width: 100%; text-align: center; } - } +} - .int-menu-q-open-icon { - width: 14px; - vertical-align: middle; - margin-left: 5px; - } +.int-menu-q-open-icon { + width: 14px; + vertical-align: middle; + margin-left: 5px; +} - /*********************Custom overrides**********************/ - /** Login with SAML**/ - .col a{ - cursor: pointer; - } +/*********************Custom overrides**********************/ +/** Login with SAML**/ +.col a { + cursor: pointer; +} - /**** hyperlink hover color ****/ - a:focus, - a:hover { - color:#E4154B; - text-decoration:underline - } +/**** hyperlink hover color ****/ +a:focus, +a:hover { + color: #e4154b; + text-decoration: underline; +} diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less index f1bcd5a..f7826a5 100644 --- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less +++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less @@ -5,7 +5,7 @@ * invenio-theme-tugraz is free software; you can redistribute it and/or modify it * under the terms of the MIT License; see LICENSE file for more details. */ - + /* On hover color changed * from #0377cd * to #E4154B @@ -16,7 +16,7 @@ .section-content-light-bg a:focus, .hp-blog-section a:hover, .hp-blog-section a:focus { - color: #E4154B; + color: #e4154b; } /* @@ -28,13 +28,13 @@ background-color: #ffffff; } - /* +/* * section title. * from #0377cd * to #000000 */ .section-title { -color: #000000; + color: #000000; } /*** @@ -55,3 +55,10 @@ To #000000 .panel-free-title { color: #000000; } + +/*** +forcing the font changes +*/ +body { + font-family: "Source Sans Pro"; +} diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less index eff8101..dae2560 100644 --- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less +++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/theme.less @@ -5,11 +5,11 @@ * invenio-theme-tugraz is free software; you can redistribute it and/or modify it * under the terms of the MIT License; see LICENSE file for more details. */ - + @import "header"; @import "footer"; @import "overrides"; - +@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro&display=swap"); /*** **TODO: @@ -17,4 +17,4 @@ ***/ //@import "../invenio_app_rdm/theme"; -//@import "variables"; \ No newline at end of file +//@import "variables"; diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login.html index d807867..56f5898 100644 --- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login.html +++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login.html @@ -18,9 +18,17 @@

{{ _('Log in to account') }}

{%- endblock form_header %} - + + {%- if config.INVENIO_CONFIG_TUGRAZ_SHIBBOLETH == 'True' %} +
+ + + {% trans type='TU Graz' %} Log in with {{ type }}{% endtrans %} + +
+

— OR —

+ {%- endif %} + {%- block form_outer %} {%- with form = login_user_form %}
- -
-
- - -
-
{%- if config.I18N_LANGUAGES %} - +
{%- for l in current_i18n.get_locales() %} {%- if current_i18n.language != l.language %} {{ l.get_display_name() [0:2]}} - {% else %} - {{ l.get_display_name() [0:2] }} + href="{{ url_for('invenio_i18n.set_lang', lang_code=l.language) }}">{{ l.get_display_name().upper() [0:2]}} {%- endif %} {%- endfor %} - +
{%- endif %} - - - - - - - - - - +
+ + + + + + + + +
-
- -
- - Menu + + + + + + + + Main Menu
diff --git a/invenio_theme_tugraz/version.py b/invenio_theme_tugraz/version.py index 0f23e07..3fda7c6 100644 --- a/invenio_theme_tugraz/version.py +++ b/invenio_theme_tugraz/version.py @@ -12,4 +12,4 @@ This file is imported by ``invenio_theme_tugraz.__init__``, and parsed by ``setup.py``. """ -__version__ = '1.0.0.dev20200000' +__version__ = '1.0.0'