Skip to content

UI polish - Combo box - UI and Spacing added to buttons #41

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

Merged
merged 9 commits into from
May 24, 2022
Merged

UI polish - Combo box - UI and Spacing added to buttons #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
90e74e1
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke Apr 21, 2022
862681d
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke Apr 21, 2022
dabe089
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke Apr 29, 2022
61bf96e
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke Apr 29, 2022
fcfb4c2
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke May 2, 2022
b586cb6
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke May 2, 2022
c78ca2f
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke May 3, 2022
7bbde47
Merge branch 'main' of https://github.com/FifthTry/cdoc
gsalunke May 24, 2022
82783c3
Combo-box UI Polish, spacing between buttons
gsalunke May 24, 2022
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
58 changes: 52 additions & 6 deletions app/static/css/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
:root {
--background-gradient: linear-gradient(30deg, #f39c12 30%, #f1c40f);
--gray: #34495e;
--base: #131a13;
--step-1: #182517;
--step-2: #233221;
}
select {
/* Reset Select */
appearance: none;
outline: 0;
border: 0;
box-shadow: none;
/* Personalize */
flex: 1;
padding: 0 1em;
color: #fff;
background-color: var(--base);
background-image: none;
cursor: pointer;
}
/* Remove IE arrow */
select::-ms-expand {
display: none;
}
*{
padding: 0;
margin: 0;
Expand Down Expand Up @@ -625,7 +650,9 @@ header > div.menu .menu-item:last-child{
padding-bottom: 6px;

}

.mr20{
margin-right: 20px;
}
.visible{
display: block;
}
Expand All @@ -651,12 +678,31 @@ header > div.menu .menu-item:last-child{
margin: 0 5px;
line-height: 36px;
}

.combo_black{
border: 1px solid #966220;
background-color: transparent;
color: #FFFFFF;
padding: 8px 10px;
border-radius: 6px;
position: relative;
display: flex;
width: 18em;
height: 3em;
border-radius: .25em;
overflow: hidden;
z-index: 100;
}

.combo_black::after {
content: '\25BC';
position: absolute;
top: 0;
right: 0;
padding: 1em;
background-color: var(--step-1);
transition: .25s all ease;
pointer-events: none;
z-index: 1000;
}

.combo_black:hover::after {
color: #f39c12;
}

.tabled-row{
Expand Down
12 changes: 7 additions & 5 deletions app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@
{% comment %}
{% if request.user.is_authenticated %}
<div>
<select id="org-selector">
{% for installation in all_installations %}
<option value="{{installation.account_name}}" {% if installation.account_name == current_installation.account_name %}selected="selected"{% endif %}>{{installation.account_name}}</option>
{% endfor %}
</select>
<div class="combo_black">
<select id="org-selector">
{% for installation in all_installations %}
<option value="{{installation.account_name}}" {% if installation.account_name == current_installation.account_name %}selected="selected"{% endif %}>{{installation.account_name}}</option>
{% endfor %}
</select>
</div>
</div>
{% endif %}
{% endcomment %}
Expand Down
26 changes: 15 additions & 11 deletions app/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</div>

<div class="body-row modal-msg mt27 main-text">
<button class="cta cta-primary" id="code-repo-btn" >Code Repo</button>
<button class="cta cta-primary mr20" id="code-repo-btn" >Code Repo</button>
<button class="cta cta-primary" id="doc-repo-btn">Documentation Repo</button>
</div>
</div>
Expand Down Expand Up @@ -110,23 +110,27 @@
Code Repository:
</div>
<div class="row-right">
<select name="code_repo_id" class="combo_black">
{% for repo in available_repos_for_mapping %}
<option value="{{repo.id}}">{{repo.repo_full_name}}</option>
{% endfor %}
</select>
<div class="combo_black">
<select name="code_repo_id">
{% for repo in available_repos_for_mapping %}
<option value="{{repo.id}}">{{repo.repo_full_name}}</option>
{% endfor %}
</select>
</div>
</div>
</div>
<div class="tabled-row doc-repo-field">
<div class="row-left">
Documentation Repository:
</div>
<div class="row-right">
<select name="documentation_repo_id" class="combo_black">
{% for repo in available_repos_for_mapping %}
<option value="{{repo.id}}">{{repo.repo_full_name}}</option>
{% endfor %}
</select>
<div class="combo_black">
<select name="documentation_repo_id">
{% for repo in available_repos_for_mapping %}
<option value="{{repo.id}}">{{repo.repo_full_name}}</option>
{% endfor %}
</select>
</div>
</div>
</div>
<div class="tabled-row">
Expand Down