Skip to content
This repository has been archived by the owner on Apr 17, 2023. It is now read-only.

Commit

Permalink
Fixed icons spacing/positioning
Browse files Browse the repository at this point in the history
  • Loading branch information
vitoravelino committed Aug 29, 2017
1 parent 2bae81b commit ab34bf9
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 29 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/modules/repositories/pages/show.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ $(() => {

methods: {
loadData() {
const id = this.$refs.repoLink.dataset.id;
const id = this.$refs.repoTitle.dataset.id;

RepositoriesService.get(id).then((response) => {
set(this, 'tags', response.body.tags);
Expand Down Expand Up @@ -104,7 +104,7 @@ $(() => {
Alert.show(message);

if (!this.tags.length) {
const namespaceHref = this.$refs.repoLink.querySelector('a').href;
const namespaceHref = this.$refs.repoLink.href;
window.location.href = namespaceHref;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/dashboard/index.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
.col-sm-6.text-right
= link_to admin_activities_path, class: "btn btn-link btn-xs" do
i.fa.fa-eye
' View all activities
' View all activities

.panel-body
- if @recent_activities.empty?
Expand Down
4 changes: 2 additions & 2 deletions app/views/admin/namespaces/index.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
col.col-15
col.col-15
col.col-20
col.col-10
col width="150px"
thead
tr
th Name
Expand All @@ -32,7 +32,7 @@
col.col-15
col.col-15
col.col-20
col.col-10
col width="150px"
thead
tr
th Name
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/users/index.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.col-sm-6.text-right
= link_to new_admin_user_path, class: 'btn btn-xs btn-link', role: 'button'
i.fa.fa-plus-circle
| Create new user
| Create new user
.panel-body
.table-responsive
table.table.table-stripped.table-hover
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/registrations/edit.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
- if current_user.application_tokens.count >= User::APPLICATION_TOKENS_MAX
a#add_application_token_btn.btn.btn-xs.btn-link.js-toggle-button[disabled="disabled" role="button"]
i.fa.fa-plus-circle
| Create new token
| Create new token
- else
a#add_application_token_btn.btn.btn-xs.btn-link.js-toggle-button[role="button"]
i.fa.fa-plus-circle
| Create new token
| Create new token
.panel-body
.table-responsive
table.table.table-striped.table-hover
Expand Down
8 changes: 4 additions & 4 deletions app/views/namespaces/_namespace.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ tr id="namespace_#{namespace.id}"
data-method="put"
rel="nofollow"
href=url_for(change_visibility_namespace_path(namespace, visibility: "visibility_private"))
]
i.fa.fa-lock
]
i.fa.fa-fw.fa-lock
a.btn[
id="protected"
class=(namespace.visibility_protected? ? "btn-primary" : "btn-default")
Expand All @@ -30,7 +30,7 @@ tr id="namespace_#{namespace.id}"
rel="nofollow"
href=url_for(change_visibility_namespace_path(namespace, visibility: "visibility_protected"))
]
i.fa.fa-users
i.fa.fa-fw.fa-users
a.btn[
id="public"
class=(namespace.visibility_public? ? "btn-primary" : "btn-default")
Expand All @@ -41,4 +41,4 @@ tr id="namespace_#{namespace.id}"
rel="nofollow"
href=url_for(change_visibility_namespace_path(namespace, visibility: "visibility_public"))
]
i.fa.fa.fa-globe
i.fa.fa-fw.fa.fa-globe
21 changes: 10 additions & 11 deletions app/views/namespaces/show.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,21 @@
.row
.col-sm-6
h5
small
a[data-placement="right"
data-toggle="popover"
data-container=".panel-heading"
data-content="<p>Information about the namespace.</p>"
data-original-title="What's this?"
tabindex="0" data-html="true"]
i.fa.fa-info-circle
a[data-placement="right"
data-toggle="popover"
data-container=".panel-heading"
data-content="<p>Information about the namespace.</p>"
data-original-title="What's this?"
tabindex="0" data-html="true"]
i.fa.fa-info-circle
strong
'#{@namespace.clean_name}
' #{@namespace.clean_name}
' namespace
.col-sm-6.text-right
- if can_manage_namespace?(@namespace)
button.btn.btn-link.btn-xs.edit-namespace-link
i.fa.fa-pencil
| Edit namespace
| Edit namespace

.panel-body
.description
Expand Down Expand Up @@ -59,7 +58,7 @@
href=url_for(namespace_webhooks_path(@namespace))
]
i.fa.fa-eye
| Show webhooks
| Show webhooks
h5.align-top-inline
'Namespace:
strong
Expand Down
11 changes: 7 additions & 4 deletions app/views/repositories/show.html.slim
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
.header.clearfix
h4 data-id="#{@repository.id}" ref="repoLink" class="repository-title pull-left"
= link_to @repository.namespace.clean_name, @repository.namespace
| /
= @repository.name
h4 data-id="#{@repository.id}" ref="repoTitle" class="repository-title pull-left"
a[
href="javascript:void(0)"
class="btn-link repository-information-icon"
Expand All @@ -13,6 +10,11 @@
data-content="#{render_repository_information(@repository)}"
data-html="true"]
i.fa.fa-info-circle
| &nbsp;
= link_to @repository.namespace.clean_name, @repository.namespace, { ref: 'repoLink' }
| /
= @repository.name


.btn-toolbar.pull-right
.btn-group
Expand All @@ -24,6 +26,7 @@
i.fa.fa-star
- else
i.fa.fa-star-o
| &nbsp;
span#star-counter.badge
= @repository.stars.count

Expand Down
2 changes: 1 addition & 1 deletion app/views/team_users/_team_user.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ tr id="team_user_#{team_user.id}"
= f.select(:role, TeamUser.roles.keys.map {|role| [role.titleize,role]}, {}, {class: 'form-control'})
= button_tag(type: 'submit', class: 'btn btn-primary pull-right') do
i.fa.fa-check
|Save
| Save

.errors
- if can_manage_team?(team_user.team)
Expand Down
2 changes: 1 addition & 1 deletion app/views/teams/show.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
br
= button_tag(type: 'submit', class: 'btn btn-primary pull-right') do
i.fa.fa-check
| Save
| Save
.panel-footer
.panel.panel-default.team_information
.panel-heading
Expand Down

0 comments on commit ab34bf9

Please sign in to comment.