Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add all title style && Add new favicon && Fix problem list style #25

Merged
merged 1 commit into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/ui-default/misc/section.styl
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@

.section__header .section__title
line-height: $form-control-height
font-weight: 500

h1.section__title
font-size: 1.4rem
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-default/misc/tailwindstylus.styl
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
color: #FFC0CB

.bg-black
background-color: #000
background-color: #000 !important

.bg-white
background-color: #FFF !important
Expand Down
5 changes: 4 additions & 1 deletion packages/ui-default/misc/typography.styl
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,10 @@ h1, h2, h3, h4, h5, h6

.typo h2
font-size: 1.4em
font-weight: 400
font-weight: 500
margin-top: 100px
&:first-child
margin-top: 0

.typo h3
font-size: 1.17em
Expand Down
Binary file modified packages/ui-default/static/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/ui-default/static/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/ui-default/templates/contest_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="medium-9 columns">
<div class="section">
<div class="section__header" style="align: center">
<h1 class="section__title">{{ tdoc.title }}</h1>
<h1 class="section__title font-medium">{{ tdoc.title }}</h1>
</div>
<div class="section__body">
<span class="bp4-tag bp4-large bp4-minimal problem__tag-item">{{ _(model.contest.statusText(tdoc, tsdoc)) }}</span>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/contest_main.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h1>{{ tdoc.title }}</h1>
{%- endfor -%}
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('All Contests') if not rule else _('All {0} Contests').format(_(model.contest.RULES[rule].TEXT)) }}</h1>
<h1 class="section__title font-medium">{{ _('All Contests') if not rule else _('All {0} Contests').format(_(model.contest.RULES[rule].TEXT)) }}</h1>
<div class="section__tools">
<form method="get" name="filter-form">
{{ _('Show') }}:
Expand Down Expand Up @@ -132,7 +132,7 @@ <h1 class="contest__title"><a href="{{ url('contest_detail', tid=tdoc.docId) }}"
{% if handler.user.hasPerm(perm.PERM_CREATE_CONTEST) %}
<div class="section side">
<div class="section__header">
<h1 class="section__title">
<h1 class="section__title font-medium">
{{ _('Create Contest') }}
</h1>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/domain_group.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
{% block domain_content %}
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('{0}: Groups').format(domain.name) }}</h1>
<h1 class="section__title font-medium">{{ _('Kathy: 小组').format(domain.name) }}</h1>
<div class="section__tools">
<button class="primary rounded button" name="create_group">{{ _('Create Group') }}</button>
</div>
</div>
{{ noscript_note.render() }}
<div class="section__body no-padding domain-group">
<div class="section__body no-padding domain-group mt-4">
<table class="data-table">
<colgroup>
<col class="col--checkbox">
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/domain_join_applications.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% if joinSettings %}
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('Information') }}</h1>
<h1 class="section__title font-medium">{{ _('Information') }}</h1>
</div>
<div class="section__body typo">
<p>{{ _('User can join this domain by visiting the following URL') }}:</p>
Expand All @@ -23,7 +23,7 @@ <h1 class="section__title">{{ _('Information') }}</h1>
{% endif %}
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('Settings') }}</h1>
<h1 class="section__title font-medium">{{ _('Settings') }}</h1>
</div>
{% if rolesWithText.length == 1 %}
<div class="section__body typo">
Expand Down
8 changes: 4 additions & 4 deletions packages/ui-default/templates/domain_permission.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<form method="post">
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('{0}: Permissions').format(domain.name) }}</h1>
<h1 class="section__title font-medium">{{ _('Kathy: 权限').format(domain.name) }}</h1>
</div>
{% if roles.length == 3 %}
<div class="section__body typo">
Expand All @@ -23,15 +23,15 @@ <h1 class="section__title">{{ _('{0}: Permissions').format(domain.name) }}</h1>
</colgroup>
<thead>
<tr>
<th class="col--description">{{ _('Permissions') }}</th>
<th class="col--description font-medium text-black">{{ _('Permissions') }}</th>
{%- for role in roles -%}
<th class="col--p"><span data-tooltip="{{ role._id }}">{{ role._id }}</span></th>
{%- endfor -%}
</tr>
</thead>
{%- for family, perms in PERMS_BY_FAMILY -%}
<tbody>
<tr><td class="col--family" colspan="{{ (roles|length)+1 }}">{{ _(family) }}</td></tr>
<tr><td class="col--family bg-blue" colspan="{{ (roles|length)+1 }}">{{ _(family) }}</td></tr>
{%- for perm in perms -%}
<tr>
<td class="col--description">{{ _(perm.desc) }}</td>
Expand All @@ -47,7 +47,7 @@ <h1 class="section__title">{{ _('{0}: Permissions').format(domain.name) }}</h1>
</tbody>
{%- endfor -%}
<tbody style="display:none">
<tr><td class="col--family" colspan="{{ (roles|length)+1 }}">placeholder</td></tr>
<tr><td class="col--family bg-blue" colspan="{{ (roles|length)+1 }}">placeholder</td></tr>
<tr>
<td class="col--description">placeholder</td>
{%- for role in roles -%}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/domain_role.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ <h1>{{ _('Create Role') }}</h1>
</div>
</div>
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('{0}: Roles').format(domain.name) }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium">{{ _('Kathy: 角色').format(domain.name) }}</h1>
<div class="section__tools">
<button class="primary rounded button" name="create_role">{{ _('Create Role') }}</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/domain_user.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ <h1>{{ _('Set Role') }}</h1>
</div>
</div>
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('{0}: Users').format(domain.name) }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium">{{ _('Kathy: 用户').format(domain.name) }}</h1>
<div class="section__tools">
<button class="primary rounded button" name="add_user">{{ _('Add User') }}</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/home_domain.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "layout/home_base.html" %}
{% block home_content %}
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('My Domains') }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium">{{ _('My Domains') }}</h1>
<div class="section__tools">
{% if handler.user.hasPriv(model.builtin.PRIV.PRIV_CREATE_DOMAIN) %}
<a class="primary rounded button" href="{{ url('home_domain_create') }}"><span class="icon icon-add"></span> {{ _('Create Domain') }}</a>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-default/templates/home_files.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% block home_content %}
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('Files') }}</h1>
<h1 class="section__title font-medium">{{ _('Files') }}</h1>
<div class="section__tools">
<button class="primary rounded button" name="upload_file">{{ _('Upload File') }}</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-default/templates/manage_config.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="row">
<div class="medium-10 columns form__item">
<label>
config
<span class="font-medium text-black">config</span>
<div name="form_item_config" class="textarea-container">
<textarea id="config" data-yaml data-model="hydro://system/setting.yaml" placeholder="" class="textbox">{{ value }}</textarea>
</div>
Expand Down
6 changes: 3 additions & 3 deletions packages/ui-default/templates/manage_dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
{% extends "manage_base.html" %}
{% block manage_content %}
<div class="section">
<div class="section__header">
<h1 class="section__title" data-heading>{{ _('Messages') }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium" data-heading>{{ _('Messages') }}</h1>
</div>
<div class="section__body typo" id="messages"></div>
</div>
<div class="section">
<div class="section__header">
<h1 class="section__title" data-heading>{{ _('Information') }}</h1>
<h1 class="section__title font-medium" data-heading>{{ _('Information') }}</h1>
<div class="section__tools">
<form method="post">
<input type="hidden" name="operation" value="restart">
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/manage_script.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h1>{{ _('Run script') }}</h1>
</div>
</div>
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('Scripts') }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium">{{ _('Scripts') }}</h1>
<div class="section__tools">
<a class="tool-button" href="{{ url('wiki_help', anchor='script') }}"><span class="icon icon-help"></span> {{ _("What's script?") }}</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/manage_user_import.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{% extends "manage_base.html" %}
{% block manage_content %}
<div class="section">
<div class="section__header">
<h1 class="section__title" data-heading>{{ _('Import User') }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium" data-heading>{{ _('Import User') }}</h1>
</div>
<div class="section__body">
{{ noscript_note.render() }}
Expand Down
14 changes: 7 additions & 7 deletions packages/ui-default/templates/manage_user_priv.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ <h1>{{ _('Set Privilege') }}</h1>
</div>
</div>
<div class="section">
<div class="section__header">
<h1 class="section__title">{{ _('User Privilege') }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium">{{ _('User Privilege') }}</h1>
<div class="section__tools">
<button class="primary rounded button" name="select_user"><span class="icon icon-search"></span>{{ _('Select User') }}</button>
</div>
Expand All @@ -62,11 +62,11 @@ <h1 class="section__title">{{ _('User Privilege') }}</h1>
</colgroup>
<thead>
<tr>
<th class="col--uid">{{ _('User ID') }}</th>
<th class="col--user">{{ _('Username') }}</th>
<td class="col--priv_info">{{ _('Privilege') }}</th>
<th class="col--priv">{{ _('Value') }}</th>
<th class="col--actions">{{ _('Actions') }}</th>
<th class="col--uid text-black">{{ _('User ID') }}</th>
<th class="col--user text-black">{{ _('Username') }}</th>
<td class="col--priv_info text-black">{{ _('Privilege') }}</th>
<th class="col--priv text-black">{{ _('Value') }}</th>
<th class="col--actions text-black">{{ _('Actions') }}</th>
</tr>
</thead>
{% include "partials/manage_user_priv.html" %}
Expand Down
2 changes: 1 addition & 1 deletion packages/ui-default/templates/partials/problem_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<col class="col--checkbox display-mode-hide">
<col class="col--pid display-mode-hide">
{% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
<col class="col--status edit-mode-hide">
<col class="col--status edit-mode-hide w-20">
{% endif %}
<col class="col--name">
<col class="col--ac-tried">
Expand Down
4 changes: 2 additions & 2 deletions packages/ui-default/templates/partials/setting.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<form method="post">
{%- for family, family_settings in settings|groupby('family') -%}{%- if family != 'setting_storage' %}
<div class="section__header">
<h1 class="section__title" id="{{ family }}" data-heading>{{ _(family) }}</h1>
<div class="section__header mb-4">
<h1 class="section__title font-medium" id="{{ family }}" data-heading>{{ _(family) }}</h1>
</div>
<div class="section__body">
{%- for setting in family_settings -%}
Expand Down
Loading