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.

Sign up for GitHub

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

1085 finalize button styles #1097

Merged
merged 15 commits into from
Mar 14, 2023
Merged

1085 finalize button styles #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
72be7f2
updated buttons in contribution details page
minump Mar 2, 2023
140288b
changed topnav buttons
minump Mar 2, 2023
d02b480
topnav buton styles updated
minump Mar 2, 2023
6990c24
updated illinois home page url
minump Mar 2, 2023
248d1db
deleted old home page
minump Mar 2, 2023
251b7ad
updated changelog
minump Mar 2, 2023
d358cc7
Merge branch 'develop' into 1085-finalize-button-styles
minump Mar 7, 2023
b3a589b
Merge branch 'develop' into 1085-finalize-button-styles
minump Mar 8, 2023
32ce3e3
updated focus styles
minump Mar 8, 2023
a0381d1
arranged div spacing
minump Mar 8, 2023
a095968
Merge branch 'develop' into 1085-finalize-button-styles
minump Mar 8, 2023
9d35c47
Merge branch 'develop' into 1085-finalize-button-styles
minump Mar 9, 2023
08bc6e7
Merge branch 'develop' into 1085-finalize-button-styles
minump Mar 9, 2023
95c5eab
changed buttons
minump Mar 13, 2023
1615737
updated inline style outline
minump Mar 13, 2023
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Cryptography version bump for contributions. [#1089](https://github.com/rokwire/rokwire-building-blocks-api/issues/1089)
- Cryptography version bump for appconfigservice. [#1089](https://github.com/rokwire/rokwire-building-blocks-api/issues/1100)
- Catalog home page card alignment. [#1084](https://github.com/rokwire/rokwire-building-blocks-api/issues/1084)
- Updated button styles to match design. [#1085](https://github.com/rokwire/rokwire-building-blocks-api/issues/1085)

### Fixed
- Detect secrets GitHub action build error and updated baseline. [#1077](https://github.com/rokwire/rokwire-building-blocks-api/issues/1077)
Expand Down
61 changes: 58 additions & 3 deletions contributions/catalog/webapps/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ html * {
flex:2 min-content auto;
}

.topnav-contribute-button, .topnav-contribute-button:hover, .topnav-contribute-button:active {
.topnav-contribute button{
margin-left: 10px;
outline: none;
border-radius: 24px;
Expand All @@ -45,8 +45,41 @@ html * {
border: solid 2px #e84a27;
background-color: #ffffff;
}
.topnav-contribute i{
cursor: pointer;
color: #e84a27;
}

.topnav-contribute:hover button{
margin-left: 10px;
outline: none;
border-radius: 24px;
color: #fff;
font-weight: bold;
border: solid 2px #e84a27;
background-color: #e84a27;
}
.topnav-contribute:hover i{
cursor: pointer;
color: #fff;
}

.topnav-contribute button:active, .topnav-contribute button:focus{
margin-left: 10px;
outline: none;
border-radius: 24px;
color: #002855;
font-weight: bold;
border: solid 2px #009fd4;
background-color: #ffffff;
}
.topnav-contribute:active i, .topnav-contribute:focus i{
cursor: pointer;
color: #009fd4;
}


.topnav-blue-button, .topnav-blue-button:hover, .topnav-blue-button:active {
.topnav-login-logout-button{
float: right;
margin: 15px 15px 5px 15px;
width:100px;
Expand All @@ -57,6 +90,28 @@ html * {
border: solid 2px #e84a27;
background-color: #ffffff;
}
.topnav-login-logout-button:hover{
float: right;
margin: 15px 15px 5px 15px;
width:100px;
outline: none;
border-radius: 24px;
color: #fff;
font-weight: bold;
border: solid 2px #e84a27;
background-color: #e84a27;
}
.topnav-login-logout-button:active, .topnav-login-logout-button:focus{
float: right;
margin: 15px 15px 5px 15px;
width:100px;
outline: none;
border-radius: 24px;
color: #002855;
font-weight: bold;
border: solid 2px #009fd4;
background-color: #ffffff;
}

/* Hide the link that should open and close the topnav on small screens */
.topnav .icon {
Expand Down Expand Up @@ -181,7 +236,7 @@ input[type=date]::-webkit-calendar-picker-indicator:hover {
cursor: pointer;
}

input[type=text]:focus, input[type=number]:focus, input[type=date]:focus, select:focus, textarea:focus, .form-check-input:focus{
input[type=text]:focus, input[type=number]:focus, input[type=date]:focus, input[type=submit]:focus, select:focus, textarea:focus, .form-check-input:focus{
box-shadow: none;
}

Expand Down
1 change: 0 additions & 1 deletion contributions/catalog/webapps/templates/contribute/contribute.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,7 +1786,6 @@ <h3 id="contact">Contact Details</h3>
onsubmit="return data_validation()" type="submit" value="Submit">
</div>
</div>
</div>

<!-- Submit modal -->
<div class="modal" id="submit-modal">
Expand Down
4 changes: 2 additions & 2 deletions contributions/catalog/webapps/templates/contribute/contribution_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,13 @@ <h4>Date modified</h4>
<div class="container">
<!-- buttons container -->
{% if is_editable %}
<a class="button button2" role="button" href="{{ url_for('contribute.contribution_edit', contribution_id=post.id) }}">Edit Contribution</a>
<button class="button button2" onclick="location.href = '{{ url_for('contribute.contribution_edit', contribution_id=post.id) }}';" >Edit Contribution</button>
<!-- Button trigger modal -->
<button type="button" class="button button3" data-toggle="modal" data-target="#confirmDelete">Delete Contribution</button>
{% endif %}

{% if is_reviewer %}
<a class="button button4" role="button" href="{{ url_for('contribute.contribution_review', contribution_id=post.id) }}">Review Contribution</a>
<button class="button button4" onclick="location.href = '{{ url_for('contribute.contribution_review', contribution_id=post.id) }}';">Review Contribution</button>
{% endif %}
</div> <!-- end of buttons container -->

Expand Down
18 changes: 9 additions & 9 deletions contributions/catalog/webapps/templates/contribute/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ <h2 id="title"> Contributions Catalog/Packager </h2>

<div id="mainContainer" class="container-fluid">
{% if show_sel == "capability" %}
<button class="button button5" id="all_btn" onclick="get_url('all')"> Show All</button>
<button class="button button5" id="capability_btn" onclick="get_url('capability')"> Capabilities</button>
<button class="button button5" id="talent_btn" onclick="get_url('talent')"> Talents</button>
<button class="button button2" id="all_btn" onclick="get_url('all')"> Show All</button>
<button class="button button2" id="capability_btn" onclick="get_url('capability')"> Capabilities</button>
<button class="button button2" id="talent_btn" onclick="get_url('talent')"> Talents</button>
{% elif show_sel == "talent" %}
<button class="button button5" id="all_btn" onclick="get_url('all')"> Show All</button>
<button class="button button5" id="capability_btn" onclick="get_url('capability')"> Capabilities</button>
<button class="button button5" id="talent_btn" onclick="get_url('talent')"> Talents</button>
<button class="button button2" id="all_btn" onclick="get_url('all')"> Show All</button>
<button class="button button2" id="capability_btn" onclick="get_url('capability')"> Capabilities</button>
<button class="button button2" id="talent_btn" onclick="get_url('talent')"> Talents</button>
{% else %}
<button class="button button5" id="all_btn" onclick="get_url('all')"> Show All</button>
<button class="button button5" id="capability_btn" onclick="get_url('capability')"> Capabilities</button>
<button class="button button5" id="talent_btn" onclick="get_url('talent')"> Talents</button>
<button class="button button2" id="all_btn" onclick="get_url('all')"> Show All</button>
<button class="button button2" id="capability_btn" onclick="get_url('capability')"> Capabilities</button>
<button class="button button2" id="talent_btn" onclick="get_url('talent')"> Talents</button>
{% endif %}

<div class="form-group pull-right">
Expand Down
Loading